From c2861f6088027581d98ba3720fe58c9c17d30fd0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:00:12 +0200 Subject: CWS gnumake2: move delivered header files in from svtools/inc to svtools/inc/svtools; remove ununsed files; remove svp.res --- svtools/bmpmaker/bmp.cxx | 2 +- svtools/inc/DocumentInfoPreview.hxx | 64 -- svtools/inc/QueryFolderName.hxx | 69 -- svtools/inc/acceleratorexecute.hxx | 290 ------ svtools/inc/addresstemplate.hxx | 166 ---- svtools/inc/apearcfg.hxx | 130 --- svtools/inc/asynclink.hxx | 80 -- svtools/inc/calendar.hxx | 504 ---------- svtools/inc/cliplistener.hxx | 64 -- svtools/inc/collatorres.hxx | 24 - svtools/inc/contextmenuhelper.hxx | 133 --- svtools/inc/controldims.hrc | 105 -- svtools/inc/ctrlbox.hxx | 507 ---------- svtools/inc/ctrltool.hxx | 254 ----- svtools/inc/dialogclosedlistener.hxx | 80 -- svtools/inc/dialogcontrolling.hxx | 309 ------ svtools/inc/expander.hxx | 95 -- svtools/inc/extcolorcfg.hxx | 131 --- svtools/inc/filectrl.hxx | 114 --- svtools/inc/filedlg.hxx | 111 --- svtools/inc/filedlg2.hrc | 44 - svtools/inc/fileview.hxx | 274 ------ svtools/inc/fltdefs.hxx | 155 --- svtools/inc/fontsubstconfig.hxx | 71 -- svtools/inc/framestatuslistener.hxx | 119 --- svtools/inc/helpagentwindow.hxx | 91 -- svtools/inc/htmlkywd.hxx | 804 ---------------- svtools/inc/htmltokn.h | 572 ----------- svtools/inc/imagemgr.hrc | 193 ---- svtools/inc/imagemgr.hxx | 98 -- svtools/inc/imageresourceaccess.hxx | 93 -- svtools/inc/imgdef.hxx | 46 - svtools/inc/indexentryres.hxx | 23 - svtools/inc/inetimg.hxx | 89 -- svtools/inc/itemdel.hxx | 42 - svtools/inc/ivctrl.hxx | 393 -------- svtools/inc/localresaccess.hxx | 85 -- svtools/inc/prgsbar.hxx | 103 -- svtools/inc/roadmap.hxx | 140 --- svtools/inc/rtfkeywd.hxx | 1144 ---------------------- svtools/inc/rtfout.hxx | 70 -- svtools/inc/rtftoken.h | 1276 ------------------------- svtools/inc/ruler.hxx | 877 ----------------- svtools/inc/scriptedtext.hxx | 132 --- svtools/inc/scrwin.hxx | 115 --- svtools/inc/sfxecode.hxx | 121 --- svtools/inc/soerr.hxx | 84 -- svtools/inc/sores.hxx | 182 ---- svtools/inc/statusbarcontroller.hxx | 161 ---- svtools/inc/stdmenu.hxx | 244 ----- svtools/inc/svtools/DocumentInfoPreview.hxx | 64 ++ svtools/inc/svtools/QueryFolderName.hxx | 69 ++ svtools/inc/svtools/acceleratorexecute.hxx | 290 ++++++ svtools/inc/svtools/addresstemplate.hxx | 166 ++++ svtools/inc/svtools/apearcfg.hxx | 130 +++ svtools/inc/svtools/asynclink.hxx | 80 ++ svtools/inc/svtools/calendar.hxx | 504 ++++++++++ svtools/inc/svtools/cliplistener.hxx | 64 ++ svtools/inc/svtools/collatorres.hxx | 24 + svtools/inc/svtools/contextmenuhelper.hxx | 133 +++ svtools/inc/svtools/controldims.hrc | 105 ++ svtools/inc/svtools/ctrlbox.hxx | 507 ++++++++++ svtools/inc/svtools/ctrltool.hxx | 254 +++++ svtools/inc/svtools/dialogclosedlistener.hxx | 80 ++ svtools/inc/svtools/dialogcontrolling.hxx | 309 ++++++ svtools/inc/svtools/expander.hxx | 95 ++ svtools/inc/svtools/extcolorcfg.hxx | 131 +++ svtools/inc/svtools/filectrl.hxx | 114 +++ svtools/inc/svtools/filedlg.hxx | 111 +++ svtools/inc/svtools/filedlg2.hrc | 44 + svtools/inc/svtools/fileview.hxx | 274 ++++++ svtools/inc/svtools/fltdefs.hxx | 155 +++ svtools/inc/svtools/fontsubstconfig.hxx | 71 ++ svtools/inc/svtools/framestatuslistener.hxx | 119 +++ svtools/inc/svtools/helpagentwindow.hxx | 91 ++ svtools/inc/svtools/htmlkywd.hxx | 804 ++++++++++++++++ svtools/inc/svtools/htmltokn.h | 572 +++++++++++ svtools/inc/svtools/imagemgr.hrc | 193 ++++ svtools/inc/svtools/imagemgr.hxx | 98 ++ svtools/inc/svtools/imageresourceaccess.hxx | 93 ++ svtools/inc/svtools/imgdef.hxx | 46 + svtools/inc/svtools/indexentryres.hxx | 23 + svtools/inc/svtools/inetimg.hxx | 89 ++ svtools/inc/svtools/itemdel.hxx | 42 + svtools/inc/svtools/ivctrl.hxx | 393 ++++++++ svtools/inc/svtools/localresaccess.hxx | 85 ++ svtools/inc/svtools/prgsbar.hxx | 103 ++ svtools/inc/svtools/roadmap.hxx | 140 +++ svtools/inc/svtools/rtfkeywd.hxx | 1144 ++++++++++++++++++++++ svtools/inc/svtools/rtfout.hxx | 70 ++ svtools/inc/svtools/rtftoken.h | 1276 +++++++++++++++++++++++++ svtools/inc/svtools/ruler.hxx | 877 +++++++++++++++++ svtools/inc/svtools/scriptedtext.hxx | 132 +++ svtools/inc/svtools/scrwin.hxx | 115 +++ svtools/inc/svtools/sfxecode.hxx | 121 +++ svtools/inc/svtools/soerr.hxx | 84 ++ svtools/inc/svtools/sores.hxx | 182 ++++ svtools/inc/svtools/statusbarcontroller.hxx | 161 ++++ svtools/inc/svtools/stdmenu.hxx | 244 +++++ svtools/inc/svtools/sychconv.hxx | 50 + svtools/inc/svtools/tabbar.hxx | 558 +++++++++++ svtools/inc/svtools/taskbar.hxx | 493 ++++++++++ svtools/inc/svtools/templatefoldercache.hxx | 111 +++ svtools/inc/svtools/templdlg.hxx | 95 ++ svtools/inc/svtools/testtool.hxx | 78 ++ svtools/inc/svtools/tooltiplbox.hxx | 70 ++ svtools/inc/svtools/txtattr.hxx | 238 +++++ svtools/inc/svtools/txtcmp.hxx | 36 + svtools/inc/svtools/unoevent.hxx | 332 +++++++ svtools/inc/svtools/unoimap.hxx | 48 + svtools/inc/svtools/wallitem.hxx | 68 ++ svtools/inc/sychconv.hxx | 50 - svtools/inc/tabbar.hxx | 558 ----------- svtools/inc/taskbar.hxx | 493 ---------- svtools/inc/templatefoldercache.hxx | 111 --- svtools/inc/templdlg.hxx | 95 -- svtools/inc/testtool.hxx | 78 -- svtools/inc/tooltiplbox.hxx | 70 -- svtools/inc/txtattr.hxx | 238 ----- svtools/inc/txtcmp.hxx | 36 - svtools/inc/unoevent.hxx | 332 ------- svtools/inc/unoimap.hxx | 48 - svtools/inc/wallitem.hxx | 68 -- svtools/source/config/apearcfg.cxx | 2 +- svtools/source/config/extcolorcfg.cxx | 2 +- svtools/source/config/fontsubstconfig.cxx | 2 +- svtools/source/config/itemholder2.cxx | 4 +- svtools/source/config/miscopt.cxx | 2 +- svtools/source/contnr/cont_pch.cxx | 44 - svtools/source/contnr/contentenumeration.cxx | 2 +- svtools/source/contnr/fileview.cxx | 8 +- svtools/source/contnr/imivctl.hxx | 2 +- svtools/source/contnr/imivctl1.cxx | 2 +- svtools/source/contnr/ivctrl.cxx | 5 +- svtools/source/contnr/svimpbox.cxx | 10 +- svtools/source/contnr/templwin.cxx | 19 +- svtools/source/contnr/templwin.hxx | 4 +- svtools/source/contnr/templwin.src | 2 +- svtools/source/contnr/tooltiplbox.cxx | 2 +- svtools/source/control/asynclink.cxx | 2 +- svtools/source/control/calendar.cxx | 18 +- svtools/source/control/collatorres.cxx | 4 +- svtools/source/control/ctrlbox.cxx | 8 +- svtools/source/control/ctrltool.cxx | 7 +- svtools/source/control/filectrl.cxx | 7 +- svtools/source/control/filectrl2.cxx | 2 +- svtools/source/control/indexentryres.cxx | 4 +- svtools/source/control/inettbc.cxx | 15 +- svtools/source/control/prgsbar.cxx | 6 +- svtools/source/control/roadmap.cxx | 9 +- svtools/source/control/ruler.cxx | 3 +- svtools/source/control/scriptedtext.cxx | 5 +- svtools/source/control/scrwin.cxx | 2 +- svtools/source/control/stdmenu.cxx | 9 +- svtools/source/control/tabbar.cxx | 2 +- svtools/source/control/taskbar.cxx | 7 +- svtools/source/control/taskbox.cxx | 5 +- svtools/source/control/taskmisc.cxx | 5 +- svtools/source/control/taskstat.cxx | 5 +- svtools/source/dialogs/addresstemplate.cxx | 17 +- svtools/source/dialogs/addresstemplate.src | 8 +- svtools/source/dialogs/filedlg.cxx | 2 +- svtools/source/dialogs/filedlg2.cxx | 7 +- svtools/source/dialogs/filedlg2.src | 3 +- svtools/source/dialogs/formats.src | 2 +- svtools/source/dialogs/insdlg.cxx | 2 +- svtools/source/dialogs/logindlg.cxx | 7 +- svtools/source/dialogs/printdlg.cxx | 11 +- svtools/source/dialogs/propctrl.cxx | 506 ---------- svtools/source/dialogs/propctrl.hxx | 118 --- svtools/source/dialogs/roadmapwizard.cxx | 2 +- svtools/source/dialogs/so3res.src | 5 +- svtools/source/edit/editsyntaxhighlighter.cxx | 2 +- svtools/source/edit/sychconv.cxx | 2 +- svtools/source/edit/textdoc.cxx | 1 - svtools/source/edit/textdoc.hxx | 2 +- svtools/source/edit/txtattr.cxx | 2 +- svtools/source/filter.vcl/filter/filter.cxx | 4 - svtools/source/filter.vcl/filter/gradwrap.cxx | 573 ----------- svtools/source/java/makefile.mk | 4 - svtools/source/java/patchjavaerror.src | 96 -- svtools/source/misc/acceleratorexecute.cxx | 2 +- svtools/source/misc/cliplistener.cxx | 2 +- svtools/source/misc/dialogclosedlistener.cxx | 2 +- svtools/source/misc/dialogcontrolling.cxx | 2 +- svtools/source/misc/ehdl.cxx | 2 +- svtools/source/misc/ehdl.src | 3 +- svtools/source/misc/errtxt.src | 2 +- svtools/source/misc/helpagentwindow.cxx | 9 +- svtools/source/misc/imagemgr.cxx | 7 +- svtools/source/misc/imagemgr.src | 2 +- svtools/source/misc/imageresourceaccess.cxx | 4 +- svtools/source/misc/itemdel.cxx | 2 +- svtools/source/misc/templatefoldercache.cxx | 2 +- svtools/source/misc/transfer.cxx | 12 +- svtools/source/misc/transfer2.cxx | 9 +- svtools/source/misc/wallitem.cxx | 2 +- svtools/source/plugapp/commtest.cxx | 264 ----- svtools/source/plugapp/commtest.hrc | 37 - svtools/source/plugapp/commtest.src | 63 -- svtools/source/plugapp/makefile.mk | 6 - svtools/source/svhtml/htmlkywd.cxx | 4 +- svtools/source/svhtml/htmlout.cxx | 2 +- svtools/source/svhtml/htmlsupp.cxx | 4 +- svtools/source/svhtml/parhtml.cxx | 4 +- svtools/source/svrtf/parrtf.cxx | 4 +- svtools/source/svrtf/rtfkey2.cxx | 1162 ---------------------- svtools/source/svrtf/rtfkeywd.cxx | 4 +- svtools/source/svrtf/rtfout.cxx | 4 +- svtools/source/uno/addrtempuno.cxx | 6 +- svtools/source/uno/contextmenuhelper.cxx | 2 +- svtools/source/uno/framestatuslistener.cxx | 2 +- svtools/source/uno/statusbarcontroller.cxx | 6 +- svtools/source/uno/toolboxcontroller.cxx | 5 +- svtools/source/uno/unoevent.cxx | 6 +- svtools/source/uno/unoiface.cxx | 12 +- svtools/source/uno/unoimap.cxx | 10 +- svtools/source/urlobj/inetimg.cxx | 5 +- svtools/util/makefile.mk | 5 - 219 files changed, 13361 insertions(+), 16431 deletions(-) delete mode 100644 svtools/inc/DocumentInfoPreview.hxx delete mode 100644 svtools/inc/QueryFolderName.hxx delete mode 100644 svtools/inc/acceleratorexecute.hxx delete mode 100644 svtools/inc/addresstemplate.hxx delete mode 100644 svtools/inc/apearcfg.hxx delete mode 100644 svtools/inc/asynclink.hxx delete mode 100644 svtools/inc/calendar.hxx delete mode 100644 svtools/inc/cliplistener.hxx delete mode 100644 svtools/inc/collatorres.hxx delete mode 100644 svtools/inc/contextmenuhelper.hxx delete mode 100644 svtools/inc/controldims.hrc delete mode 100644 svtools/inc/ctrlbox.hxx delete mode 100644 svtools/inc/ctrltool.hxx delete mode 100644 svtools/inc/dialogclosedlistener.hxx delete mode 100644 svtools/inc/dialogcontrolling.hxx delete mode 100644 svtools/inc/expander.hxx delete mode 100644 svtools/inc/extcolorcfg.hxx delete mode 100644 svtools/inc/filectrl.hxx delete mode 100644 svtools/inc/filedlg.hxx delete mode 100644 svtools/inc/filedlg2.hrc delete mode 100644 svtools/inc/fileview.hxx delete mode 100644 svtools/inc/fltdefs.hxx delete mode 100644 svtools/inc/fontsubstconfig.hxx delete mode 100644 svtools/inc/framestatuslistener.hxx delete mode 100644 svtools/inc/helpagentwindow.hxx delete mode 100644 svtools/inc/htmlkywd.hxx delete mode 100644 svtools/inc/htmltokn.h delete mode 100644 svtools/inc/imagemgr.hrc delete mode 100644 svtools/inc/imagemgr.hxx delete mode 100644 svtools/inc/imageresourceaccess.hxx delete mode 100644 svtools/inc/imgdef.hxx delete mode 100644 svtools/inc/indexentryres.hxx delete mode 100644 svtools/inc/inetimg.hxx delete mode 100644 svtools/inc/itemdel.hxx delete mode 100644 svtools/inc/ivctrl.hxx delete mode 100644 svtools/inc/localresaccess.hxx delete mode 100644 svtools/inc/prgsbar.hxx delete mode 100644 svtools/inc/roadmap.hxx delete mode 100644 svtools/inc/rtfkeywd.hxx delete mode 100644 svtools/inc/rtfout.hxx delete mode 100644 svtools/inc/rtftoken.h delete mode 100644 svtools/inc/ruler.hxx delete mode 100644 svtools/inc/scriptedtext.hxx delete mode 100644 svtools/inc/scrwin.hxx delete mode 100644 svtools/inc/sfxecode.hxx delete mode 100644 svtools/inc/soerr.hxx delete mode 100644 svtools/inc/sores.hxx delete mode 100644 svtools/inc/statusbarcontroller.hxx delete mode 100644 svtools/inc/stdmenu.hxx create mode 100644 svtools/inc/svtools/DocumentInfoPreview.hxx create mode 100644 svtools/inc/svtools/QueryFolderName.hxx create mode 100644 svtools/inc/svtools/acceleratorexecute.hxx create mode 100644 svtools/inc/svtools/addresstemplate.hxx create mode 100644 svtools/inc/svtools/apearcfg.hxx create mode 100644 svtools/inc/svtools/asynclink.hxx create mode 100644 svtools/inc/svtools/calendar.hxx create mode 100644 svtools/inc/svtools/cliplistener.hxx create mode 100644 svtools/inc/svtools/collatorres.hxx create mode 100644 svtools/inc/svtools/contextmenuhelper.hxx create mode 100644 svtools/inc/svtools/controldims.hrc create mode 100644 svtools/inc/svtools/ctrlbox.hxx create mode 100644 svtools/inc/svtools/ctrltool.hxx create mode 100644 svtools/inc/svtools/dialogclosedlistener.hxx create mode 100644 svtools/inc/svtools/dialogcontrolling.hxx create mode 100644 svtools/inc/svtools/expander.hxx create mode 100644 svtools/inc/svtools/extcolorcfg.hxx create mode 100644 svtools/inc/svtools/filectrl.hxx create mode 100644 svtools/inc/svtools/filedlg.hxx create mode 100644 svtools/inc/svtools/filedlg2.hrc create mode 100644 svtools/inc/svtools/fileview.hxx create mode 100644 svtools/inc/svtools/fltdefs.hxx create mode 100644 svtools/inc/svtools/fontsubstconfig.hxx create mode 100644 svtools/inc/svtools/framestatuslistener.hxx create mode 100644 svtools/inc/svtools/helpagentwindow.hxx create mode 100644 svtools/inc/svtools/htmlkywd.hxx create mode 100644 svtools/inc/svtools/htmltokn.h create mode 100644 svtools/inc/svtools/imagemgr.hrc create mode 100644 svtools/inc/svtools/imagemgr.hxx create mode 100644 svtools/inc/svtools/imageresourceaccess.hxx create mode 100644 svtools/inc/svtools/imgdef.hxx create mode 100644 svtools/inc/svtools/indexentryres.hxx create mode 100644 svtools/inc/svtools/inetimg.hxx create mode 100644 svtools/inc/svtools/itemdel.hxx create mode 100644 svtools/inc/svtools/ivctrl.hxx create mode 100644 svtools/inc/svtools/localresaccess.hxx create mode 100644 svtools/inc/svtools/prgsbar.hxx create mode 100644 svtools/inc/svtools/roadmap.hxx create mode 100644 svtools/inc/svtools/rtfkeywd.hxx create mode 100644 svtools/inc/svtools/rtfout.hxx create mode 100644 svtools/inc/svtools/rtftoken.h create mode 100644 svtools/inc/svtools/ruler.hxx create mode 100644 svtools/inc/svtools/scriptedtext.hxx create mode 100644 svtools/inc/svtools/scrwin.hxx create mode 100644 svtools/inc/svtools/sfxecode.hxx create mode 100644 svtools/inc/svtools/soerr.hxx create mode 100644 svtools/inc/svtools/sores.hxx create mode 100644 svtools/inc/svtools/statusbarcontroller.hxx create mode 100644 svtools/inc/svtools/stdmenu.hxx create mode 100644 svtools/inc/svtools/sychconv.hxx create mode 100644 svtools/inc/svtools/tabbar.hxx create mode 100644 svtools/inc/svtools/taskbar.hxx create mode 100644 svtools/inc/svtools/templatefoldercache.hxx create mode 100644 svtools/inc/svtools/templdlg.hxx create mode 100644 svtools/inc/svtools/testtool.hxx create mode 100644 svtools/inc/svtools/tooltiplbox.hxx create mode 100644 svtools/inc/svtools/txtattr.hxx create mode 100644 svtools/inc/svtools/txtcmp.hxx create mode 100644 svtools/inc/svtools/unoevent.hxx create mode 100644 svtools/inc/svtools/unoimap.hxx create mode 100644 svtools/inc/svtools/wallitem.hxx delete mode 100644 svtools/inc/sychconv.hxx delete mode 100644 svtools/inc/tabbar.hxx delete mode 100644 svtools/inc/taskbar.hxx delete mode 100644 svtools/inc/templatefoldercache.hxx delete mode 100644 svtools/inc/templdlg.hxx delete mode 100644 svtools/inc/testtool.hxx delete mode 100644 svtools/inc/tooltiplbox.hxx delete mode 100644 svtools/inc/txtattr.hxx delete mode 100644 svtools/inc/txtcmp.hxx delete mode 100644 svtools/inc/unoevent.hxx delete mode 100644 svtools/inc/unoimap.hxx delete mode 100644 svtools/inc/wallitem.hxx delete mode 100644 svtools/source/contnr/cont_pch.cxx delete mode 100644 svtools/source/dialogs/propctrl.cxx delete mode 100644 svtools/source/dialogs/propctrl.hxx delete mode 100644 svtools/source/filter.vcl/filter/gradwrap.cxx delete mode 100644 svtools/source/java/patchjavaerror.src delete mode 100644 svtools/source/plugapp/commtest.cxx delete mode 100644 svtools/source/plugapp/commtest.hrc delete mode 100644 svtools/source/plugapp/commtest.src delete mode 100644 svtools/source/svrtf/rtfkey2.cxx (limited to 'svtools') diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index b91dae79bbad..47f667982732 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -44,7 +44,7 @@ using namespace std; #include #include "svl/solar.hrc" -#include "filedlg.hxx" +#include #include "bmpcore.hxx" #include "bmp.hrc" diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/DocumentInfoPreview.hxx deleted file mode 100644 index bbb8ab32c1a6..000000000000 --- a/svtools/inc/DocumentInfoPreview.hxx +++ /dev/null @@ -1,64 +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: DocumentInfoPreview.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX -#define SVTOOLS_DOCUMENTINFOPREVIEW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -class SvtExtendedMultiLineEdit_Impl; -class SvtDocInfoTable_Impl; - -namespace svtools -{ - class SVT_DLLPUBLIC ODocumentInfoPreview : public Window - { - SvtExtendedMultiLineEdit_Impl* m_pEditWin; - SvtDocInfoTable_Impl* m_pInfoTable; - com::sun::star::lang::Locale m_aLocale; - - public: - ODocumentInfoPreview( Window* pParent ,WinBits _nBits); - virtual ~ODocumentInfoPreview(); - - virtual void Resize(); - void Clear(); - void fill(const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>& i_xDocProps - ,const String& i_rURL); - void InsertEntry( const String& rTitle, const String& rValue ); - void SetAutoScroll(BOOL _bAutoScroll); - }; -} - -#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX - diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx deleted file mode 100644 index eb092b5afc0b..000000000000 --- a/svtools/inc/QueryFolderName.hxx +++ /dev/null @@ -1,69 +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: QueryFolderName.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVT_QUERYFOLDER_HXX -#define SVT_QUERYFOLDER_HXX - -#include -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include - -//------------------------------------------------------------------------- -namespace svtools { - -//------------------------------------------------------------------------- -// QueryFolderNameDialog -//------------------------------------------------------------------------- - -class QueryFolderNameDialog : public ModalDialog -{ -private: - FixedText aNameText; - Edit aNameEdit; - FixedLine aNameLine; - OKButton aOKBtn; - CancelButton aCancelBtn; - - DECL_LINK( OKHdl, Button * ); - DECL_LINK( NameHdl, Edit * ); - -public: - QueryFolderNameDialog( Window* _pParent, - const String& rTitle, - const String& rDefaultText, - String* pGroupName = NULL ); - String GetName() const { return aNameEdit.GetText(); } -}; - -} -#endif // SVT_QUERYFOLDER_HXX - diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx deleted file mode 100644 index 744bc87f31c5..000000000000 --- a/svtools/inc/acceleratorexecute.hxx +++ /dev/null @@ -1,290 +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: acceleratorexecute.hxx,v $ - * $Revision: 1.13 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX -#define INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX - -//=============================================== -// includes - -#include "svtools/svtdllapi.h" - -#ifndef INCLUDED_VECTOR -#include -#define INCLUDED_VECTOR -#endif - -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ -#include -#endif - -#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ -#include -#endif -#include - -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ -#include -#endif -#include -#include -#include - -//=============================================== -// namespace - -#ifdef css - #error "Conflict on using css as namespace alias!" -#else - #define css ::com::sun::star -#endif - -namespace svt -{ - -//=============================================== -// definitions - -struct TMutexInit -{ - ::osl::Mutex m_aLock; -}; - -//=============================================== -/** - @descr implements a helper, which can be used to - convert vcl key codes into awt key codes ... - and reverse. - - Further such key code can be triggered. - Doing so different accelerator - configurations are merged together; a suitable - command registered for the given key code is searched - and will be dispatched. - - @attention - - Because exceution of an accelerator command can be dangerous - (in case it force an office shutdown for key "ALT+F4"!) - all internal dispatches are done asynchronous. - Menas that the trigger call doesnt wait till the dispatch - is finished. You can call very often. All requests will be - queued internal and dispatched ASAP. - - Of course this queue will be stopped if the environment - will be destructed ... - */ -class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit -{ - //------------------------------------------- - // const, types - private: - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; - - //------------------------------------------- - // member - private: - - /** TODO document me */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - - /** TODO document me */ - css::uno::Reference< css::util::XURLTransformer > m_xURLParser; - - /** TODO document me */ - css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; - - /** TODO document me */ - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - TCommandQueue m_lCommandQueue; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - ::vcl::EventPoster m_aAsyncCallback; - - //------------------------------------------- - // interface - public: - - //--------------------------------------- - /** @short factory method to create new accelerator - helper instance. - - @descr Such helper instance must be initialized at first. - So it can know its environment (global/module or - document specific). - - Afterwards it can be used to execute incoming - accelerator requests. - - The "end of life" of such helper can be reached as follow: - - - delete the object - => If it stands currently in its execute method, they will - be finished. All further queued requests will be removed - and further not executed! - - - "let it stay alone" - => All currently queued events will be finished. The - helper kills itself afterwards. A shutdown of the - environment will be recognized ... The helper stop its - work immediatly then! - */ - static AcceleratorExecute* createAcceleratorHelper(); - - //--------------------------------------- - /** @short fight against inlining ... */ - virtual ~AcceleratorExecute(); - - //--------------------------------------- - /** @short init this instance. - - @descr It must be called as first method after creation. - And further it can be called more then once ... - but at least its should be used one times only. - Otherwhise nobody can say, which asynchronous - executions will be used inside the old and which one - will be used inside the new environment. - - @param xSMGR - reference to an uno service manager. - - @param xEnv - if it points to a valid frame it will be used - to execute the dispatch there. Further the frame - is used to locate the right module configuration - and use it merged together with the document and - the global configuration. - - If this parameter is set to NULL, the global configuration - is used only. Further the global Desktop instance is - used for dispatch. - */ - virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, - const css::uno::Reference< css::frame::XFrame >& xEnv ); - - //--------------------------------------- - /** @short trigger this accelerator. - - @descr The internal configuartions are used to find - as suitable command for this key code. - This command will be queued and executed later - asynchronous. - - @param aKey - specify the accelerator for execute. - - @return [sal_Bool] - TRUE if this key is configured and match to a command. - Attention: This state does not mean the success state - of the corresponding execute. Because its done asynchronous! - */ - virtual sal_Bool execute(const KeyCode& aKey); - virtual sal_Bool execute(const css::awt::KeyEvent& aKey); - - /** search the command for the given key event. - * - * @param aKey The key event - * @return The command or an empty string if the key event could not be found. - */ - ::rtl::OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); - //--------------------------------------- - /** TODO document me */ - static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); - static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const css::uno::Reference< css::frame::XFrame >& xFrame); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - - //------------------------------------------- - // internal - private: - - //--------------------------------------- - /** @short allow creation of instances of this class - by using our factory only! - */ - SVT_DLLPRIVATE AcceleratorExecute(); - - AcceleratorExecute(const AcceleratorExecute& rCopy); - void operator=(const AcceleratorExecute&) {}; - //--------------------------------------- - /** TODO document me */ - SVT_DLLPRIVATE ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - - //--------------------------------------- - /** TODO document me */ - SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - - //--------------------------------------- - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); -}; - -} // namespace svt - -#undef css - -#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx deleted file mode 100644 index 0ece2d779056..000000000000 --- a/svtools/inc/addresstemplate.hxx +++ /dev/null @@ -1,166 +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: addresstemplate.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_ADDRESSTEMPLATE_HXX_ -#define _SVT_ADDRESSTEMPLATE_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ -#include -#endif -#include -#include -#include - -// ....................................................................... -namespace svt -{ -// ....................................................................... - - // =================================================================== - // = AddressBookSourceDialog - // =================================================================== - struct AddressBookSourceDialogData; - class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog - { - protected: - // Controls - FixedLine m_aDatasourceFrame; - FixedText m_aDatasourceLabel; - ComboBox m_aDatasource; - PushButton m_aAdministrateDatasources; - FixedText m_aTableLabel; - ComboBox m_aTable; - - FixedText m_aFieldsTitle; - Window m_aFieldsFrame; - - ScrollBar m_aFieldScroller; - OKButton m_aOK; - CancelButton m_aCancel; - HelpButton m_aHelp; - - // string to display for "no selection" - const String m_sNoFieldSelection; - - /// the DatabaseContext for selecting data sources - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; - // the ORB for creating objects - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xCurrentDatasourceTables; - - AddressBookSourceDialogData* - m_pImpl; - - public: - AddressBookSourceDialog( Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); - - /** if you use this ctor, the dialog -
  • will not store it's data in the configuration (nor initially retrieve it from there)
    • -
  • will not allow to change the data source name
    • -
  • will not allow to change the table name
    • -
  • will not allow to call the data source administration dialog
    • -
- - @param _rxORB - a service factory to use for various UNO related needs - @param _rxTransientDS - the data source to obtain connections from - @param _rDataSourceName - the to-be name of _rxTransientDS. This is only for displaying this - name to the user, since the dialog completely works on _rxTransientDS, - and doesn't allow to change this. - @param _rTable - the table name to display. It must refer to a valid table, relative to a connection - obtained from _rxTransientDS - */ - AddressBookSourceDialog( Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTable, - const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping - ); - - ~AddressBookSourceDialog(); - - // to be used if the object was constructed for editing a field mapping only - void getFieldMapping( - ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const; - - protected: - void implConstruct(); - - // Window overridables - virtual long PreNotify( NotifyEvent& _rNEvt ); - - // implementations - void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); - void implSelectField(ListBox* _pBox, const String& _rText); - - void initalizeListBox(ListBox* _pList); - void resetTables(); - void resetFields(); - - // fill in the data sources listbox - void initializeDatasources(); - - // initialize the dialog from the configuration data - void loadConfiguration(); - - DECL_LINK(OnFieldScroll, ScrollBar*); - DECL_LINK(OnFieldSelect, ListBox*); - DECL_LINK(OnAdministrateDatasources, void*); - DECL_LINK(OnComboGetFocus, ComboBox*); - DECL_LINK(OnComboLoseFocus, ComboBox*); - DECL_LINK(OnComboSelect, ComboBox*); - DECL_LINK(OnOkClicked, Button*); - DECL_LINK(OnDelayedInitialize, void*); - }; - - -// ....................................................................... -} // namespace svt -// ....................................................................... - -#endif // _SVT_ADDRESSTEMPLATE_HXX_ - diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx deleted file mode 100644 index 412faab3107b..000000000000 --- a/svtools/inc/apearcfg.hxx +++ /dev/null @@ -1,130 +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: apearcfg.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_APEARCFG_HXX -#define _SVT_APEARCFG_HXX - -#include "svtools/svtdllapi.h" -#include "tools/solar.h" -#include - -class Application; - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ -typedef enum { - LookStardivision = 0, - LookMotif, - LookWindows, - LookOSTwo, - LookMacintosh -} SystemLook; - -typedef enum { - SnapToButton = 0, - SnapToMiddle, - NoSnap -} SnapType; - -typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg.src - DragFullWindow, - DragFrame, - DragSystemDep -} DragMode; - - -class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem -{ - short nLookNFeel ; - short nDragMode ; - short nScaleFactor ; - short nSnapMode ; - short nMiddleMouse; -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - short nAAMinPixelHeight ; -#endif - - BOOL bMenuMouseFollow ; - BOOL bSingleLineTabCtrl ; - BOOL bColoredTabCtrl ; -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - BOOL bFontAntialiasing ; -#endif - - static sal_Bool bInitialized ; - - SVT_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); - -public: - SvtTabAppearanceCfg( ); - ~SvtTabAppearanceCfg( ); - - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - - USHORT GetLookNFeel () const { return nLookNFeel; } - void SetLookNFeel ( USHORT nSet ); - - USHORT GetDragMode () const { return nDragMode; } - void SetDragMode ( USHORT nSet ); - - USHORT GetScaleFactor () const { return nScaleFactor; } - void SetScaleFactor ( USHORT nSet ); - - USHORT GetSnapMode () const { return nSnapMode; } - void SetSnapMode ( USHORT nSet ); - - USHORT GetMiddleMouseButton () const { return nMiddleMouse; } - void SetMiddleMouseButton ( USHORT nSet ); - - void SetApplicationDefaults ( Application* pApp ); - - void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} - BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} - - void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} - BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} - -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } - BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } - - USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } - void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } -#endif - - void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; - BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} - - static sal_Bool IsInitialized() { return bInitialized; } - static void SetInitialized() { bInitialized = sal_True; } -}; - -#endif // _OFA_APEARCFG_HXX diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx deleted file mode 100644 index 9f6b6c1117ec..000000000000 --- a/svtools/inc/asynclink.hxx +++ /dev/null @@ -1,80 +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: asynclink.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_ASYNCLINK_HXX -#define SVTOOLS_ASYNCLINK_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -class Timer; - -namespace vos -{ - class OMutex; -} - -namespace svtools { - -class SVT_DLLPUBLIC AsynchronLink -{ - Link _aLink; - ULONG _nEventId; - Timer* _pTimer; - BOOL _bInCall; - BOOL* _pDeleted; - void* _pArg; - vos::OMutex* _pMutex; - - DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* ); - SVT_DLLPRIVATE void Call_Impl( void* pArg ); - -public: - AsynchronLink( const Link& rLink ) : - _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), - _pDeleted( 0 ), _pMutex( 0 ){} - AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), - _pDeleted( 0 ), _pMutex( 0 ){} - ~AsynchronLink(); - - void CreateMutex(); - void operator=( const Link& rLink ) { _aLink = rLink; } - void Call( void* pObj, BOOL bAllowDoubles = FALSE, - BOOL bUseTimer = FALSE ); - void ForcePendingCall( ); - void ClearPendingCall( ); - BOOL IsSet() const { return _aLink.IsSet(); } - Link GetLink() const { return _aLink; } -}; - -} - -#endif diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx deleted file mode 100644 index 1c81945a669c..000000000000 --- a/svtools/inc/calendar.hxx +++ /dev/null @@ -1,504 +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: calendar.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CALENDAR_HXX -#define _CALENDAR_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP -#include -#endif - -#ifndef _CTRL_HXX -#include -#endif -#include -#ifndef _FIELD_HXX -#include -#endif - -class Table; -class MouseEvent; -class TrackingEvent; -class KeyEvent; -class HelpEvent; -class DataChangedEvent; -class FloatingWindow; -class PushButton; -struct ImplDateInfo; -class ImplDateTable; -class ImplCFieldFloatWin; - -/************************************************************************* - -Beschreibung -============ - -class Calendar - -Diese Klasse erlaubt die Auswahl eines Datum. Der Datumsbereich der -angezeigt wird, ist der, der durch die Klasse Date vorgegeben ist. -Es werden soviele Monate angezeigt, wie die Ausgabeflaeche des -Controls vorgibt. Der Anwender kann zwischen den Monaten ueber ein -ContextMenu (Bei Click auf den Monatstitel) oder durch 2 ScrollButtons -zwischen den Monaten wechseln. - --------------------------------------------------------------------------- - -WinBits - -WB_BORDER Um das Fenster wird ein Border gezeichnet. -WB_TABSTOP Tastatursteuerung ist moeglich. Der Focus wird - sich geholt, wenn mit der Maus in das - Control geklickt wird. -WB_QUICKHELPSHOWSDATEINFO DateInfo auch bei QuickInfo als BalloonHelp zeigen -WB_BOLDTEXT Formatiert wird nach fetten Texten und - DIB_BOLD wird bei AddDateInfo() ausgewertet -WB_FRAMEINFO Formatiert wird so, das Frame-Info angezeigt - werden kann und die FrameColor bei AddDateInfo() - ausgewertet wird -WB_RANGESELECT Es koennen mehrere Tage selektiert werden, die - jedoch alle zusammenhaengend sein muessen -WB_MULTISELECT Es koennen mehrere Tage selektiert werden -WB_WEEKNUMBER Es werden die Wochentage mit angezeigt - --------------------------------------------------------------------------- - -Mit SetCurDate() / GetCurDate() wird das ausgewaehlte Datum gesetzt und -abgefragt. Wenn der Anwnder ein Datum selektiert hat, wird Select() -gerufen. Bei einem Doppelklick auf ein Datum wird DoubleClick() gerufen. - --------------------------------------------------------------------------- - -Mit CalcWindowSizePixel() kann die Groesse des Fensters in Pixel fuer -die Darstellung einer bestimmte Anzahl von Monaten berechnet werden. - --------------------------------------------------------------------------- - -Mit SetSaturdayColor() kann eine spezielle Farbe fuer Sonnabende gesetzt -werden und mit SetSundayColor() eine fuer Sonntage. Mit AddDateInfo() -koennen Tage speziell gekennzeichnet werden. Dabei kann man einem -einzelnen Datum eine andere Farbe geben (zum Beispiel fuer Feiertage) -oder diese Umranden (zum Beispiel fuer Termine). Wenn beim Datum -kein Jahr angegeben wird, wird der Tag in jedem Jahr benutzt. Mit -AddDateInfo() kann auch jedem Datum ein Text mitgegeben werden, der -dann angezeigt wird, wenn Balloon-Hilfe an ist. Um nicht alle Jahre -mit entsprechenden Daten zu versorgen, wird der RequestDateInfo()- -Handler gerufen, wenn ein neues Jahr angezeigt wird. Es kann dann -im Handler mit GetRequestYear() das Jahr abgefragt werden. - --------------------------------------------------------------------------- - -Um ein ContextMenu zu einem Datum anzuzeigen, muss man den Command-Handler -ueberlagern. Mit GetDate() kann zur Mouse-Position das Datum ermittelt -werden. Bei Tastaturausloesung sollte das aktuelle Datum genommen werden. -Wenn ein ContextMenu angezeigt wird, darf der Handler der Basisklasse nicht -gerufen werden. - --------------------------------------------------------------------------- - -Bei Mehrfachselektion WB_RANGESELECT oder WB_MULTISELECT kann mit -SelectDate()/SelectDateRange() Datumsbereiche selektiert/deselektiert -werden. SelectDateRange() gilt inkl. EndDatum. Mit SetNoSelection() kann -alles deselektiert werden. SetCurDate() selektiert bei Mehrfachselektion -jedoch nicht das Datum mit, sondern gibt nur das Focus-Rechteck vor. - -Den selektierten Bereich kann man mit GetSelectDateCount()/GetSelectDate() -abgefragt werden oder der Status von einem Datum kann mit IsDateSelected() -abgefragt werden. - -Waehrend der Anwender am selektieren ist, wird der SelectionChanging()- -Handler gerufen. In diesem kann der selektierte Bereich angepasst werden, -wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der -Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit -GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, -in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() -abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, -FALSE eine Selektion nach rechts oder unten. - --------------------------------------------------------------------------- - -Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion -uebernehmen will, sollte dies nur gemacht werden, wenn -IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert -TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons -ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen -oder durch Beendigung einer Selektion ausgeloest. - -*************************************************************************/ - -// ------------------ -// - Calendar-Types - -// ------------------ - -#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) -#define WB_BOLDTEXT ((WinBits)0x00008000) -#define WB_FRAMEINFO ((WinBits)0x00010000) -#define WB_WEEKNUMBER ((WinBits)0x00020000) -// Muss mit den WinBits beim TabBar uebereinstimmen oder mal -// nach \vcl\inc\wintypes.hxx verlagert werden -#ifndef WB_RANGESELECT -#define WB_RANGESELECT ((WinBits)0x00200000) -#endif -#ifndef WB_MULTISELECT -#define WB_MULTISELECT ((WinBits)0x00400000) -#endif - -#define DIB_BOLD ((USHORT)0x0001) - -// ------------ -// - Calendar - -// ------------ - -class SVT_DLLPUBLIC Calendar : public Control -{ -private: - ImplDateTable* mpDateTable; - Table* mpSelectTable; - Table* mpOldSelectTable; - Table* mpRestoreSelectTable; - XubString* mpDayText[31]; - XubString maDayText; - XubString maWeekText; - CalendarWrapper maCalendarWrapper; - Rectangle maPrevRect; - Rectangle maNextRect; - String maDayOfWeekText; - sal_Int32 mnDayOfWeekAry[7]; - Date maOldFormatFirstDate; - Date maOldFormatLastDate; - Date maFirstDate; - Date maOldFirstDate; - Date maCurDate; - Date maOldCurDate; - Date maAnchorDate; - Date maDropDate; - Color maSelColor; - Color maOtherColor; - Color* mpStandardColor; - Color* mpSaturdayColor; - Color* mpSundayColor; - ULONG mnDayCount; - long mnDaysOffX; - long mnWeekDayOffY; - long mnDaysOffY; - long mnMonthHeight; - long mnMonthWidth; - long mnMonthPerLine; - long mnLines; - long mnDayWidth; - long mnDayHeight; - long mnWeekWidth; - long mnDummy2; - long mnDummy3; - long mnDummy4; - WinBits mnWinStyle; - USHORT mnFirstYear; - USHORT mnLastYear; - USHORT mnRequestYear; - BOOL mbCalc:1, - mbFormat:1, - mbDrag:1, - mbSelection:1, - mbMultiSelection:1, - mbWeekSel:1, - mbUnSel:1, - mbMenuDown:1, - mbSpinDown:1, - mbPrevIn:1, - mbNextIn:1, - mbDirect:1, - mbInSelChange:1, - mbTravelSelect:1, - mbScrollDateRange:1, - mbSelLeft:1, - mbAllSel:1, - mbDropPos:1; - Link maSelectionChangingHdl; - Link maDateRangeChangedHdl; - Link maRequestDateInfoHdl; - Link maDoubleClickHdl; - Link maSelectHdl; - Timer maDragScrollTimer; - USHORT mnDragScrollHitTest; - -#ifdef _SV_CALENDAR_CXX - using Control::ImplInitSettings; - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings(); - SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; - SVT_DLLPRIVATE void ImplFormat(); - using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); - SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, - USHORT nDay, USHORT nMonth, USHORT nYear, - DayOfWeek eDayOfWeek, - BOOL bBack = TRUE, BOOL bOther = FALSE, - ULONG nToday = 0 ); - SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); - SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); - SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, - BOOL bMove, BOOL bExpand, BOOL bExtended ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); - using Window::ImplScroll; - SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); - SVT_DLLPRIVATE void ImplInvertDropPos(); - SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); - SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; -#endif - -protected: - BOOL ShowDropPos( const Point& rPos, Date& rDate ); - void HideDropPos(); - - DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); - -public: - Calendar( Window* pParent, WinBits nWinStyle = 0 ); - Calendar( Window* pParent, const ResId& rResId ); - ~Calendar(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void SelectionChanging(); - virtual void DateRangeChanged(); - virtual void RequestDateInfo(); - virtual void DoubleClick(); - virtual void Select(); - - const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } - - /// Set one of ::com::sun::star::i18n::Weekdays. - void SetWeekStart( sal_Int16 nDay ); - - /// Set how many days of a week must reside in the first week of a year. - void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); - - void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); - void SelectDateRange( const Date& rStartDate, const Date& rEndDate, - BOOL bSelect = TRUE ); - void SetNoSelection(); - BOOL IsDateSelected( const Date& rDate ) const; - ULONG GetSelectDateCount() const; - Date GetSelectDate( ULONG nIndex = 0 ) const; - void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } - BOOL IsCallEverySelectEnabled() const { return mbAllSel; } - - USHORT GetRequestYear() const { return mnRequestYear; } - void SetCurDate( const Date& rNewDate ); - Date GetCurDate() const { return maCurDate; } - void SetFirstDate( const Date& rNewFirstDate ); - Date GetFirstDate() const { return maFirstDate; } - Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - ULONG GetDayCount() const { return mnDayCount; } - Date GetFirstMonth() const; - Date GetLastMonth() const; - USHORT GetMonthCount() const; - BOOL GetDate( const Point& rPos, Date& rDate ) const; - Rectangle GetDateRect( const Date& rDate ) const; - BOOL GetDropDate( Date& rDate ) const; - - long GetCurMonthPerLine() const { return mnMonthPerLine; } - long GetCurLines() const { return mnLines; } - - void SetStandardColor( const Color& rColor ); - const Color& GetStandardColor() const; - void SetSaturdayColor( const Color& rColor ); - const Color& GetSaturdayColor() const; - void SetSundayColor( const Color& rColor ); - const Color& GetSundayColor() const; - - void AddDateInfo( const Date& rDate, const XubString& rText, - const Color* pTextColor = NULL, - const Color* pFrameColor = NULL, - USHORT nFlags = 0 ); - void RemoveDateInfo( const Date& rDate ); - void ClearDateInfo(); - XubString GetDateInfoText( const Date& rDate ); - - void StartSelection(); - void EndSelection(); - - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } - BOOL IsSelectLeft() const { return mbSelLeft; } - - Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, - long nCalcLines = 1 ) const; - - void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; } - const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } - void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; } - const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } - void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; } - const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } -}; - -inline const Color& Calendar::GetStandardColor() const -{ - if ( mpStandardColor ) - return *mpStandardColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSaturdayColor() const -{ - if ( mpSaturdayColor ) - return *mpSaturdayColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSundayColor() const -{ - if ( mpSundayColor ) - return *mpSundayColor; - else - return GetFont().GetColor(); -} - -/************************************************************************* - -Beschreibung -============ - -class CalendarField - -Bei dieser Klasse handelt es sich um ein DateField, wo ueber einen -DropDown-Button ueber das Calendar-Control ein Datum ausgewaehlt werden -kann. - --------------------------------------------------------------------------- - -WinBits - -Siehe DateField - -Die Vorgaben fuer das CalendarControl koennen ueber SetCalendarStyle() -gesetzt werden. - --------------------------------------------------------------------------- - -Mit EnableToday()/EnableNone() kann ein Today-Button und ein None-Button -enabled werden. - --------------------------------------------------------------------------- - -Wenn mit SetCalendarStyle() WB_RANGESELECT gesetzt wird, koennen im -Calendar auch mehrere Tage selektiert werden. Da immer nur das Start-Datum -in das Feld uebernommen wird, sollte dann im Select-Handler mit -GetCalendar() der Calendar abgefragt werden und an dem mit -GetSelectDateCount()/GetSelectDate() der selektierte Bereich abgefragt -werden, um beispielsweise diese dann in ein weiteres Feld zu uebernehmen. - --------------------------------------------------------------------------- - -Wenn ein abgeleiteter Calendar verwendet werden soll, kann am -CalendarField die Methode CreateCalendar() ueberlagert werden und -dort ein eigener Calendar erzeugt werden. - -*************************************************************************/ - -// ----------------- -// - CalendarField - -// ----------------- - -class SVT_DLLPUBLIC CalendarField : public DateField -{ -private: - ImplCFieldFloatWin* mpFloatWin; - Calendar* mpCalendar; - WinBits mnCalendarStyle; - PushButton* mpTodayBtn; - PushButton* mpNoneBtn; - Date maDefaultDate; - BOOL mbToday; - BOOL mbNone; - Link maSelectHdl; - -#ifdef _SV_CALENDAR_CXX - DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); - DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow* ); -#endif - -public: - CalendarField( Window* pParent, WinBits nWinStyle ); - CalendarField( Window* pParent, const ResId& rResId ); - ~CalendarField(); - - virtual void Select(); - - virtual BOOL ShowDropDown( BOOL bShow ); - virtual Calendar* CreateCalendar( Window* pParent ); - Calendar* GetCalendar(); - - void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } - Date GetDefaultDate() const { return maDefaultDate; } - - void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } - BOOL IsTodayEnabled() const { return mbToday; } - void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } - BOOL IsNoneEnabled() const { return mbNone; } - - void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } - WinBits GetCalendarStyle() const { return mnCalendarStyle; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - -protected: - virtual void StateChanged( StateChangedType nStateChange ); -}; - -#endif // _CALENDAR_HXX diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/cliplistener.hxx deleted file mode 100644 index 566b5d98e4b1..000000000000 --- a/svtools/inc/cliplistener.hxx +++ /dev/null @@ -1,64 +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: cliplistener.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CLIPLISTENER_HXX -#define _CLIPLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -class Window; - - -class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< - ::com::sun::star::datatransfer::clipboard::XClipboardListener > -{ - Link aLink; - -public: - // Link is called with a TransferableDataHelper pointer - TransferableClipboardListener( const Link& rCallback ); - ~TransferableClipboardListener(); - - void AddRemoveListener( Window* pWin, BOOL bAdd ); - void ClearCallbackLink(); - - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); - // XClipboardListener - virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException); -}; - -#endif - diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/collatorres.hxx deleted file mode 100644 index 63b4e7ef64f3..000000000000 --- a/svtools/inc/collatorres.hxx +++ /dev/null @@ -1,24 +0,0 @@ - -#ifndef SVTOOLS_COLLATORRESSOURCE_HXX -#define SVTOOLS_COLLATORRESSOURCE_HXX - -#include "svtools/svtdllapi.h" -#include - -class CollatorRessourceData; - -class SVT_DLLPUBLIC CollatorRessource -{ - private: - - CollatorRessourceData *mp_Data; - - public: - CollatorRessource (); - ~CollatorRessource (); - const String& GetTranslation (const String& r_Algorithm); -}; - -#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */ - - diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/contextmenuhelper.hxx deleted file mode 100644 index 59aa064b6b87..000000000000 --- a/svtools/inc/contextmenuhelper.hxx +++ /dev/null @@ -1,133 +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: contextmenuhelper.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX -#define INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX - -#include -#include -#include -#include -#include - -#include -#include -#include -#include "svtools/svtdllapi.h" - -namespace svt -{ - -/** - Context menu helper class. - - Fills images and labels for a provided popup menu or - com.sun.star.awt.XPopupMenu. - - PRECONDITION: - All commands must be set via SetItemCommand and are part - of the configuration files - (see org.openoffice.Office.UI.[Module]Commands.xcu) -*/ -struct ExecuteInfo; -class SVT_DLLPUBLIC ContextMenuHelper -{ - public: - // create context menu helper - // ARGS: xFrame = frame defines the context of the context menu - // bAutoRefresh = specifies that the context will be constant or not - ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true ); - ~ContextMenuHelper(); - - // methods to complete a popup menu (set images, labels, enable/disable states) - // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!) - void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu ); - void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu ); - - // methods to create a popup menu referenced by resource URL - // NOT IMPLEMENTED YET! - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > create( const ::rtl::OUString& aPopupMenuResourceURL ); - - // method to create and execute a popup menu referenced by a resource URL - // NOT IMPLEMENTED YET! - bool createAndExecute( const Point& aPos, const ::rtl::OUString& aPopupMenuResourceURL ); - - private: - // asynchronous link to prevent destruction while on stack - DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); - - // no copy-ctor and operator= - ContextMenuHelper( const ContextMenuHelper& ); - const ContextMenuHelper& operator=( const ContextMenuHelper& ); - - // show context menu and dispatch command automatically - void executePopupMenu( const Point& aPos, PopupMenu* pMenu ); - - // fill image and label for every menu item on the provided menu - void completeMenuProperties( Menu* pMenu ); - - // dispatch provided command - bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL ); - - - // methods to retrieve a single command URL dependent value from a - // ui configuratin manager - Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const; - rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; - - // creates an association between current module/controller bound to the - // provided frame and their ui configuration managers. - bool associateUIConfigurationManagers(); - - // resets associations to create associations again on-demand. - // Usefull for implementations which recycle frames. Normal - // implementations can profit from caching and should set - // auto refresh on ctor to false (default). - void resetAssociations() - { - if ( m_bAutoRefresh ) - m_bUICfgMgrAssociated = false; - } - - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; - ::rtl::OUString m_aModuleIdentifier; - ::rtl::OUString m_aSelf; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; - bool m_bAutoRefresh; - bool m_bUICfgMgrAssociated; -}; - -} // namespace svt - -#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX diff --git a/svtools/inc/controldims.hrc b/svtools/inc/controldims.hrc deleted file mode 100644 index 805e91e06486..000000000000 --- a/svtools/inc/controldims.hrc +++ /dev/null @@ -1,105 +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: controldims.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_CONTROLDIMS_HRC_ -#define _SVT_CONTROLDIMS_HRC_ - -// -// From: Dialogue Specification and Guidelines - Visual Design V1.3 -// by Christian Jansen -// - -// -// Usage: -// ====== -// -// all values have to be mapped by MAP_APPFONT -// - -// Base -#define RSC_BS_CHARHEIGHT 8 -#define RSC_BS_CHARWIDTH 4 - -// control dimensions -#define RSC_CD_PUSHBUTTON_WIDTH 50 -#define RSC_CD_PUSHBUTTON_HEIGHT 14 - -#define RSC_CD_FIXEDTEXT_HEIGHT RSC_BS_CHARHEIGHT -#define RSC_CD_FIXEDLINE_HEIGHT RSC_BS_CHARHEIGHT -#define RSC_CD_FIXEDLINE_WIDTH RSC_BS_CHARWIDTH // for vertical FixedLines - -#define RSC_CD_DROPDOWN_HEIGHT 12 // also combobox and dropdown list -#define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc. - -#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate -#define RSC_CD_RADIOBUTTON_HEIGHT 10 - -// spacings -#define RSC_SP_CTRL_X 6 // controls that are unrelated -#define RSC_SP_CTRL_Y 7 -#define RSC_SP_CTRL_GROUP_X 3 // related controls, or controls in a groupbox -#define RSC_SP_CTRL_GROUP_Y 4 -#define RSC_SP_CTRL_DESC_X 3 // between description text and related control -#define RSC_SP_CTRL_DESC_Y 3 - -// overruled spacings between certain controls -#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine -#define RSC_SP_FLGR_SPACE_Y 4 -#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox -#define RSC_SP_GRP_SPACE_Y 6 -#define RSC_SP_TXT_SPACE_X 5 // spacing between text paragraphs -#define RSC_SP_TXT_SPACE_Y 7 -#define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title - -// dialog inner border -#define RSC_SP_DLG_INNERBORDER_LEFT 6 -#define RSC_SP_DLG_INNERBORDER_TOP 6 -#define RSC_SP_DLG_INNERBORDER_RIGHT 6 -#define RSC_SP_DLG_INNERBORDER_BOTTOM 6 - -// tab page inner border -#define RSC_SP_TBPG_INNERBORDER_LEFT 6 // for tabpage groupings -#define RSC_SP_TBPG_INNERBORDER_TOP 3 -#define RSC_SP_TBPG_INNERBORDER_RIGHT 6 -#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6 - -// FixedLine group inner border -#define RSC_SP_FLGR_INNERBORDER_LEFT 6 // for FixedLine groupings -#define RSC_SP_FLGR_INNERBORDER_TOP 3 -#define RSC_SP_FLGR_INNERBORDER_RIGHT 0 -#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0 - -// GroupBox inner border -#define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings -#define RSC_SP_GRP_INNERBORDER_TOP 6 -#define RSC_SP_GRP_INNERBORDER_RIGHT 6 -#define RSC_SP_GRP_INNERBORDER_BOTTOM 6 - -#endif // _SVT_CONTROLDIMS_HRC_ diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx deleted file mode 100644 index a72fd6f2c25c..000000000000 --- a/svtools/inc/ctrlbox.hxx +++ /dev/null @@ -1,507 +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: ctrlbox.hxx,v $ - * $Revision: 1.15 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CTRLBOX_HXX -#define _CTRLBOX_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _LSTBOX_HXX -#include -#endif -#ifndef _COMBOBOX_HXX -#include -#endif -#ifndef _IMAGE_HXX -#include -#endif -#ifndef _VIRDEV_HXX -#include -#endif -#ifndef _METRIC_HXX -#include -#endif -#ifndef _FIELD_HXX -#include -#endif - -class ImplFontList; -class ImpColorList; -class ImpLineList; -class FontList; - -/************************************************************************* - -Beschreibung -============ - -class ColorListBox - -Beschreibung - -Erlaubt die Auswahl von Farben. - --------------------------------------------------------------------------- - -class LineListBox - -Beschreibung - -Erlaubt die Auswahl von Linien-Styles und Groessen. Es ist darauf zu achten, -das vor dem ersten Insert die Units und die Fesntergroesse gesetzt sein -muessen. An Unit wird Point und mm unterstuetzt und als SourceUnit Point, -mm und Twips. Alle Angaben muessen in 100teln der jeweiligen Einheit -vorliegen. - -Line1 ist aeussere, Line2 die innere und Distance die Distanz zwischen -den beiden Linien. Wenn Line2 = 0 ist, wird nur Line1 angezeigt. Als -Default sind sowohl Source als auch Ziel-Unit FUNIT_POINT. - -Mit SetColor() kann die Linienfarbe eingestellt werden. - -Anmerkungen und Ausnahmen - -Gegenueber einer normalen ListBox, koennen keine User-Daten gesetzt -werden. Ausserdem sollte wenn der UpdateMode ausgeschaltet ist, keine -Daten abgefragt oder die Selektion gesetzt werden, da in diesem Zustand -die Daten nicht definiert sind. Wenn der UpdateMode ausgeschaltet ist, -sollte der Rueckgabewert bei Insert nicht ausgewertet werden, da er keine -Bedeutung hat. Ausserdem darf nicht das WinBit WB_SORT gesetzt sein. - --------------------------------------------------------------------------- - -class FontNameBox - -Beschreibung - -Erlaubt die Auswahl von Fonts. Die ListBox wird mit Fill gefuellt, wo -ein Pointer auf eine FontList uebergeben werden muss. - -Mit EnableWYSIWYG() kann man einstellen, das die Fontnamen in Ihrer Schrift -angezeigt werden und mit EnableSymbols() kann eingestellt werden, das -vor dem Namen ueber ein Symbol angezeigt wird, ob es sich um eine -Drucker oder Bildschirmschrift handelt. - -Querverweise - -FontList; FontStyleBox; FontSizeBox; FontNameMenu - --------------------------------------------------------------------------- - -class FontStyleBox - -Beschreibung - -Erlaubt die Auswahl eines FontStyles. Mit Fill wird die ListBox mit -den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden -immer mit eingefuegt (kann sich aber noch aendern, da vielleicht -nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts -umgehen koennen). Bei Fill bleibt vorherige Name soweit wie moeglich -erhalten. - -Fuer DontKnow sollte die FontStyleBox mit String() gefuellt werden. -Dann enthaellt die Liste die Standardattribute. Der Style, der gerade -angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. - -Querverweise - -FontList; FontNameBox; FontSizeBox; FontStyleMenu - --------------------------------------------------------------------------- - -class FontSizeBox - -Beschreibung - -Erlaubt die Auswahl von Fontgroessen. Werte werden ueber GetValue() -abgefragt und ueber SetValue() gesetzt. Fill fuellt die ListBox mit den -Groessen zum uebergebenen Font. Alle Groessen werden in 10tel Point -angegeben. Die FontListe, die bei Fill uebergeben wird, muss bis zum -naechsten Fill-Aufruf erhalten bleiben. - -Zusaetzlich erlaubt die FontSizeBox noch einen Relative-Mode. Dieser -dient dazu, Prozent-Werte eingeben zu koennen. Dies kann zum Beispiel -nuetzlich sein, wenn man die Box in einem Vorlagen-Dialog anbietet. -Dieser Modus ist nur anschaltbar, jedoch nicht wieder abschaltbar. - -Fuer DontKnow sollte die FontSizeBox mit FontInfo() gefuellt werden. -Dann enthaellt die Liste die Standardgroessen. Die Groesse, die gerade -angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. - -Querverweise - -FontList; FontNameBox; FontStyleBox; FontSizeMenu - -*************************************************************************/ - -// ---------------- -// - ColorListBox - -// ---------------- - -class SVT_DLLPUBLIC ColorListBox : public ListBox -{ - ImpColorList* pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden. - Size aImageSize; - -#ifdef _CTRLBOX_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplDestroyColorEntries(); -#endif -public: - ColorListBox( Window* pParent, - WinBits nWinStyle = WB_BORDER ); - ColorListBox( Window* pParent, const ResId& rResId ); - virtual ~ColorListBox(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - void InsertAutomaticEntry(); - using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); - virtual void Clear(); - void CopyEntries( const ColorListBox& rBox ); - - using ListBox::GetEntryPos; - virtual USHORT GetEntryPos( const Color& rColor ) const; - virtual Color GetEntryColor( USHORT nPos ) const; - Size GetImageSize() const { return aImageSize; } - - void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) - { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); - XubString GetSelectEntry( USHORT nSelIndex = 0 ) const - { return ListBox::GetSelectEntry( nSelIndex ); } - Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; - BOOL IsEntrySelected( const XubString& rStr ) const - { return ListBox::IsEntrySelected( rStr ); } - - BOOL IsEntrySelected( const Color& rColor ) const; - -private: - // declared as private because some compilers would generate the default functions - ColorListBox( const ColorListBox& ); - ColorListBox& operator =( const ColorListBox& ); - - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; -}; - -inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) -{ - USHORT nPos = GetEntryPos( rColor ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - ListBox::SelectEntryPos( nPos, bSelect ); -} - -inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const -{ - USHORT nPos = GetEntryPos( rColor ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nPos ); - else - return FALSE; -} - -inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - Color aColor; - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - aColor = GetEntryColor( nPos ); - return aColor; -} - -// --------------- -// - LineListBox - -// --------------- - -class SVT_DLLPUBLIC LineListBox : public ListBox -{ - ImpLineList* pLineList; - VirtualDevice aVirDev; - Size aTxtSize; - Color aColor; - Color maPaintCol; - FieldUnit eUnit; - FieldUnit eSourceUnit; - - SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr ); - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - void UpdateLineColors( void ); - BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed - inline const Color& GetPaintColor( void ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - -public: - LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); - LineListBox( Window* pParent, const ResId& rResId ); - virtual ~LineListBox(); - - using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND ); - using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); - virtual void Clear(); - - using ListBox::GetEntryPos; - USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; - long GetEntryLine1( USHORT nPos ) const; - long GetEntryLine2( USHORT nPos ) const; - long GetEntryDistance( USHORT nPos ) const; - - inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE ); - long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; - long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; - long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; - inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; - - inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - inline FieldUnit GetUnit() const { return eUnit; } - inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } - inline FieldUnit GetSourceUnit() const { return eSourceUnit; } - - void SetColor( const Color& rColor ); - inline Color GetColor( void ) const; - -private: - // declared as private because some compilers would generate the default methods - LineListBox( const LineListBox& ); - LineListBox& operator =( const LineListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; -}; - -inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect ) -{ - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - ListBox::SelectEntryPos( nPos, bSelect ); -} - -inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryLine1( nPos ); - else - return 0; -} - -inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryLine2( nPos ); - else - return 0; -} - -inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryDistance( nPos ); - else - return 0; -} - -inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const -{ - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nPos ); - else - return FALSE; -} - -inline void LineListBox::SetColor( const Color& rColor ) -{ - aColor = rColor; - - UpdateLineColors(); -} - -inline Color LineListBox::GetColor( void ) const -{ - return aColor; -} - - -// --------------- -// - FontNameBox - -// --------------- - -class SVT_DLLPUBLIC FontNameBox : public ComboBox -{ -private: - ImplFontList* mpFontList; - Image maImagePrinterFont; - Image maImageBitmapFont; - Image maImageScalableFont; - BOOL mbWYSIWYG; - BOOL mbSymbols; - -#ifdef _CTRLBOX_CXX - SVT_DLLPRIVATE void ImplCalcUserItemSize(); - SVT_DLLPRIVATE void ImplDestroyFontList(); -#endif - - void InitBitmaps( void ); -protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); -public: - FontNameBox( Window* pParent, - WinBits nWinStyle = WB_SORT ); - FontNameBox( Window* pParent, const ResId& rResId ); - virtual ~FontNameBox(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - void Fill( const FontList* pList ); - - void EnableWYSIWYG( BOOL bEnable = TRUE ); - BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } - - void EnableSymbols( BOOL bEnable = TRUE ); - BOOL IsSymbolsEnabled() const { return mbSymbols; } - -private: - // declared as private because some compilers would generate the default functions - FontNameBox( const FontNameBox& ); - FontNameBox& operator =( const FontNameBox& ); -}; - -// ---------------- -// - FontStyleBox - -// ---------------- - -class SVT_DLLPUBLIC FontStyleBox : public ComboBox -{ - XubString aLastStyle; - -private: - using ComboBox::SetText; -public: - FontStyleBox( Window* pParent, WinBits nWinStyle = 0 ); - FontStyleBox( Window* pParent, const ResId& rResId ); - virtual ~FontStyleBox(); - - virtual void Select(); - virtual void LoseFocus(); - virtual void Modify(); - - void SetText( const XubString& rText ); - void Fill( const XubString& rName, const FontList* pList ); - -private: - // declared as private because some compilers would generate the default functions - FontStyleBox( const FontStyleBox& ); - FontStyleBox& operator =( const FontStyleBox& ); -}; - -inline void FontStyleBox::SetText( const XubString& rText ) -{ - aLastStyle = rText; - ComboBox::SetText( rText ); -} - -// --------------- -// - FontSizeBox - -// --------------- - -class SVT_DLLPUBLIC FontSizeBox : public MetricBox -{ - FontInfo aFontInfo; - const FontList* pFontList; - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; - short nPtRelMin; - short nPtRelMax; - short nPtRelStep; - BOOL bRelativeMode:1, - bRelative:1, - bPtRelative:1, - bStdSize:1; - -#ifdef _CTRLBOX_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); -#endif - -protected: - virtual XubString CreateFieldText( sal_Int64 nValue ) const; - -public: - FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); - FontSizeBox( Window* pParent, const ResId& rResId ); - virtual ~FontSizeBox(); - - void Reformat(); - void Modify(); - - void Fill( const FontInfo* pInfo, const FontList* pList ); - - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); - void EnablePtRelativeMode( short nMin = -200, short nMax = 200, - short nStep = 10 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void SetPtRelative( BOOL bPtRel = TRUE ) - { bPtRelative = bPtRel; SetRelative( TRUE ); } - BOOL IsPtRelative() const { return bPtRelative; } - - virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; - sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; - void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } - -private: - // declared as private because some compilers would generate the default functions - FontSizeBox( const FontSizeBox& ); - FontSizeBox& operator =( const FontSizeBox& ); -}; - -#endif // _CTRLBOX_HXX diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx deleted file mode 100644 index 21a1fcab76d7..000000000000 --- a/svtools/inc/ctrltool.hxx +++ /dev/null @@ -1,254 +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: ctrltool.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CTRLTOOL_HXX -#define _CTRLTOOL_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _SAL_TYPES_H -#include -#endif -#include -#ifndef _METRIC_HXX -#include -#endif - -class ImplFontListNameInfo; -class OutputDevice; - -/************************************************************************* - -Beschreibung -============ - -class FontList - -Diese Klasse verwaltet alle Fonts, die auf einem oder zwei Ausgabegeraeten -dargestellt werden koennen. Zusaetzlich bietet die Klasse Methoden an, um -aus Fett und Kursiv den StyleName zu generieren oder aus einem Stylename -die fehlenden Attribute. Zusaetzlich kann diese Klasse syntetisch nachgebildete -Fonts verarbeiten. Diese Klasse kann mit verschiedenen Standard-Controls und -Standard-Menus zusammenarbeiten. - -Querverweise - -class FontNameBox, class FontStyleBox, class FontSizeBox, -class FontNameMenu, class FontStyleMenu, class FontSizeMenu - --------------------------------------------------------------------------- - -FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); - -Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die -entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, -wie auch die Klasse FontList existiert. Optional kann noch ein 2tes -Ausgabedevice uebergeben werden, damit man zum Beispiel die Fonts von -einem Drucker und dem Bildschirm zusammen in einer FontListe verwalten kann -und somit auch den FontListen und FontMenus die Fonts von beiden OutputDevices -zu uebergeben. Auch das pDevice2 muss solange existieren, wie die Klasse -FontList existiert. - -Das OutputDevice, welches als erstes uebergeben wird, sollte das bevorzugte -sein. Dies sollte im normalfall der Drucker sein. Denn wenn 2 verschiede -Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden -sind, wird die vom uebergebenen Device "pDevice" bevorzugt. - -Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften -abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch -Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und -scalierbare Schriften abgefragt. - --------------------------------------------------------------------------- - -String FontList::GetStyleName( const FontInfo& rInfo ) const; - -Diese Methode gibt den StyleName von einer FontInfo zurueck. Falls kein -StyleName gesetzt ist, wird aus den gesetzten Attributen ein entsprechender -Name generiert, der dem Anwender praesentiert werden kann. - --------------------------------------------------------------------------- - -XubString FontList::GetFontMapText( const FontInfo& rInfo ) const; - -Diese Methode gibt einen Matchstring zurueck, der dem Anwender -anzeigen soll, welche Probleme es mit diesem Font geben kann. - --------------------------------------------------------------------------- - -FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; - -Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName -die entsprechende FontInfo-Struktur raus. Der Stylename kann in dieser -Methode auch ein syntetischer sein. In diesem Fall werden die entsprechenden -Werte in der FontInfo-Struktur entsprechend gesetzt. Wenn ein StyleName -uebergeben wird, kann jedoch eine FontInfo-Struktur ohne Stylename -zurueckgegeben werden. Um den StyleName dem Anwender zu repraesentieren, -muss GetStyleName() mit dieser FontInfo-Struktur aufgerufen werden. - -Querverweise - -FontList::GetStyleName() - --------------------------------------------------------------------------- - -FontInfo FontList::Get( const String& rName, FontWeight eWeight, - FontItalic eItalic ) const; - -Diese Methode sucht aus dem uebergebenen Namen und den uebergebenen Styles -die entsprechende FontInfo-Struktur raus. Diese Methode kann auch eine -FontInfo-Struktur ohne Stylename zurueckgegeben. Um den StyleName dem -Anwender zu repraesentieren, muss GetStyleName() mit dieser FontInfo-Struktur -aufgerufen werden. - -Querverweise - -FontList::GetStyleName() - --------------------------------------------------------------------------- - -const long* FontList::GetSizeAry( const FontInfo& rInfo ) const; - -Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen. -Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- -Groessen zurueckgegeben. Das Array enthaelt die Hoehen des Fonts in 10tel -Point. Der letzte Wert des Array ist 0. Das Array, was zurueckgegeben wird, -wird von der FontList wieder zerstoert. Nach dem Aufruf der naechsten Methode -von der FontList, sollte deshalb das Array nicht mehr referenziert werden. - -*************************************************************************/ - -// ------------ -// - FontList - -// ------------ - -#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) - -#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) -#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) -#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) - -class SVT_DLLPUBLIC FontList : private List -{ -private: - XubString maMapBoth; - XubString maMapPrinterOnly; - XubString maMapScreenOnly; - XubString maMapSizeNotAvailable; - XubString maMapStyleNotAvailable; - XubString maMapNotAvailable; - XubString maLight; - XubString maLightItalic; - XubString maNormal; - XubString maNormalItalic; - XubString maBold; - XubString maBoldItalic; - XubString maBlack; - XubString maBlackItalic; - long* mpSizeAry; - OutputDevice* mpDev; - OutputDevice* mpDev2; - -#ifdef CTRLTOOL_CXX - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, - BOOL bInsertData ); -#endif - -public: - FontList( OutputDevice* pDevice, - OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); - ~FontList(); - - FontList* Clone() const; - - OutputDevice* GetDevice() const { return mpDev; } - OutputDevice* GetDevice2() const { return mpDev2; } - XubString GetFontMapText( const FontInfo& rInfo ) const; - USHORT GetFontNameType( const XubString& rFontName ) const; - - const XubString& GetNormalStr() const { return maNormal; } - const XubString& GetItalicStr() const { return maNormalItalic; } - const XubString& GetBoldStr() const { return maBold; } - const XubString& GetBoldItalicStr() const { return maBoldItalic; } - const XubString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const; - XubString GetStyleName( const FontInfo& rInfo ) const; - - FontInfo Get( const XubString& rName, - const XubString& rStyleName ) const; - FontInfo Get( const XubString& rName, - FontWeight eWeight, - FontItalic eItalic ) const; - - BOOL IsAvailable( const XubString& rName ) const; - USHORT GetFontNameCount() const - { return (USHORT)List::Count(); } - const FontInfo& GetFontName( USHORT nFont ) const; - USHORT GetFontNameType( USHORT nFont ) const; - sal_Handle GetFirstFontInfo( const XubString& rName ) const; - sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; - const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; - - const long* GetSizeAry( const FontInfo& rInfo ) const; - static const long* GetStdSizeAry(); - -private: - FontList( const FontList& ); - FontList& operator =( const FontList& ); -}; - - -// ----------------- -// - FontSizeNames - -// ----------------- - -class SVT_DLLPUBLIC FontSizeNames -{ -private: - struct ImplFSNameItem* mpArray; - ULONG mnElem; - -public: - FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - - ULONG Count() const { return mnElem; } - BOOL IsEmpty() const { return !mnElem; } - - long Name2Size( const String& ) const; - String Size2Name( long ) const; - - String GetIndexName( ULONG nIndex ) const; - long GetIndexSize( ULONG nIndex ) const; -}; - -#endif // _CTRLTOOL_HXX diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/dialogclosedlistener.hxx deleted file mode 100644 index b2d0f68bf59d..000000000000 --- a/svtools/inc/dialogclosedlistener.hxx +++ /dev/null @@ -1,80 +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: dialogclosedlistener.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX -#define _SVTOOLS_DIALOGCLOSEDLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //===================================================================== - //= ODialogClosedListener - //===================================================================== - /** - C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener - */ - class SVT_DLLPUBLIC DialogClosedListener : - public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener > - { - private: - /** - This link will be called when the dialog was closed. - - The link must have the type: - DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); - */ - Link m_aDialogClosedLink; - - public: - DialogClosedListener(); - DialogClosedListener( const Link& rLink ); - - inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } - - // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX - diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/dialogcontrolling.hxx deleted file mode 100644 index edb425f78b00..000000000000 --- a/svtools/inc/dialogcontrolling.hxx +++ /dev/null @@ -1,309 +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: dialogcontrolling.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_DIALOGCONTROLLING_HXX -#define SVTOOLS_DIALOGCONTROLLING_HXX - -#include - -#include -#include - -#include -#include - -//........................................................................ -namespace svt -{ -//........................................................................ - - //===================================================================== - //= IWindowOperator - //===================================================================== - /** an abstract interface for operating on a ->Window - */ - class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator - { - public: - /** called when an event happened which should be reacted to - - @param _rTrigger - the event which triggered the call. If the Id of the event is 0, then this is the initial - call which is made when ->_rOperateOn is added to the responsibility of the DialogController. - @param _rOperateOn - the window on which to operate - */ - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; - - virtual ~IWindowOperator(); - }; - typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; - - //===================================================================== - //= IWindowEventFilter - //===================================================================== - /** an abstract interface for deciding whether a ->VclWindowEvent - is worth paying attention to - */ - class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowEventFilter - { - public: - virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const = 0; - - virtual ~IWindowEventFilter(); - }; - typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; - - //===================================================================== - //= DialogController - //===================================================================== - struct DialogController_Data; - /** a class controlling interactions between dialog controls - - An instance of this class listens to all events fired by a certain - ->Control (more precise, a ->Window), the so-called instigator. - - Additionally, the ->DialogController maintains a list of windows which - are affected by changes in the instigator window. Let's call those the - dependent windows. - - Now, by help of an owner-provided ->IWindowEventFilter, the ->DialogController - decides which events are worth attention. By help of an owner-provided - ->IWindowOperator, it handles those events for all dependent windows. - */ - class SVT_DLLPUBLIC DialogController - { - private: - ::std::auto_ptr< DialogController_Data > m_pImpl; - - public: - DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); - virtual ~DialogController(); - - /** adds a window to the list of dependent windows - - @param _rWindow - The window to add to the list of dependent windows. - - The caller is responsible for life-time control: The given window - must live at least as long as the ->DialogController instance does. - */ - void addDependentWindow( Window& _rWindow ); - - /** resets the controller so that no actions happend anymore. - - The instances is disfunctional after this method has been called. - */ - void reset(); - - private: - void impl_Init(); - void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); - void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); - - DECL_LINK( OnWindowEvent, const VclWindowEvent* ); - - private: - DialogController( const DialogController& ); // never implemented - DialogController& operator=( const DialogController& ); // never implemented - }; - typedef ::boost::shared_ptr< DialogController > PDialogController; - - //===================================================================== - //= ControlDependencyManager - //===================================================================== - struct ControlDependencyManager_Data; - /** helper class for managing control dependencies - - Instances of this class are intended to be held as members of a dialog/tabpage/whatever - class, with easy administration of inter-control dependencies (such as "Enable - control X if and only if checkbox Y is checked). - */ - class SVT_DLLPUBLIC ControlDependencyManager - { - private: - ::std::auto_ptr< ControlDependencyManager_Data > m_pImpl; - - public: - ControlDependencyManager(); - ~ControlDependencyManager(); - - /** clears all dialog controllers previously added to the manager - */ - void clear(); - - /** ensures that a given window is enabled or disabled, according to the check state - of a given radio button - @param _rRadio - denotes the radio button whose check state is to observe - @param _rDependentWindow - denotes the window which should be enabled when ->_rRadio is checked, and - disabled when it's unchecked - */ - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); - - /** ensures that a given window is enabled or disabled, according to the mark state - of a given check box - @param _rBox - denotes the check box whose mark state is to observe - @param _rDependentWindow - denotes the window which should be enabled when ->_rBox is marked, and - disabled when it's unmarked - */ - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); - - /** adds a non-standard controller whose functionality is not covered by the other methods - - @param _pController - the controller to add to the manager. Must not be . - */ - void addController( const PDialogController& _pController ); - - private: - ControlDependencyManager( const ControlDependencyManager& ); // never implemented - ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented - }; - - //===================================================================== - //= EnableOnCheck - //===================================================================== - /** a helper class implementing the ->IWindowOperator interface, - which enables a dependent window depending on the check state of - an instigator window. - - @see DialogController - */ - template< class CHECKABLE > - class SVT_DLLPUBLIC EnableOnCheck : public IWindowOperator - { - public: - typedef CHECKABLE SourceType; - - private: - SourceType& m_rCheckable; - - public: - /** constructs the instance - - @param _rCheckable - a ->Window instance which supports a boolean method IsChecked. Usually - a ->RadioButton or ->CheckBox - */ - EnableOnCheck( SourceType& _rCheckable ) - :m_rCheckable( _rCheckable ) - { - } - - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const - { - _rOperateOn.Enable( m_rCheckable.IsChecked() ); - } - }; - - //===================================================================== - //= FilterForRadioOrCheckToggle - //===================================================================== - /** a helper class implementing the ->IWindowEventFilter interface, - which filters for radio buttons or check boxes being toggled. - - Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE - and the ->VCLEVENT_CHECKBOX_TOGGLE event. - */ - class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter - { - const Window& m_rWindow; - public: - FilterForRadioOrCheckToggle( const Window& _rWindow ) - :m_rWindow( _rWindow ) - { - } - - bool payAttentionTo( const VclWindowEvent& _rEvent ) const - { - if ( ( _rEvent.GetWindow() == &m_rWindow ) - && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) - || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE ) - ) - ) - return true; - return false; - } - }; - - //===================================================================== - //= RadioDependentEnabler - //===================================================================== - /** a ->DialogController derivee which enables or disables its dependent windows, - depending on the check state of a radio button. - - The usage of this class is as simple as - - pController = new RadioDependentEnabler( m_aOptionSelectSomething ); - pController->addDependentWindow( m_aLabelSelection ); - pController->addDependentWindow( m_aListSelection ); - - - With this, both m_aLabelSelection and m_aListSelection will - be disabled if and only m_aOptionSelectSomething is checked. - */ - class SVT_DLLPUBLIC RadioDependentEnabler : public DialogController - { - public: - RadioDependentEnabler( RadioButton& _rButton ) - :DialogController( _rButton, - PWindowEventFilter( new FilterForRadioOrCheckToggle( _rButton ) ), - PWindowOperator( new EnableOnCheck< RadioButton >( _rButton ) ) ) - { - } - - RadioDependentEnabler( CheckBox& _rBox ) - :DialogController( _rBox, - PWindowEventFilter( new FilterForRadioOrCheckToggle( _rBox ) ), - PWindowOperator( new EnableOnCheck< CheckBox >( _rBox ) ) ) - { - } - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // SVTOOLS_DIALOGCONTROLLING_HXX - diff --git a/svtools/inc/expander.hxx b/svtools/inc/expander.hxx deleted file mode 100644 index 06a527195780..000000000000 --- a/svtools/inc/expander.hxx +++ /dev/null @@ -1,95 +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: expander.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_EXPANDER_HXX -#define _SV_EXPANDER_HXX - -#include -#include - -enum SvExpanderStateType -{ - EST_MIN=1, - EST_PLUS=2, - EST_MIN_DOWN=3, - EST_PLUS_DOWN=4, - EST_NONE=5, - EST_MIN_DIS=6, - EST_PLUS_DIS=7, - EST_MIN_DOWN_DIS=8, - EST_PLUS_DOWN_DIS=9 -}; - -class SvExpander: public Control -{ -private: - Point aImagePos; - Point aTextPos; - Image aActiveImage; - Rectangle maFocusRect; - ImageList maExpanderImages; - BOOL mbIsExpanded; - BOOL mbHasFocusRect; - BOOL mbIsInMouseDown; - Link maToggleHdl; - SvExpanderStateType eType; - -protected: - - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - - virtual void Click(); - virtual void Resize(); - -public: - SvExpander( Window* pParent, WinBits nStyle = 0 ); - SvExpander( Window* pParent, const ResId& rResId ); - - BOOL IsExpanded() {return mbIsExpanded;} - - void SetToExpanded(BOOL bFlag=TRUE); - - void SetExpanderImage( SvExpanderStateType eType); - Image GetExpanderImage(SvExpanderStateType eType); - Size GetMinSize() const; - - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } -}; - - - -#endif diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx deleted file mode 100644 index 228ef9823fd2..000000000000 --- a/svtools/inc/extcolorcfg.hxx +++ /dev/null @@ -1,131 +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: extcolorcfg.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef INCLUDED_SVTOOLS_EXTCOLORCFG_HXX -#define INCLUDED_SVTOOLS_EXTCOLORCFG_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include - -//----------------------------------------------------------------------------- -namespace svtools{ -/* -----------------------------22.03.2002 15:36------------------------------ - - ---------------------------------------------------------------------------*/ -class ExtendedColorConfig_Impl; -class ExtendedColorConfigValue -{ - ::rtl::OUString m_sName; - ::rtl::OUString m_sDisplayName; - sal_Int32 m_nColor; - sal_Int32 m_nDefaultColor; -public: - ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){} - ExtendedColorConfigValue(const ::rtl::OUString& _sName - ,const ::rtl::OUString& _sDisplayName - ,sal_Int32 _nColor - ,sal_Int32 _nDefaultColor) - : m_sName(_sName) - ,m_sDisplayName(_sDisplayName) - ,m_nColor(_nColor) - ,m_nDefaultColor(_nDefaultColor) - {} - - inline ::rtl::OUString getName() const { return m_sName; } - inline ::rtl::OUString getDisplayName() const { return m_sDisplayName; } - inline sal_Int32 getColor() const { return m_nColor; } - inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } - - inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } - - sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const - { return m_nColor != rCmp.m_nColor;} -}; -/* -----------------------------22.03.2002 15:36------------------------------ - - ---------------------------------------------------------------------------*/ -class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener -{ - friend class ExtendedColorConfig_Impl; -private: - static ExtendedColorConfig_Impl* m_pImpl; -public: - ExtendedColorConfig(); - ~ExtendedColorConfig(); - - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - - // get the configured value - ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const; - sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const; -}; -/* -----------------------------22.03.2002 15:31------------------------------ - - ---------------------------------------------------------------------------*/ -class SVT_DLLPUBLIC EditableExtendedColorConfig -{ - ExtendedColorConfig_Impl* m_pImpl; - sal_Bool m_bModified; -public: - EditableExtendedColorConfig(); - ~EditableExtendedColorConfig(); - - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSchemeNames() const; - void DeleteScheme(const ::rtl::OUString& rScheme ); - void AddScheme(const ::rtl::OUString& rScheme ); - sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); - const ::rtl::OUString& GetCurrentSchemeName()const; - void SetCurrentSchemeName(const ::rtl::OUString& rScheme); - - ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const; - sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; - void SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue); - void SetModified(); - void ClearModified(){m_bModified = sal_False;} - sal_Bool IsModified()const{return m_bModified;} - void Commit(); - - void DisableBroadcast(); - void EnableBroadcast(); -}; -}//namespace svtools -#endif - diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx deleted file mode 100644 index a4ad0ad05dce..000000000000 --- a/svtools/inc/filectrl.hxx +++ /dev/null @@ -1,114 +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: filectrl.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_FILECTRL_HXX -#define _SV_FILECTRL_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#ifndef _SV_BUTTON_HXX -#include -#endif - - -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! - -// Flags for FileControl -typedef USHORT FileControlMode; -#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely - - -// Flags for internal use of FileControl -typedef USHORT FileControlMode_Internal; -#define FILECTRL_INRESIZE ((USHORT)0x0001) -#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) - - -class SVT_DLLPUBLIC FileControl : public Window -{ -private: - Edit maEdit; - PushButton maButton; - - String maButtonText; - BOOL mbOpenDlg; - - Link maDialogCreatedHdl; - - FileControlMode mnFlags; - FileControlMode_Internal mnInternalFlags; - -private: - SVT_DLLPRIVATE void ImplBrowseFile( ); - -protected: - SVT_DLLPRIVATE void Resize(); - SVT_DLLPRIVATE void GetFocus(); - SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); - SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* ); - -public: - FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); - ~FileControl(); - - Edit& GetEdit() { return maEdit; } - PushButton& GetButton() { return maButton; } - - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); - - void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } - BOOL IsOpenDialog() const { return mbOpenDlg; } - - void SetText( const XubString& rStr ); - XubString GetText() const; - UniString GetSelectedText() const { return maEdit.GetSelected(); } - - void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } - Selection GetSelection() const { return maEdit.GetSelection(); } - - void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } - BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } - - //------ - //manipulate the Button-Text: - XubString GetButtonText() const { return maButtonText; } - void SetButtonText( const XubString& rStr ); - void ResetButtonText(); - - //------ - //use this to manipulate the dialog bevore executing it: - void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } - const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } -}; - -#endif - diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx deleted file mode 100644 index 04cf41130bce..000000000000 --- a/svtools/inc/filedlg.hxx +++ /dev/null @@ -1,111 +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: filedlg.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_FILEDLG_HXX -#define _SVT_FILEDLG_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _DIALOG_HXX -#include -#endif - -class Edit; -class ImpSvFileDlg; - -// -------------- -// - SvPathDialog - -// -------------- - -class SVT_DLLPUBLIC PathDialog : public ModalDialog -{ -private: - friend class FileDialog; // Imp... - - ImpSvFileDlg* pImpFileDlg; // Implementation - Link aOKHdlLink; // Link zum OK-Handler - -protected: - UniString aDfltExt; // Default - Extension - -public: - PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); - ~PathDialog(); - - virtual long OK(); - - void SetPath( const UniString& rNewPath ); - void SetPath( const Edit& rEdit ); - UniString GetPath() const; - - void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; } - const Link& GetOKHdl() const { return aOKHdlLink; } - - virtual short Execute(); -}; - -// -------------- -// - SvFileDialog - -// -------------- - -class SVT_DLLPUBLIC FileDialog : public PathDialog -{ -private: - Link aFileHdlLink; // Link zum FileSelect-Handler - Link aFilterHdlLink; // Link zum FilterSelect-Handler - -public: - FileDialog( Window* pParent, WinBits nWinStyle ); - ~FileDialog(); - - virtual void FileSelect(); - virtual void FilterSelect(); - - void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; } - const UniString& GetDefaultExt() const { return aDfltExt; } - void AddFilter( const UniString& rFilter, const UniString& rType ); - void RemoveFilter( const UniString& rFilter ); - void RemoveAllFilter(); - void SetCurFilter( const UniString& rFilter ); - UniString GetCurFilter() const; - USHORT GetFilterCount() const; - UniString GetFilterName( USHORT nPos ) const; - UniString GetFilterType( USHORT nPos ) const; - - void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } - const Link& GetFileSelectHdl() const { return aFileHdlLink; } - void SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; } - const Link& GetFilterSelectHdl() const { return aFilterHdlLink; } - - void SetOkButtonText( const UniString& rText ); - void SetCancelButtonText( const UniString& rText ); -}; - -#endif // _FILEDLG_HXX diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/filedlg2.hrc deleted file mode 100644 index a75e9047eafb..000000000000 --- a/svtools/inc/filedlg2.hrc +++ /dev/null @@ -1,44 +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: filedlg2.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define STR_FILEDLG_SELECT 1000 -#define STR_FILEDLG_CANTCHDIR 1001 -#define STR_FILEDLG_OPEN 1002 -#define STR_FILEDLG_FILE 1003 -#define STR_FILEDLG_DIR 1004 -#define STR_FILEDLG_TYPE 1005 -#define STR_FILEDLG_CANTOPENFILE 1006 -#define STR_FILEDLG_CANTOPENDIR 1007 -#define STR_FILEDLG_OVERWRITE 1008 -#define STR_FILEDLG_GOUP 1009 -#define STR_FILEDLG_SAVE 1010 -#define STR_FILEDLG_DRIVES 1011 -#define STR_FILEDLG_HOME 1012 -#define STR_FILEDLG_NEWDIR 1013 -#define STR_FILEDLG_ASKNEWDIR 1014 diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx deleted file mode 100644 index 7527436e0f38..000000000000 --- a/svtools/inc/fileview.hxx +++ /dev/null @@ -1,274 +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: fileview.hxx,v $ - * $Revision: 1.21 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_FILEVIEW_HXX -#define _SVT_FILEVIEW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include - -// class SvtFileView ----------------------------------------------------- - -#define FILEVIEW_ONLYFOLDER 0x0001 -#define FILEVIEW_MULTISELECTION 0x0002 - -#define FILEVIEW_SHOW_TITLE 0x0010 -#define FILEVIEW_SHOW_SIZE 0x0020 -#define FILEVIEW_SHOW_DATE 0x0040 -#define FILEVIEW_SHOW_ALL 0x0070 - -class ViewTabListBox_Impl; -class SvtFileView_Impl; -class SvLBoxEntry; -class HeaderBar; -class IUrlFilter; - -/// the result of an action in the FileView -enum FileViewResult -{ - eSuccess, - eFailure, - eTimeout, - eStillRunning -}; - -/// describes parameters for doing an action on the FileView asynchronously -struct FileViewAsyncAction -{ - sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds - sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned - Link aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result - - FileViewAsyncAction() - { - nMinTimeout = nMaxTimeout = 0; - } -}; - -class SVT_DLLPUBLIC SvtFileView : public Control -{ -private: - SvtFileView_Impl* mpImp; - - ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; - - SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); - - DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); - DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); - -protected: - virtual void GetFocus(); - -public: - SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection ); - SvtFileView( Window* pParent, const ResId& rResId, sal_Int8 nFlags ); - ~SvtFileView(); - - const String& GetViewURL() const; - String GetURL( SvLBoxEntry* pEntry ) const; - String GetCurrentURL() const; - - sal_Bool GetParentURL( String& _rParentURL ) const; - sal_Bool CreateNewFolder( const String& rNewFolder ); - - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; - void SetSizePixel( const Size& rNewSize ); - using Window::SetPosSizePixel; - virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - - /** initialize the view with the content of a folder given by URL, and aply an immediate filter - - @param rFolderURL - the URL of the folder whose content is to be read - @param rFilter - the initial filter to be applied - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult Initialize( - const String& rFolderURL, - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList - ); - - FileViewResult Initialize( - const String& rFolderURL, - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor ); - /** initialze the view with a sequence of contents, which have already been obtained elsewhere - - This method will never return eStillRunning, since it will fill the - view synchronously - */ - sal_Bool Initialize( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); - - /** initializes the view with the content of a folder given by an UCB content - */ - sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, - const String& rFilter ); - - /** reads the current content of the current folder again, and applies the given filter to it - - Note 1: The folder is really read a second time. This implies that any new elements (which were - not present when you called Initialize the last time) are now displayed. - - Note 2: This method must not be called when you previously initialized the view from a sequence - of strings, or a UNO content object. - - @param rFilter - the filter to be applied - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult ExecuteFilter( - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor - ); - - /** cancels a running async action (if any) - - @seealso Initialize - @seealso ExecuteFilter - @seealso FileViewAsyncAction - */ - void CancelRunningAsyncAction(); - - /** initializes the view with the parent folder of the current folder - - @param rNewURL - the URL of the folder which we just navigated to - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult PreviousLevel( - const FileViewAsyncAction* pAsyncDescriptor - ); - - void SetNoSelection(); - void ResetCursor(); - - void SetSelectHdl( const Link& rHdl ); - void SetDoubleClickHdl( const Link& rHdl ); - void SetOpenDoneHdl( const Link& rHdl ); - - ULONG GetSelectionCount() const; - SvLBoxEntry* FirstSelected() const; - SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; - void EnableAutoResize(); - void SetFocus(); - - void EnableContextMenu( sal_Bool bEnable ); - void EnableDelete( sal_Bool bEnable ); - void EnableNameReplacing( sal_Bool bEnable = sal_True ); - // translate folder names or display doc-title instead of file name - // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! - - // save and load column size and sort order - String GetConfigString() const; - void SetConfigString( const String& rCfgStr ); - - void SetUrlFilter( const IUrlFilter* _pFilter ); - const IUrlFilter* GetUrlFilter( ) const; - - void EndInplaceEditing( bool _bCancel ); - -protected: - virtual void StateChanged( StateChangedType nStateChange ); -}; - -// struct SvtContentEntry ------------------------------------------------ - -struct SvtContentEntry -{ - sal_Bool mbIsFolder; - UniString maURL; - - SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) : - mbIsFolder( bIsFolder ), maURL( rURL ) {} -}; - -namespace svtools { - -// ----------------------------------------------------------------------- -// QueryDeleteDlg_Impl -// ----------------------------------------------------------------------- - -enum QueryDeleteResult_Impl -{ - QUERYDELETE_YES = 0, - QUERYDELETE_NO, - QUERYDELETE_ALL, - QUERYDELETE_CANCEL -}; - -class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog -{ - FixedText _aEntryLabel; - FixedText _aEntry; - FixedText _aQueryMsg; - - PushButton _aYesButton; - PushButton _aAllButton; - PushButton _aNoButton; - CancelButton _aCancelButton; - - QueryDeleteResult_Impl _eResult; - -private: - - DECL_DLLPRIVATE_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton* ); - -public: - - QueryDeleteDlg_Impl( Window* pParent, - const String& rName ); - - void EnableAllButton() { _aAllButton.Enable( sal_True ); } - QueryDeleteResult_Impl GetResult() const { return _eResult; } -}; - -} - -#endif // _SVT_FILEVIEW_HXX - diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx deleted file mode 100644 index d323dada3396..000000000000 --- a/svtools/inc/fltdefs.hxx +++ /dev/null @@ -1,155 +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: fltdefs.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - -#include - -#ifndef _FLTDEFS_HXX -#define _FLTDEFS_HXX - - -#if defined ( WIN ) || defined ( WNT ) - -#define RGBQUAD RGBQUADWIN - -typedef struct RGBQUAD -{ - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; - - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : - rgbBlue ( cBlue ), - rgbGreen ( cGreen ), - rgbRed ( cRed ), - rgbReserved ( 0 ) {}; -} RGBQUAD; - - -#ifdef WIN -typedef BYTE huge* PDIBBYTE; -#define MEMCPY hmemcpy -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) -#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) -#define MEMSET( pDst, cByte, nCount ) \ -{ \ - PDIBBYTE pTmp = (PDIBBYTE) pDst; \ - for ( ULONG i = 0; i < nCount; i++ )\ - *pTmp++ = cByte; \ -} - -#else - -typedef BYTE* PDIBBYTE; -#define MEMCPY memcpy -#define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) -#define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) - -#endif -#else - -typedef BYTE* PDIBBYTE; -#define MEMCPY memcpy -#define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) -#define GLOBALFREE(pPointer) (delete[] (pPointer)) - -#endif - - -#if defined ( OS2 ) || defined ( UNX ) -void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); -void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); - -#ifdef OS2 -#define RGBQUAD RGBQUADOS2 -#define BITMAPFILEHEADER BITMAPFILEHEADEROS2 -#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2 -#define BITMAPINFOHEADER BITMAPINFOHEADEROS2 -#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2 -#define BITMAPINFO BITMAPINFOOS2 -#define PBITMAPINFO PBITMAPINFOOS2 -#endif - -typedef struct RGBQUAD -{ - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; - - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : - rgbBlue ( cBlue ), - rgbGreen ( cGreen ), - rgbRed ( cRed ), - rgbReserved ( 0 ) {}; -} RGBQUAD; - -typedef struct BITMAPFILEHEADER -{ - UINT16 bfType; - UINT32 bfSize; - UINT16 bfReserved1; - UINT16 bfReserved2; - UINT32 bfOffBits; -} BITMAPFILEHEADER; -typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; - -typedef struct BITMAPINFOHEADER -{ - UINT32 biSize; - UINT32 biWidth; - UINT32 biHeight; - UINT16 biPlanes; - UINT16 biBitCount; - UINT32 biCompression; - UINT32 biSizeImage; - UINT32 biXPelsPerMeter; - UINT32 biYPelsPerMeter; - UINT32 biClrUsed; - UINT32 biClrImportant; -} BITMAPINFOHEADER; -typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; - -typedef struct BITMAPINFO -{ - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[1]; -} BITMAPINFO; -typedef BITMAPINFO* PBITMAPINFO; - -#endif -#endif diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/fontsubstconfig.hxx deleted file mode 100644 index 7ce7e64362b5..000000000000 --- a/svtools/inc/fontsubstconfig.hxx +++ /dev/null @@ -1,71 +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: fontsubstconfig.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_FONTSUBSTCONFIG_HXX -#define _SVT_FONTSUBSTCONFIG_HXX - -#include "svtools/svtdllapi.h" -#include - -struct SvtFontSubstConfig_Impl; - -//----------------------------------------------------------------------------- -struct SubstitutionStruct -{ - rtl::OUString sFont; - rtl::OUString sReplaceBy; - sal_Bool bReplaceAlways; - sal_Bool bReplaceOnScreenOnly; -}; -//----------------------------------------------------------------------------- -class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem -{ - sal_Bool bIsEnabled; - SvtFontSubstConfig_Impl* pImpl; -public: - SvtFontSubstConfig(); - virtual ~SvtFontSubstConfig(); - - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - - sal_Bool IsEnabled() const {return bIsEnabled;} - void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();} - - sal_Int32 SubstitutionCount() const; - void ClearSubstitutions(); - const SubstitutionStruct* GetSubstitution(sal_Int32 nPos); - void AddSubstitution(const SubstitutionStruct& rToAdd); - void Apply(); -}; - -#endif - - - diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx deleted file mode 100644 index 63a2f296c753..000000000000 --- a/svtools/inc/framestatuslistener.hxx +++ /dev/null @@ -1,119 +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: framestatuslistener.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_FRAMESTATUSLISTENER_HXX -#define _SVTOOLS_FRAMESTATUSLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef INCLUDED_HASH_MAP -#include -#define INCLUDED_HASH_MAP -#endif - -namespace svt -{ - -class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XFrameActionListener, - public ::com::sun::star::lang::XComponent, - public ::comphelper::OBaseMutex, - public ::cppu::OWeakObject -{ - public: - FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); - virtual ~FrameStatusListener(); - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; - - void updateStatus( const rtl::OUString aCommandURL ); - - // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); - void bindListener(); - void unbindListener(); - sal_Bool isBound() const; - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0; - - // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); - - protected: - struct Listener - { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : - aURL( rURL ), xDispatch( rDispatch ) {} - - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - }; - - typedef ::std::hash_map< ::rtl::OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; - - sal_Bool m_bInitialized : 1, - m_bDisposed : 1; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - URLToDispatchMap m_aListenerMap; -}; - -} - -#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/helpagentwindow.hxx deleted file mode 100644 index b46f3a253f16..000000000000 --- a/svtools/inc/helpagentwindow.hxx +++ /dev/null @@ -1,91 +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: helpagentwindow.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_HELPAGENTWIDNOW_HXX_ -#define _SVTOOLS_HELPAGENTWIDNOW_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include - -//........................................................................ -namespace svt -{ -//........................................................................ - - //==================================================================== - //= IHelpAgentCallback - //==================================================================== - class IHelpAgentCallback - { - public: - virtual void helpRequested() = 0; - virtual void closeAgent() = 0; - }; - - //==================================================================== - //= HelpAgentWindow - //==================================================================== - class SVT_DLLPUBLIC HelpAgentWindow : public FloatingWindow - { - protected: - Window* m_pCloser; - IHelpAgentCallback* m_pCallback; - Size m_aPreferredSize; - Image m_aPicture; - - public: - HelpAgentWindow( Window* _pParent ); - ~HelpAgentWindow(); - - /// returns the preferred size of the window - const Size& getPreferredSizePixel() const { return m_aPreferredSize; } - - // callback handler maintainance - void setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; } - IHelpAgentCallback* getCallback() const { return m_pCallback; } - - protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - - DECL_LINK( OnButtonClicked, Window* ); - - private: - SVT_DLLPRIVATE Size implOptimalButtonSize( const Image& _rButtonImage ); - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // _SVTOOLS_HELPAGENTWIDNOW_HXX_ - diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/htmlkywd.hxx deleted file mode 100644 index ce7cb4dd3e0f..000000000000 --- a/svtools/inc/htmlkywd.hxx +++ /dev/null @@ -1,804 +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: htmlkywd.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _HTMLKYWD_HXX -#define _HTMLKYWD_HXX - -#include "sal/config.h" - -#define OOO_STRING_SVTOOLS_HTML_doctype32 \ - "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" -#define OOO_STRING_SVTOOLS_HTML_doctype40 \ - "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" - -// diese werden nur eingeschaltet -#define OOO_STRING_SVTOOLS_HTML_area "AREA" -#define OOO_STRING_SVTOOLS_HTML_base "BASE" -#define OOO_STRING_SVTOOLS_HTML_comment "!--" -#define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE" -#define OOO_STRING_SVTOOLS_HTML_embed "EMBED" -#define OOO_STRING_SVTOOLS_HTML_figureoverlay "OVERLAY" -#define OOO_STRING_SVTOOLS_HTML_horzrule "HR" -#define OOO_STRING_SVTOOLS_HTML_horztab "TAB" -#define OOO_STRING_SVTOOLS_HTML_image "IMG" -#define OOO_STRING_SVTOOLS_HTML_image2 "IMAGE" -#define OOO_STRING_SVTOOLS_HTML_input "INPUT" -#define OOO_STRING_SVTOOLS_HTML_isindex "ISINDEX" -#define OOO_STRING_SVTOOLS_HTML_linebreak "BR" -#define OOO_STRING_SVTOOLS_HTML_li "LI" -#define OOO_STRING_SVTOOLS_HTML_link "LINK" -#define OOO_STRING_SVTOOLS_HTML_meta "META" -#define OOO_STRING_SVTOOLS_HTML_nextid "NEXTID" -#define OOO_STRING_SVTOOLS_HTML_nobr "NOBR" -#define OOO_STRING_SVTOOLS_HTML_of "OF" -#define OOO_STRING_SVTOOLS_HTML_option "OPTION" -#define OOO_STRING_SVTOOLS_HTML_param "PARAM" -#define OOO_STRING_SVTOOLS_HTML_range "RANGE" -#define OOO_STRING_SVTOOLS_HTML_spacer "SPACER" -#define OOO_STRING_SVTOOLS_HTML_wbr "WBR" - -// diese werden wieder abgeschaltet -#define OOO_STRING_SVTOOLS_HTML_abbreviation "ABBREV" -#define OOO_STRING_SVTOOLS_HTML_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_acronym "ACRONYM" -#define OOO_STRING_SVTOOLS_HTML_address "ADDRESS" -#define OOO_STRING_SVTOOLS_HTML_anchor "A" -#define OOO_STRING_SVTOOLS_HTML_applet "APPLET" -#define OOO_STRING_SVTOOLS_HTML_array "ARRAY" -#define OOO_STRING_SVTOOLS_HTML_author "AU" -#define OOO_STRING_SVTOOLS_HTML_banner "BANNER" -#define OOO_STRING_SVTOOLS_HTML_bar "BAR" -#define OOO_STRING_SVTOOLS_HTML_basefont "BASEFONT" -#define OOO_STRING_SVTOOLS_HTML_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_bigprint "BIG" -#define OOO_STRING_SVTOOLS_HTML_blink "BLINK" -#define OOO_STRING_SVTOOLS_HTML_blockquote "BLOCKQUOTE" -#define OOO_STRING_SVTOOLS_HTML_blockquote30 "BQ" -#define OOO_STRING_SVTOOLS_HTML_body "BODY" -#define OOO_STRING_SVTOOLS_HTML_bold "B" -#define OOO_STRING_SVTOOLS_HTML_boldtext "BT" -#define OOO_STRING_SVTOOLS_HTML_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_caption "CAPTION" -#define OOO_STRING_SVTOOLS_HTML_center "CENTER" -#define OOO_STRING_SVTOOLS_HTML_citiation "CITE" -#define OOO_STRING_SVTOOLS_HTML_code "CODE" -#define OOO_STRING_SVTOOLS_HTML_col "COL" -#define OOO_STRING_SVTOOLS_HTML_colgroup "COLGROUP" -#define OOO_STRING_SVTOOLS_HTML_credit "CREDIT" -#define OOO_STRING_SVTOOLS_HTML_dd "DD" -#define OOO_STRING_SVTOOLS_HTML_deflist "DL" -#define OOO_STRING_SVTOOLS_HTML_deletedtext "DEL" -#define OOO_STRING_SVTOOLS_HTML_dirlist "DIR" -#define OOO_STRING_SVTOOLS_HTML_division "DIV" -#define OOO_STRING_SVTOOLS_HTML_dot "DOT" -#define OOO_STRING_SVTOOLS_HTML_doubledot "DDOT" -#define OOO_STRING_SVTOOLS_HTML_dt "DT" -#define OOO_STRING_SVTOOLS_HTML_emphasis "EM" -#define OOO_STRING_SVTOOLS_HTML_figure "FIG" -#define OOO_STRING_SVTOOLS_HTML_font "FONT" -#define OOO_STRING_SVTOOLS_HTML_footnote "FN" -#define OOO_STRING_SVTOOLS_HTML_form "FORM" -#define OOO_STRING_SVTOOLS_HTML_frame "FRAME" -#define OOO_STRING_SVTOOLS_HTML_frameset "FRAMESET" -#define OOO_STRING_SVTOOLS_HTML_hat "HAT" -#define OOO_STRING_SVTOOLS_HTML_head1 "H1" -#define OOO_STRING_SVTOOLS_HTML_head2 "H2" -#define OOO_STRING_SVTOOLS_HTML_head3 "H3" -#define OOO_STRING_SVTOOLS_HTML_head4 "H4" -#define OOO_STRING_SVTOOLS_HTML_head5 "H5" -#define OOO_STRING_SVTOOLS_HTML_head6 "H6" -#define OOO_STRING_SVTOOLS_HTML_head "HEAD" -#define OOO_STRING_SVTOOLS_HTML_html "HTML" -#define OOO_STRING_SVTOOLS_HTML_iframe "IFRAME" -#define OOO_STRING_SVTOOLS_HTML_ilayer "ILAYER" -#define OOO_STRING_SVTOOLS_HTML_insertedtext "INS" -#define OOO_STRING_SVTOOLS_HTML_italic "I" -#define OOO_STRING_SVTOOLS_HTML_item "ITEM" -#define OOO_STRING_SVTOOLS_HTML_keyboard "KBD" -#define OOO_STRING_SVTOOLS_HTML_language "LANG" -#define OOO_STRING_SVTOOLS_HTML_layer "LAYER" -#define OOO_STRING_SVTOOLS_HTML_listheader "LH" -#define OOO_STRING_SVTOOLS_HTML_map "MAP" -#define OOO_STRING_SVTOOLS_HTML_math "MATH" -#define OOO_STRING_SVTOOLS_HTML_menulist "MENU" -#define OOO_STRING_SVTOOLS_HTML_multicol "MULTICOL" -#define OOO_STRING_SVTOOLS_HTML_noembed "NOEMBED" -#define OOO_STRING_SVTOOLS_HTML_noframe "NOFRAME" -#define OOO_STRING_SVTOOLS_HTML_noframes "NOFRAMES" -#define OOO_STRING_SVTOOLS_HTML_noscript "NOSCRIPT" -#define OOO_STRING_SVTOOLS_HTML_note "NOTE" -#define OOO_STRING_SVTOOLS_HTML_object "OBJECT" -#define OOO_STRING_SVTOOLS_HTML_orderlist "OL" -#define OOO_STRING_SVTOOLS_HTML_parabreak "P" -#define OOO_STRING_SVTOOLS_HTML_person "PERSON" -#define OOO_STRING_SVTOOLS_HTML_plaintext "T" -#define OOO_STRING_SVTOOLS_HTML_preformtxt "PRE" -#define OOO_STRING_SVTOOLS_HTML_root "ROOT" -#define OOO_STRING_SVTOOLS_HTML_row "ROW" -#define OOO_STRING_SVTOOLS_HTML_sample "SAMP" -#define OOO_STRING_SVTOOLS_HTML_script "SCRIPT" -#define OOO_STRING_SVTOOLS_HTML_select "SELECT" -#define OOO_STRING_SVTOOLS_HTML_shortquote "Q" -#define OOO_STRING_SVTOOLS_HTML_smallprint "SMALL" -#define OOO_STRING_SVTOOLS_HTML_span "SPAN" -#define OOO_STRING_SVTOOLS_HTML_squareroot "AQRT" -#define OOO_STRING_SVTOOLS_HTML_strikethrough "S" -#define OOO_STRING_SVTOOLS_HTML_strong "STRONG" -#define OOO_STRING_SVTOOLS_HTML_style "STYLE" -#define OOO_STRING_SVTOOLS_HTML_subscript "SUB" -#define OOO_STRING_SVTOOLS_HTML_superscript "SUP" -#define OOO_STRING_SVTOOLS_HTML_table "TABLE" -#define OOO_STRING_SVTOOLS_HTML_tablerow "TR" -#define OOO_STRING_SVTOOLS_HTML_tabledata "TD" -#define OOO_STRING_SVTOOLS_HTML_tableheader "TH" -#define OOO_STRING_SVTOOLS_HTML_tbody "TBODY" -#define OOO_STRING_SVTOOLS_HTML_teletype "TT" -#define OOO_STRING_SVTOOLS_HTML_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_textarea "TEXTAREA" -#define OOO_STRING_SVTOOLS_HTML_textflow "TEXTFLOW" -#define OOO_STRING_SVTOOLS_HTML_tfoot "TFOOT" -#define OOO_STRING_SVTOOLS_HTML_thead "THEAD" -#define OOO_STRING_SVTOOLS_HTML_tilde "TILDE" -#define OOO_STRING_SVTOOLS_HTML_title "TITLE" -#define OOO_STRING_SVTOOLS_HTML_underline "U" -#define OOO_STRING_SVTOOLS_HTML_unorderlist "UL" -#define OOO_STRING_SVTOOLS_HTML_variable "VAR" -#define OOO_STRING_SVTOOLS_HTML_vector "VEC" - -// obsolete features -#define OOO_STRING_SVTOOLS_HTML_xmp "XMP" -#define OOO_STRING_SVTOOLS_HTML_listing "LISTING" - -// proposed features -#define OOO_STRING_SVTOOLS_HTML_definstance "DFN" -#define OOO_STRING_SVTOOLS_HTML_strike "STRIKE" -#define OOO_STRING_SVTOOLS_HTML_bgsound "BGSOUND" -#define OOO_STRING_SVTOOLS_HTML_comment2 "COMMENT" -#define OOO_STRING_SVTOOLS_HTML_marquee "MARQUEE" -#define OOO_STRING_SVTOOLS_HTML_plaintext2 "PLAINTEXT" -#define OOO_STRING_SVTOOLS_HTML_sdfield "SDFIELD" - -// die Namen fuer alle Zeichen -#define OOO_STRING_SVTOOLS_HTML_C_lt "lt" -#define OOO_STRING_SVTOOLS_HTML_C_gt "gt" -#define OOO_STRING_SVTOOLS_HTML_C_amp "amp" -#define OOO_STRING_SVTOOLS_HTML_C_quot "quot" -#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute" -#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave" -#define OOO_STRING_SVTOOLS_HTML_C_Acirc "Acirc" -#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde" -#define OOO_STRING_SVTOOLS_HTML_C_Aring "Aring" -#define OOO_STRING_SVTOOLS_HTML_C_Auml "Auml" -#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig" -#define OOO_STRING_SVTOOLS_HTML_C_Ccedil "Ccedil" -#define OOO_STRING_SVTOOLS_HTML_C_Eacute "Eacute" -#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave" -#define OOO_STRING_SVTOOLS_HTML_C_Ecirc "Ecirc" -#define OOO_STRING_SVTOOLS_HTML_C_Euml "Euml" -#define OOO_STRING_SVTOOLS_HTML_C_Iacute "Iacute" -#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave" -#define OOO_STRING_SVTOOLS_HTML_C_Icirc "Icirc" -#define OOO_STRING_SVTOOLS_HTML_C_Iuml "Iuml" -#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH" -#define OOO_STRING_SVTOOLS_HTML_C_Ntilde "Ntilde" -#define OOO_STRING_SVTOOLS_HTML_C_Oacute "Oacute" -#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve" -#define OOO_STRING_SVTOOLS_HTML_C_Ocirc "Ocirc" -#define OOO_STRING_SVTOOLS_HTML_C_Otilde "Otilde" -#define OOO_STRING_SVTOOLS_HTML_C_Ouml "Ouml" -#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash" -#define OOO_STRING_SVTOOLS_HTML_C_Uacute "Uacute" -#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave" -#define OOO_STRING_SVTOOLS_HTML_C_Ucirc "Ucirc" -#define OOO_STRING_SVTOOLS_HTML_C_Uuml "Uuml" -#define OOO_STRING_SVTOOLS_HTML_C_Yacute "Yacute" -#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN" -#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig" -#define OOO_STRING_SVTOOLS_HTML_S_aacute "aacute" -#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave" -#define OOO_STRING_SVTOOLS_HTML_S_acirc "acirc" -#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde" -#define OOO_STRING_SVTOOLS_HTML_S_aring "aring" -#define OOO_STRING_SVTOOLS_HTML_S_auml "auml" -#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig" -#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil" -#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute" -#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave" -#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc" -#define OOO_STRING_SVTOOLS_HTML_S_euml "euml" -#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute" -#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave" -#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc" -#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml" -#define OOO_STRING_SVTOOLS_HTML_S_eth "eth" -#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde" -#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute" -#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve" -#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc" -#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde" -#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml" -#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash" -#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute" -#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave" -#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc" -#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml" -#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute" -#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn" -#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml" -#define OOO_STRING_SVTOOLS_HTML_S_acute "acute" -#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar" -#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil" -#define OOO_STRING_SVTOOLS_HTML_S_cent "cent" -#define OOO_STRING_SVTOOLS_HTML_S_copy "copy" -#define OOO_STRING_SVTOOLS_HTML_S_curren "curren" -#define OOO_STRING_SVTOOLS_HTML_S_deg "deg" -#define OOO_STRING_SVTOOLS_HTML_S_divide "divide" -#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12" -#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14" -#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34" -#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl" -#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest" -#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo" -#define OOO_STRING_SVTOOLS_HTML_S_macr "macr" -#define OOO_STRING_SVTOOLS_HTML_S_micro "micro" -#define OOO_STRING_SVTOOLS_HTML_S_middot "middot" -#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp" -#define OOO_STRING_SVTOOLS_HTML_S_not "not" -#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf" -#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm" -#define OOO_STRING_SVTOOLS_HTML_S_para "para" -#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn" -#define OOO_STRING_SVTOOLS_HTML_S_pound "pound" -#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo" -#define OOO_STRING_SVTOOLS_HTML_S_reg "reg" -#define OOO_STRING_SVTOOLS_HTML_S_sect "sect" -#define OOO_STRING_SVTOOLS_HTML_S_shy "shy" -#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1" -#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2" -#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3" -#define OOO_STRING_SVTOOLS_HTML_S_times "times" -#define OOO_STRING_SVTOOLS_HTML_S_uml "uml" -#define OOO_STRING_SVTOOLS_HTML_S_yen "yen" - -// Netscape kennt noch ein paar in Grossbuchstaben ... -#define OOO_STRING_SVTOOLS_HTML_C_LT "LT" -#define OOO_STRING_SVTOOLS_HTML_C_GT "GT" -#define OOO_STRING_SVTOOLS_HTML_C_AMP "AMP" -#define OOO_STRING_SVTOOLS_HTML_C_QUOT "QUOT" -#define OOO_STRING_SVTOOLS_HTML_S_COPY "COPY" -#define OOO_STRING_SVTOOLS_HTML_S_REG "REG" - -// HTML4 -#define OOO_STRING_SVTOOLS_HTML_S_alefsym "alefsym" -#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha" -#define OOO_STRING_SVTOOLS_HTML_S_alpha "alpha" -#define OOO_STRING_SVTOOLS_HTML_S_and "and" -#define OOO_STRING_SVTOOLS_HTML_S_ang "ang" -#define OOO_STRING_SVTOOLS_HTML_S_asymp "asymp" -#define OOO_STRING_SVTOOLS_HTML_S_bdquo "bdquo" -#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta" -#define OOO_STRING_SVTOOLS_HTML_S_beta "beta" -#define OOO_STRING_SVTOOLS_HTML_S_bull "bull" -#define OOO_STRING_SVTOOLS_HTML_S_cap "cap" -#define OOO_STRING_SVTOOLS_HTML_S_chi "chi" -#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi" -#define OOO_STRING_SVTOOLS_HTML_S_circ "circ" -#define OOO_STRING_SVTOOLS_HTML_S_clubs "clubs" -#define OOO_STRING_SVTOOLS_HTML_S_cong "cong" -#define OOO_STRING_SVTOOLS_HTML_S_crarr "crarr" -#define OOO_STRING_SVTOOLS_HTML_S_cup "cup" -#define OOO_STRING_SVTOOLS_HTML_S_dagger "dagger" -#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger" -#define OOO_STRING_SVTOOLS_HTML_S_darr "darr" -#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr" -#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta" -#define OOO_STRING_SVTOOLS_HTML_S_delta "delta" -#define OOO_STRING_SVTOOLS_HTML_S_diams "diams" -#define OOO_STRING_SVTOOLS_HTML_S_empty "empty" -#define OOO_STRING_SVTOOLS_HTML_S_emsp "emsp" -#define OOO_STRING_SVTOOLS_HTML_S_ensp "ensp" -#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon" -#define OOO_STRING_SVTOOLS_HTML_S_epsilon "epsilon" -#define OOO_STRING_SVTOOLS_HTML_S_equiv "equiv" -#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta" -#define OOO_STRING_SVTOOLS_HTML_S_eta "eta" -#define OOO_STRING_SVTOOLS_HTML_S_euro "euro" -#define OOO_STRING_SVTOOLS_HTML_S_exist "exist" -#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof" -#define OOO_STRING_SVTOOLS_HTML_S_forall "forall" -#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl" -#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma" -#define OOO_STRING_SVTOOLS_HTML_S_gamma "gamma" -#define OOO_STRING_SVTOOLS_HTML_S_ge "ge" -#define OOO_STRING_SVTOOLS_HTML_S_harr "harr" -#define OOO_STRING_SVTOOLS_HTML_S_hArr "hArr" -#define OOO_STRING_SVTOOLS_HTML_S_hearts "hearts" -#define OOO_STRING_SVTOOLS_HTML_S_hellip "hellip" -#define OOO_STRING_SVTOOLS_HTML_S_image "image" -#define OOO_STRING_SVTOOLS_HTML_S_infin "infin" -#define OOO_STRING_SVTOOLS_HTML_S_int "int" -#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota" -#define OOO_STRING_SVTOOLS_HTML_S_iota "iota" -#define OOO_STRING_SVTOOLS_HTML_S_isin "isin" -#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa" -#define OOO_STRING_SVTOOLS_HTML_S_kappa "kappa" -#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda" -#define OOO_STRING_SVTOOLS_HTML_S_lambda "lambda" -#define OOO_STRING_SVTOOLS_HTML_S_lang "lang" -#define OOO_STRING_SVTOOLS_HTML_S_larr "larr" -#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr" -#define OOO_STRING_SVTOOLS_HTML_S_lceil "lceil" -#define OOO_STRING_SVTOOLS_HTML_S_ldquo "ldquo" -#define OOO_STRING_SVTOOLS_HTML_S_le "le" -#define OOO_STRING_SVTOOLS_HTML_S_lfloor "lfloor" -#define OOO_STRING_SVTOOLS_HTML_S_lowast "lowast" -#define OOO_STRING_SVTOOLS_HTML_S_loz "loz" -#define OOO_STRING_SVTOOLS_HTML_S_lrm "lrm" -#define OOO_STRING_SVTOOLS_HTML_S_lsaquo "lsaquo" -#define OOO_STRING_SVTOOLS_HTML_S_lsquo "lsquo" -#define OOO_STRING_SVTOOLS_HTML_S_mdash "mdash" -#define OOO_STRING_SVTOOLS_HTML_S_minus "minus" -#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu" -#define OOO_STRING_SVTOOLS_HTML_S_mu "mu" -#define OOO_STRING_SVTOOLS_HTML_S_nabla "nabla" -#define OOO_STRING_SVTOOLS_HTML_S_ndash "ndash" -#define OOO_STRING_SVTOOLS_HTML_S_ne "ne" -#define OOO_STRING_SVTOOLS_HTML_S_ni "ni" -#define OOO_STRING_SVTOOLS_HTML_S_notin "notin" -#define OOO_STRING_SVTOOLS_HTML_S_nsub "nsub" -#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu" -#define OOO_STRING_SVTOOLS_HTML_S_nu "nu" -#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig" -#define OOO_STRING_SVTOOLS_HTML_S_oelig "oelig" -#define OOO_STRING_SVTOOLS_HTML_S_oline "oline" -#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega" -#define OOO_STRING_SVTOOLS_HTML_S_omega "omega" -#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron" -#define OOO_STRING_SVTOOLS_HTML_S_omicron "omicron" -#define OOO_STRING_SVTOOLS_HTML_S_oplus "oplus" -#define OOO_STRING_SVTOOLS_HTML_S_or "or" -#define OOO_STRING_SVTOOLS_HTML_S_otimes "otimes" -#define OOO_STRING_SVTOOLS_HTML_S_part "part" -#define OOO_STRING_SVTOOLS_HTML_S_permil "permil" -#define OOO_STRING_SVTOOLS_HTML_S_perp "perp" -#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi" -#define OOO_STRING_SVTOOLS_HTML_S_phi "phi" -#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi" -#define OOO_STRING_SVTOOLS_HTML_S_pi "pi" -#define OOO_STRING_SVTOOLS_HTML_S_piv "piv" -#define OOO_STRING_SVTOOLS_HTML_S_prime "prime" -#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime" -#define OOO_STRING_SVTOOLS_HTML_S_prod "prod" -#define OOO_STRING_SVTOOLS_HTML_S_prop "prop" -#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi" -#define OOO_STRING_SVTOOLS_HTML_S_psi "psi" -#define OOO_STRING_SVTOOLS_HTML_S_radic "radic" -#define OOO_STRING_SVTOOLS_HTML_S_rang "rang" -#define OOO_STRING_SVTOOLS_HTML_S_rarr "rarr" -#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr" -#define OOO_STRING_SVTOOLS_HTML_S_rceil "rceil" -#define OOO_STRING_SVTOOLS_HTML_S_rdquo "rdquo" -#define OOO_STRING_SVTOOLS_HTML_S_real "real" -#define OOO_STRING_SVTOOLS_HTML_S_rfloor "rfloor" -#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho" -#define OOO_STRING_SVTOOLS_HTML_S_rho "rho" -#define OOO_STRING_SVTOOLS_HTML_S_rlm "rlm" -#define OOO_STRING_SVTOOLS_HTML_S_rsaquo "rsaquo" -#define OOO_STRING_SVTOOLS_HTML_S_rsquo "rsquo" -#define OOO_STRING_SVTOOLS_HTML_S_sbquo "sbquo" -#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron" -#define OOO_STRING_SVTOOLS_HTML_S_scaron "scaron" -#define OOO_STRING_SVTOOLS_HTML_S_sdot "sdot" -#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma" -#define OOO_STRING_SVTOOLS_HTML_S_sigma "sigma" -#define OOO_STRING_SVTOOLS_HTML_S_sigmaf "sigmaf" -#define OOO_STRING_SVTOOLS_HTML_S_sim "sim" -#define OOO_STRING_SVTOOLS_HTML_S_spades "spades" -#define OOO_STRING_SVTOOLS_HTML_S_sub "sub" -#define OOO_STRING_SVTOOLS_HTML_S_sube "sube" -#define OOO_STRING_SVTOOLS_HTML_S_sum "sum" -#define OOO_STRING_SVTOOLS_HTML_S_sup "sup" -#define OOO_STRING_SVTOOLS_HTML_S_supe "supe" -#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau" -#define OOO_STRING_SVTOOLS_HTML_S_tau "tau" -#define OOO_STRING_SVTOOLS_HTML_S_there4 "there4" -#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta" -#define OOO_STRING_SVTOOLS_HTML_S_theta "theta" -#define OOO_STRING_SVTOOLS_HTML_S_thetasym "thetasym" -#define OOO_STRING_SVTOOLS_HTML_S_thinsp "thinsp" -#define OOO_STRING_SVTOOLS_HTML_S_tilde "tilde" -#define OOO_STRING_SVTOOLS_HTML_S_trade "trade" -#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr" -#define OOO_STRING_SVTOOLS_HTML_S_uArr "uArr" -#define OOO_STRING_SVTOOLS_HTML_S_upsih "upsih" -#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon" -#define OOO_STRING_SVTOOLS_HTML_S_upsilon "upsilon" -#define OOO_STRING_SVTOOLS_HTML_S_weierp "weierp" -#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi" -#define OOO_STRING_SVTOOLS_HTML_S_xi "xi" -#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml" -#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta" -#define OOO_STRING_SVTOOLS_HTML_S_zeta "zeta" -#define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj" -#define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj" - -// HTML Attribut-Token (=Optionen) - -// Attribute ohne Wert -#define OOO_STRING_SVTOOLS_HTML_O_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_O_checked "CHECKED" -#define OOO_STRING_SVTOOLS_HTML_O_compact "COMPACT" -#define OOO_STRING_SVTOOLS_HTML_O_continue "CONTINUE" -#define OOO_STRING_SVTOOLS_HTML_O_controls "CONTROLS" -#define OOO_STRING_SVTOOLS_HTML_O_declare "DECLARE" -#define OOO_STRING_SVTOOLS_HTML_O_disabled "DISABLED" -#define OOO_STRING_SVTOOLS_HTML_O_folded "FOLDED" -#define OOO_STRING_SVTOOLS_HTML_O_ismap "ISMAP" -#define OOO_STRING_SVTOOLS_HTML_O_mayscript "MAYSCRIPT" -#define OOO_STRING_SVTOOLS_HTML_O_multiple "MULTIPLE" -#define OOO_STRING_SVTOOLS_HTML_O_noflow "NOFLOW" -#define OOO_STRING_SVTOOLS_HTML_O_nohref "NOHREF" -#define OOO_STRING_SVTOOLS_HTML_O_noresize "NORESIZE" -#define OOO_STRING_SVTOOLS_HTML_O_noshade "NOSHADE" -#define OOO_STRING_SVTOOLS_HTML_O_nowrap "NOWRAP" -#define OOO_STRING_SVTOOLS_HTML_O_plain "PLAIN" -#define OOO_STRING_SVTOOLS_HTML_O_sdfixed "SDFIXED" -#define OOO_STRING_SVTOOLS_HTML_O_selected "SELECTED" -#define OOO_STRING_SVTOOLS_HTML_O_shapes "SHAPES" - -// Attribute mit einem String als Wert -#define OOO_STRING_SVTOOLS_HTML_O_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_O_accesskey "ACCESSKEY" -#define OOO_STRING_SVTOOLS_HTML_O_accept "ACCEPT" -#define OOO_STRING_SVTOOLS_HTML_O_add_date "ADD_DATE" -#define OOO_STRING_SVTOOLS_HTML_O_alt "ALT" -#define OOO_STRING_SVTOOLS_HTML_O_axes "AXES" -#define OOO_STRING_SVTOOLS_HTML_O_axis "AXIS" -#define OOO_STRING_SVTOOLS_HTML_O_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_O_char "CHAR" -#define OOO_STRING_SVTOOLS_HTML_O_class "CLASS" -#define OOO_STRING_SVTOOLS_HTML_O_clip "CLIP" -#define OOO_STRING_SVTOOLS_HTML_O_code "CODE" -#define OOO_STRING_SVTOOLS_HTML_O_codetype "CODETYPE" -#define OOO_STRING_SVTOOLS_HTML_O_colspec "COLSPEC" -#define OOO_STRING_SVTOOLS_HTML_O_content "CONTENT" -#define OOO_STRING_SVTOOLS_HTML_O_coords "COORDS" -#define OOO_STRING_SVTOOLS_HTML_O_dp "DP" -#define OOO_STRING_SVTOOLS_HTML_O_enctype "ENCTYPE" -#define OOO_STRING_SVTOOLS_HTML_O_error "ERROR" -#define OOO_STRING_SVTOOLS_HTML_O_face "FACE" -#define OOO_STRING_SVTOOLS_HTML_O_frameborder "FRAMEBORDER" -#define OOO_STRING_SVTOOLS_HTML_O_httpequiv "HTTP-EQUIV" -#define OOO_STRING_SVTOOLS_HTML_O_language "LANGUAGE" -#define OOO_STRING_SVTOOLS_HTML_O_last_modified "LAST_MODIFIED" -#define OOO_STRING_SVTOOLS_HTML_O_last_visit "LAST_VISIT" -#define OOO_STRING_SVTOOLS_HTML_O_md "MD" -#define OOO_STRING_SVTOOLS_HTML_O_n "N" -#define OOO_STRING_SVTOOLS_HTML_O_name "NAME" -#define OOO_STRING_SVTOOLS_HTML_O_notation "NOTATION" -#define OOO_STRING_SVTOOLS_HTML_O_prompt "PROMPT" -#define OOO_STRING_SVTOOLS_HTML_O_shape "SHAPE" -#define OOO_STRING_SVTOOLS_HTML_O_standby "STANDBY" -#define OOO_STRING_SVTOOLS_HTML_O_style "STYLE" -#define OOO_STRING_SVTOOLS_HTML_O_title "TITLE" -#define OOO_STRING_SVTOOLS_HTML_O_value "VALUE" -#define OOO_STRING_SVTOOLS_HTML_O_SDval "SDVAL" -#define OOO_STRING_SVTOOLS_HTML_O_SDnum "SDNUM" -#define OOO_STRING_SVTOOLS_HTML_O_sdlibrary "SDLIBRARY" -#define OOO_STRING_SVTOOLS_HTML_O_sdmodule "SDMODULE" -#define OOO_STRING_SVTOOLS_HTML_O_sdevent "SDEVENT-" -#define OOO_STRING_SVTOOLS_HTML_O_sdaddparam "SDADDPARAM-" - -// Attribute mit einem SGML-Identifier als Wert -#define OOO_STRING_SVTOOLS_HTML_O_from "FROM" -#define OOO_STRING_SVTOOLS_HTML_O_id "ID" -#define OOO_STRING_SVTOOLS_HTML_O_target "TARGET" -#define OOO_STRING_SVTOOLS_HTML_O_to "TO" -#define OOO_STRING_SVTOOLS_HTML_O_until "UNTIL" - -// Attribute mit einem URI als Wert -#define OOO_STRING_SVTOOLS_HTML_O_action "ACTION" -#define OOO_STRING_SVTOOLS_HTML_O_archive "ARCHIVE" -#define OOO_STRING_SVTOOLS_HTML_O_background "BACKGROUND" -#define OOO_STRING_SVTOOLS_HTML_O_classid "CLASSID" -#define OOO_STRING_SVTOOLS_HTML_O_codebase "CODEBASE" -#define OOO_STRING_SVTOOLS_HTML_O_data "DATA" -#define OOO_STRING_SVTOOLS_HTML_O_dynsrc "DYNSRC" -#define OOO_STRING_SVTOOLS_HTML_O_dynsync "DYNSYNC" -#define OOO_STRING_SVTOOLS_HTML_O_imagemap "IMAGEMAP" -#define OOO_STRING_SVTOOLS_HTML_O_href "HREF" -#define OOO_STRING_SVTOOLS_HTML_O_lowsrc "LOWSRC" -#define OOO_STRING_SVTOOLS_HTML_O_script "SCRIPT" -#define OOO_STRING_SVTOOLS_HTML_O_src "SRC" -#define OOO_STRING_SVTOOLS_HTML_O_usemap "USEMAP" - -// Attribute mit Entity-Namen als Wert -#define OOO_STRING_SVTOOLS_HTML_O_dingbat "DINGBAT" -#define OOO_STRING_SVTOOLS_HTML_O_sym "SYM" - -// Attribute mit einer Farbe als Wert (alle Netscape) -#define OOO_STRING_SVTOOLS_HTML_O_alink "ALINK" -#define OOO_STRING_SVTOOLS_HTML_O_bgcolor "BGCOLOR" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolor "BORDERCOLOR" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolorlight "BORDERCOLORLIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolordark "BORDERCOLORDARK" -#define OOO_STRING_SVTOOLS_HTML_O_color "COLOR" -#define OOO_STRING_SVTOOLS_HTML_O_link "LINK" -#define OOO_STRING_SVTOOLS_HTML_O_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_O_vlink "VLINK" - -// Attribute mit einem numerischen Wert -#define OOO_STRING_SVTOOLS_HTML_O_border "BORDER" -#define OOO_STRING_SVTOOLS_HTML_O_cellspacing "CELLSPACING" -#define OOO_STRING_SVTOOLS_HTML_O_cellpadding "CELLPADDING" -#define OOO_STRING_SVTOOLS_HTML_O_charoff "CHAROFF" -#define OOO_STRING_SVTOOLS_HTML_O_colspan "COLSPAN" -#define OOO_STRING_SVTOOLS_HTML_O_framespacing "FRAMESPACING" -#define OOO_STRING_SVTOOLS_HTML_O_gutter "GUTTER" -#define OOO_STRING_SVTOOLS_HTML_O_indent "INDENT" -#define OOO_STRING_SVTOOLS_HTML_O_height "HEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_hspace "HSPACE" -#define OOO_STRING_SVTOOLS_HTML_O_left "LEFT" -#define OOO_STRING_SVTOOLS_HTML_O_leftmargin "LEFTMARGIN" -#define OOO_STRING_SVTOOLS_HTML_O_loop "LOOP" -#define OOO_STRING_SVTOOLS_HTML_O_marginheight "MARGINHEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_marginwidth "MARGINWIDTH" -#define OOO_STRING_SVTOOLS_HTML_O_max "MAX" -#define OOO_STRING_SVTOOLS_HTML_O_maxlength "MAXLENGTH" -#define OOO_STRING_SVTOOLS_HTML_O_min "MIN" -#define OOO_STRING_SVTOOLS_HTML_O_pagex "PAGEX" -#define OOO_STRING_SVTOOLS_HTML_O_pagey "PAGEY" -#define OOO_STRING_SVTOOLS_HTML_O_pointsize "POINT-SIZE" -#define OOO_STRING_SVTOOLS_HTML_O_rowspan "ROWSPAN" -#define OOO_STRING_SVTOOLS_HTML_O_scrollamount "SCROLLAMOUNT" -#define OOO_STRING_SVTOOLS_HTML_O_scrolldelay "SCROLLDELAY" -#define OOO_STRING_SVTOOLS_HTML_O_seqnum "SEQNUM" -#define OOO_STRING_SVTOOLS_HTML_O_skip "SKIP" -#define OOO_STRING_SVTOOLS_HTML_O_span "SPAN" -#define OOO_STRING_SVTOOLS_HTML_O_tabindex "TABINDEX" -#define OOO_STRING_SVTOOLS_HTML_O_top "TOP" -#define OOO_STRING_SVTOOLS_HTML_O_topmargin "TOPMARGIN" -#define OOO_STRING_SVTOOLS_HTML_O_vspace "VSPACE" -#define OOO_STRING_SVTOOLS_HTML_O_weight "WEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_width "WIDTH" -#define OOO_STRING_SVTOOLS_HTML_O_x "X" -#define OOO_STRING_SVTOOLS_HTML_O_y "Y" -#define OOO_STRING_SVTOOLS_HTML_O_zindex "Z-INDEX" - -// Attribute mit Enum-Werten -#define OOO_STRING_SVTOOLS_HTML_O_behavior "BEHAVIOR" -#define OOO_STRING_SVTOOLS_HTML_O_bgproperties "BGPROPERTIES" -#define OOO_STRING_SVTOOLS_HTML_O_clear "CLEAR" -#define OOO_STRING_SVTOOLS_HTML_O_dir "DIR" -#define OOO_STRING_SVTOOLS_HTML_O_direction "DIRECTION" -#define OOO_STRING_SVTOOLS_HTML_O_format "FORMAT" -#define OOO_STRING_SVTOOLS_HTML_O_frame "FRAME" -#define OOO_STRING_SVTOOLS_HTML_O_lang "LANG" -#define OOO_STRING_SVTOOLS_HTML_O_method "METHOD" -#define OOO_STRING_SVTOOLS_HTML_O_palette "PALETTE" -#define OOO_STRING_SVTOOLS_HTML_O_rel "REL" -#define OOO_STRING_SVTOOLS_HTML_O_rev "REV" -#define OOO_STRING_SVTOOLS_HTML_O_rules "RULES" -#define OOO_STRING_SVTOOLS_HTML_O_scrolling "SCROLLING" -#define OOO_STRING_SVTOOLS_HTML_O_sdreadonly "READONLY" -#define OOO_STRING_SVTOOLS_HTML_O_subtype "SUBTYPE" -#define OOO_STRING_SVTOOLS_HTML_O_type "TYPE" -#define OOO_STRING_SVTOOLS_HTML_O_valign "VALIGN" -#define OOO_STRING_SVTOOLS_HTML_O_valuetype "VALUETYPE" -#define OOO_STRING_SVTOOLS_HTML_O_visibility "VISIBILITY" -#define OOO_STRING_SVTOOLS_HTML_O_wrap "WRAP" - -// Attribute mit Script-Code als Wert -#define OOO_STRING_SVTOOLS_HTML_O_onblur "ONBLUR" -#define OOO_STRING_SVTOOLS_HTML_O_onchange "ONCHANGE" -#define OOO_STRING_SVTOOLS_HTML_O_onclick "ONCLICK" -#define OOO_STRING_SVTOOLS_HTML_O_onfocus "ONFOCUS" -#define OOO_STRING_SVTOOLS_HTML_O_onload "ONLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_onmouseover "ONMOUSEOVER" -#define OOO_STRING_SVTOOLS_HTML_O_onreset "ONRESET" -#define OOO_STRING_SVTOOLS_HTML_O_onselect "ONSELECT" -#define OOO_STRING_SVTOOLS_HTML_O_onsubmit "ONSUBMIT" -#define OOO_STRING_SVTOOLS_HTML_O_onunload "ONUNLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_onabort "ONABORT" -#define OOO_STRING_SVTOOLS_HTML_O_onerror "ONERROR" -#define OOO_STRING_SVTOOLS_HTML_O_onmouseout "ONMOUSEOUT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonblur "SDONBLUR" -#define OOO_STRING_SVTOOLS_HTML_O_SDonchange "SDONCHANGE" -#define OOO_STRING_SVTOOLS_HTML_O_SDonclick "SDONCLICK" -#define OOO_STRING_SVTOOLS_HTML_O_SDonfocus "SDONFOCUS" -#define OOO_STRING_SVTOOLS_HTML_O_SDonload "SDONLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseover "SDONMOUSEOVER" -#define OOO_STRING_SVTOOLS_HTML_O_SDonreset "SDONRESET" -#define OOO_STRING_SVTOOLS_HTML_O_SDonselect "SDONSELECT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonsubmit "SDONSUBMIT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonunload "SDONUNLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_SDonabort "SDONABORT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonerror "SDONERROR" -#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseout "SDONMOUSEOUT" - -// Attribute mit Kontext-abhaengigen Werten -#define OOO_STRING_SVTOOLS_HTML_O_align "ALIGN" -#define OOO_STRING_SVTOOLS_HTML_O_cols "COLS" -#define OOO_STRING_SVTOOLS_HTML_O_rows "ROWS" -#define OOO_STRING_SVTOOLS_HTML_O_start "START" -#define OOO_STRING_SVTOOLS_HTML_O_size "SIZE" -#define OOO_STRING_SVTOOLS_HTML_O_units "UNITS" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_IT_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_IT_password "PASSWORD" -#define OOO_STRING_SVTOOLS_HTML_IT_checkbox "CHECKBOX" -#define OOO_STRING_SVTOOLS_HTML_IT_radio "RADIO" -#define OOO_STRING_SVTOOLS_HTML_IT_range "RANGE" -#define OOO_STRING_SVTOOLS_HTML_IT_scribble "SCRIBBLE" -#define OOO_STRING_SVTOOLS_HTML_IT_file "FILE" -#define OOO_STRING_SVTOOLS_HTML_IT_hidden "HIDDEN" -#define OOO_STRING_SVTOOLS_HTML_IT_submit "SUBMIT" -#define OOO_STRING_SVTOOLS_HTML_IT_image "IMAGE" -#define OOO_STRING_SVTOOLS_HTML_IT_reset "RESET" -#define OOO_STRING_SVTOOLS_HTML_IT_button "BUTTON" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_TF_void "VOID" -#define OOO_STRING_SVTOOLS_HTML_TF_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_TF_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_TF_hsides "HSIDES" -#define OOO_STRING_SVTOOLS_HTML_TF_lhs "LHS" -#define OOO_STRING_SVTOOLS_HTML_TF_rhs "RHS" -#define OOO_STRING_SVTOOLS_HTML_TF_vsides "VSIDES" -#define OOO_STRING_SVTOOLS_HTML_TF_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_TF_border "BORDER" - -// Werte von
-#define OOO_STRING_SVTOOLS_HTML_TR_none "NONE" -#define OOO_STRING_SVTOOLS_HTML_TR_groups "GROUPS" -#define OOO_STRING_SVTOOLS_HTML_TR_rows "ROWS" -#define OOO_STRING_SVTOOLS_HTML_TR_cols "COLS" -#define OOO_STRING_SVTOOLS_HTML_TR_all "ALL" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_AL_left "LEFT" -#define OOO_STRING_SVTOOLS_HTML_AL_center "CENTER" -#define OOO_STRING_SVTOOLS_HTML_AL_middle "MIDDLE" -#define OOO_STRING_SVTOOLS_HTML_AL_right "RIGHT" -#define OOO_STRING_SVTOOLS_HTML_AL_justify "JUSTIFY" -#define OOO_STRING_SVTOOLS_HTML_AL_char "CHAR" -#define OOO_STRING_SVTOOLS_HTML_AL_all "ALL" -#define OOO_STRING_SVTOOLS_HTML_AL_none "NONE" - -// Werte von , -#define OOO_STRING_SVTOOLS_HTML_VA_top "TOP" -#define OOO_STRING_SVTOOLS_HTML_VA_middle "MIDDLE" -#define OOO_STRING_SVTOOLS_HTML_VA_bottom "BOTTOM" -#define OOO_STRING_SVTOOLS_HTML_VA_baseline "BASELINE" -#define OOO_STRING_SVTOOLS_HTML_VA_texttop "TEXTTOP" -#define OOO_STRING_SVTOOLS_HTML_VA_absmiddle "ABSMIDDLE" -#define OOO_STRING_SVTOOLS_HTML_VA_absbottom "ABSBOTTOM" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_SH_rect "RECT" -#define OOO_STRING_SVTOOLS_HTML_SH_rectangle "RECTANGLE" -#define OOO_STRING_SVTOOLS_HTML_SH_circ "CIRC" -#define OOO_STRING_SVTOOLS_HTML_SH_circle "CIRCLE" -#define OOO_STRING_SVTOOLS_HTML_SH_poly "POLY" -#define OOO_STRING_SVTOOLS_HTML_SH_polygon "POLYGON" -#define OOO_STRING_SVTOOLS_HTML_SH_default "DEFAULT" - -#define OOO_STRING_SVTOOLS_HTML_LG_starbasic "STARBASIC" -#define OOO_STRING_SVTOOLS_HTML_LG_javascript "JAVASCRIPT" -#define OOO_STRING_SVTOOLS_HTML_LG_javascript11 "JAVASCRIPT1.1" -#define OOO_STRING_SVTOOLS_HTML_LG_livescript "LIVESCRIPT" - -// ein par Werte fuer unser StarBASIC-Support -#define OOO_STRING_SVTOOLS_HTML_SB_library "$LIBRARY:" -#define OOO_STRING_SVTOOLS_HTML_SB_module "$MODULE:" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_METHOD_get "GET" -#define OOO_STRING_SVTOOLS_HTML_METHOD_post "POST" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_META_refresh "REFRESH" -#define OOO_STRING_SVTOOLS_HTML_META_generator "GENERATOR" -#define OOO_STRING_SVTOOLS_HTML_META_author "AUTHOR" -#define OOO_STRING_SVTOOLS_HTML_META_classification "CLASSIFICATION" -#define OOO_STRING_SVTOOLS_HTML_META_description "DESCRIPTION" -#define OOO_STRING_SVTOOLS_HTML_META_keywords "KEYWORDS" -#define OOO_STRING_SVTOOLS_HTML_META_changed "CHANGED" -#define OOO_STRING_SVTOOLS_HTML_META_changedby "CHANGEDBY" -#define OOO_STRING_SVTOOLS_HTML_META_created "CREATED" -#define OOO_STRING_SVTOOLS_HTML_META_content_type "CONTENT-TYPE" -#define OOO_STRING_SVTOOLS_HTML_META_content_script_type "CONTENT-SCRIPT-TYPE" -#define OOO_STRING_SVTOOLS_HTML_META_sdendnote "SDENDNOTE" -#define OOO_STRING_SVTOOLS_HTML_META_sdfootnote "SDFOOTNOTE" - -// Werte von
    -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_disc "DISC" -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "SQUARE" -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "CIRCLE" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "YES" -#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "NO" -#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "AUTO" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "HORIZONTAL" -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "VERTICAL" -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "BOX" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "SCROLL" -#define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "SLIDE" -#define OOO_STRING_SVTOOLS_HTML_BEHAV_alternate "ALTERNATE" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_LOOP_infinite "INFINITE" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_block "BLOCK" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal "HORIZONTAL" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical "VERTICAL" - -// interne Grafik-Namen -#define OOO_STRING_SVTOOLS_HTML_private_image "private:image/" -#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-" -#define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary "binary" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image "image" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index "index" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu "menu" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie "movie" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound "sound" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet "telnet" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text "text" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown "unknown" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata "baddata" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed "delayed" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_embed "embed" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure "insecure" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound "notfound" -#define OOO_STRING_SVTOOLS_HTML_sdendnote "sdendnote" -#define OOO_STRING_SVTOOLS_HTML_sdendnote_anc "sdendnoteanc" -#define OOO_STRING_SVTOOLS_HTML_sdendnote_sym "sdendnotesym" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote "sdfootnote" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote_anc "sdfootnoteanc" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote_sym "sdfootnotesym" -#define OOO_STRING_SVTOOLS_HTML_FTN_anchor "anc" -#define OOO_STRING_SVTOOLS_HTML_FTN_symbol "sym" -#define OOO_STRING_SVTOOLS_HTML_WW_off "OFF" -#define OOO_STRING_SVTOOLS_HTML_WW_hard "HARD" -#define OOO_STRING_SVTOOLS_HTML_WW_soft "SOFT" -#define OOO_STRING_SVTOOLS_HTML_WW_virtual "VIRTUAL" -#define OOO_STRING_SVTOOLS_HTML_WW_physical "PHYSICAL" -#define OOO_STRING_SVTOOLS_HTML_on "on" -#define OOO_STRING_SVTOOLS_HTML_ET_url "application/x-www-form-urlencoded" -#define OOO_STRING_SVTOOLS_HTML_ET_multipart "multipart/form-data" -#define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain" - -#endif diff --git a/svtools/inc/htmltokn.h b/svtools/inc/htmltokn.h deleted file mode 100644 index 0719f34cd893..000000000000 --- a/svtools/inc/htmltokn.h +++ /dev/null @@ -1,572 +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: htmltokn.h,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _HTMLTOKN_H -#define _HTMLTOKN_H - -#include "svtools/svtdllapi.h" -#include -#ifndef _SOLAR_h -#include -#endif - -class String; - -// suche das Char zu dem CharNamen -sal_Unicode GetHTMLCharName( const String& rName ); - -// suche die TokenID zu dem Token -SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); - -// suche die TokenId zu einemm Attribut-Token -int GetHTMLOption( const String& rName ); - -// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) -SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); - -// beginnen immer ab 256, groesser als ein char -const int HTML_TOKEN_START = 0x100; -const int HTML_TOKEN_ONOFF = 0x200; -const int HTML_TOKEN_MICROSOFT = 0x1000; - -enum HTML_TOKEN_IDS -{ - HTML_TEXTTOKEN = HTML_TOKEN_START, - HTML_SINGLECHAR, - HTML_NEWPARA, - HTML_TABCHAR, - HTML_RAWDATA, - HTML_LINEFEEDCHAR, - - // diese werden nur eingeschaltet - HTML_AREA, // Netscape 2.0 - HTML_BASE, // HTML 3.0 - HTML_COMMENT, - HTML_DOCTYPE, - HTML_EMBED, // Netscape 2.0 ignorieren - HTML_FIGUREOVERLAY, // HTML 3.0 - HTML_HORZRULE, // ignorieren - HTML_HORZTAB, // HTML 3.0 - HTML_IMAGE, // ignorieren - HTML_INPUT, // ignorieren - HTML_ISINDEX, // HTML 3.0 - HTML_LINEBREAK, //
    ->
    - HTML_LINK, // HTML 3.0 - HTML_META, // HTML 3.0 ignorieren - HTML_NEXTID, // HTML 3.0 - HTML_OF, // HTML 3.0 - HTML_OPTION, // ignorieren - HTML_PARAM, // HotJava - HTML_RANGE, // HTML 3.0 - HTML_SPACER, // Netscape 3.0b5 // ignorieren - HTML_WBR, // Netscape - - // Tokens, die ueber HTML-Charakter erkannt werden - HTML_NONBREAKSPACE, - HTML_SOFTHYPH, - - // diese werden wieder abgeschaltet, - // der off-Wert liegt immer dahinter (+1) !! - HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0 - HTML_ABBREVIATION_OFF, // HTML 3.0 - HTML_ABOVE_ON, // HTML 3.0 - HTML_ABOVE_OFF, // HTML 3.0 - HTML_ACRONYM_ON, // HTML 3.0 - HTML_ACRONYM_OFF, // HTML 3.0 - HTML_ADDRESS_ON, - HTML_ADDRESS_OFF, - HTML_ANCHOR_ON, - HTML_ANCHOR_OFF, - HTML_APPLET_ON, // HotJava - HTML_APPLET_OFF, // HotJava - HTML_ARRAY_ON, // HTML 3.0 - HTML_ARRAY_OFF, // HTML 3.0 - HTML_AUTHOR_ON, // HTML 3.0 - HTML_AUTHOR_OFF, // HTML 3.0 - HTML_BANNER_ON, // HTML 3.0 - HTML_BANNER_OFF, // HTML 3.0 - HTML_BAR_ON, // HTML 3.0 - HTML_BAR_OFF, // HTML 3.0 - HTML_BASEFONT_ON, // Netscape - HTML_BASEFONT_OFF, // Netscape - HTML_BELOW_ON, // HTML 3.0 - HTML_BELOW_OFF, // HTML 3.0 - HTML_BIGPRINT_ON, // HTML 3.0 - HTML_BIGPRINT_OFF, // HTML 3.0 - HTML_BLINK_ON, // Netscape - HTML_BLINK_OFF, // Netscape - HTML_BLOCKQUOTE30_ON, // HTML 3.0 - HTML_BLOCKQUOTE30_OFF, // HTML 3.0 - HTML_BLOCKQUOTE_ON, - HTML_BLOCKQUOTE_OFF, - HTML_BODY_ON, - HTML_BODY_OFF, - HTML_BOLDTEXT_ON, // HTML 3.0 - HTML_BOLDTEXT_OFF, // HTML 3.0 - HTML_BOLD_ON, - HTML_BOLD_OFF, - HTML_BOX_ON, // HTML 3.0 - HTML_BOX_OFF, // HTML 3.0 - HTML_CAPTION_ON, // HTML 3.0 - HTML_CAPTION_OFF, // HTML 3.0 - HTML_CENTER_ON, // Netscape - HTML_CENTER_OFF, // Netscape - HTML_CITIATION_ON, - HTML_CITIATION_OFF, - HTML_CODE_ON, - HTML_CODE_OFF, - HTML_COL_ON, // HTML3 Table Model Draft - HTML_COL_OFF, // HTML3 Table Model Draft - HTML_COLGROUP_ON, // HTML3 Table Model Draft - HTML_COLGROUP_OFF, // HTML3 Table Model Draft - HTML_CREDIT_ON, // HTML 3.0 - HTML_CREDIT_OFF, // HTML 3.0 - HTML_DD_ON, - HTML_DD_OFF, - HTML_DEFLIST_ON, - HTML_DEFLIST_OFF, - HTML_DELETEDTEXT_ON, // HTML 3.0 - HTML_DELETEDTEXT_OFF, // HTML 3.0 - HTML_DIRLIST_ON, - HTML_DIRLIST_OFF, - HTML_DIVISION_ON, // HTML 3.0 - HTML_DIVISION_OFF, // HTML 3.0 - HTML_DOT_ON, // HTML 3.0 - HTML_DOT_OFF, // HTML 3.0 - HTML_DOUBLEDOT_ON, // HTML 3.0 - HTML_DOUBLEDOT_OFF, // HTML 3.0 - HTML_DT_ON, - HTML_DT_OFF, - HTML_EMPHASIS_ON, - HTML_EMPHASIS_OFF, - HTML_FIGURE_ON, // HTML 3.0 - HTML_FIGURE_OFF, // HTML 3.0 - HTML_FONT_ON, // Netscape - HTML_FONT_OFF, // Netscape - HTML_FOOTNOTE_ON, // HTML 3.0 - HTML_FOOTNOTE_OFF, // HTML 3.0 - HTML_FORM_ON, - HTML_FORM_OFF, - HTML_FRAME_ON, // Netscape 2.0 - HTML_FRAME_OFF, // Netscape 2.0 - HTML_FRAMESET_ON, // Netscape 2.0 - HTML_FRAMESET_OFF, // Netscape 2.0 - HTML_HAT_ON, // HTML 3.0 - HTML_HAT_OFF, // HTML 3.0 - HTML_HEAD1_ON, - HTML_HEAD1_OFF, - HTML_HEAD2_ON, - HTML_HEAD2_OFF, - HTML_HEAD3_ON, - HTML_HEAD3_OFF, - HTML_HEAD4_ON, - HTML_HEAD4_OFF, - HTML_HEAD5_ON, - HTML_HEAD5_OFF, - HTML_HEAD6_ON, - HTML_HEAD6_OFF, - HTML_HEAD_ON, - HTML_HEAD_OFF, - HTML_HTML_ON, - HTML_HTML_OFF, - HTML_IFRAME_ON, // IE 3.0b2 - HTML_IFRAME_OFF, // IE 3.0b2 - HTML_ILAYER_ON, - HTML_ILAYER_OFF, - HTML_INSERTEDTEXT_ON, // HTML 3.0 - HTML_INSERTEDTEXT_OFF, // HTML 3.0 - HTML_ITALIC_ON, - HTML_ITALIC_OFF, - HTML_ITEM_ON, // HTML 3.0 - HTML_ITEM_OFF, // HTML 3.0 - HTML_KEYBOARD_ON, - HTML_KEYBOARD_OFF, - HTML_LAYER_ON, - HTML_LAYER_OFF, - HTML_LANGUAGE_ON, // HTML 3.0 - HTML_LANGUAGE_OFF, // HTML 3.0 - HTML_LISTHEADER_ON, // HTML 3.0 - HTML_LISTHEADER_OFF, // HTML 3.0 - HTML_LI_ON, - HTML_LI_OFF, - HTML_MAP_ON, // Netscape 2.0 - HTML_MAP_OFF, // Netscape 2.0 - HTML_MATH_ON, // HTML 3.0 - HTML_MATH_OFF, // HTML 3.0 - HTML_MENULIST_ON, - HTML_MENULIST_OFF, - HTML_MULTICOL_ON, // Netscape 3.0b5 - HTML_MULTICOL_OFF, // Netscape 3.0b5 - HTML_NOBR_ON, // Netscape - HTML_NOBR_OFF, // Netscape - HTML_NOEMBED_ON, // Netscape 2.0 - HTML_NOEMBED_OFF, // Netscape 2.0 - HTML_NOFRAMES_ON, // Netscape 2.0 - HTML_NOFRAMES_OFF, // Netscape 2.0 - HTML_NOSCRIPT_ON, // Netscape 2.0 - HTML_NOSCRIPT_OFF, // Netscape 3.0 - HTML_NOTE_ON, // HTML 3.0 - HTML_NOTE_OFF, // HTML 3.0 - HTML_OBJECT_ON, // HotJava - HTML_OBJECT_OFF, // HotJava - HTML_ORDERLIST_ON, - HTML_ORDERLIST_OFF, - HTML_PARABREAK_ON, - HTML_PARABREAK_OFF, - HTML_PERSON_ON, // HTML 3.0 - HTML_PERSON_OFF, // HTML 3.0 - HTML_PLAINTEXT_ON, // HTML 3.0 - HTML_PLAINTEXT_OFF, // HTML 3.0 - HTML_PREFORMTXT_ON, - HTML_PREFORMTXT_OFF, - HTML_ROOT_ON, // HTML 3.0 - HTML_ROOT_OFF, // HTML 3.0 - HTML_ROW_ON, // HTML 3.0 - HTML_ROW_OFF, // HTML 3.0 - HTML_SAMPLE_ON, - HTML_SAMPLE_OFF, - HTML_SCRIPT_ON, // HTML 3.2 - HTML_SCRIPT_OFF, // HTML 3.2 - HTML_SELECT_ON, - HTML_SELECT_OFF, - HTML_SHORTQUOTE_ON, // HTML 3.0 - HTML_SHORTQUOTE_OFF, // HTML 3.0 - HTML_SMALLPRINT_ON, // HTML 3.0 - HTML_SMALLPRINT_OFF, // HTML 3.0 - HTML_SPAN_ON, // Style Sheets - HTML_SPAN_OFF, // Style Sheets - HTML_SQUAREROOT_ON, // HTML 3.0 - HTML_SQUAREROOT_OFF, // HTML 3.0 - HTML_STRIKETHROUGH_ON, // HTML 3.0 - HTML_STRIKETHROUGH_OFF, // HTML 3.0 - HTML_STRONG_ON, - HTML_STRONG_OFF, - HTML_STYLE_ON, // HTML 3.0 - HTML_STYLE_OFF, // HTML 3.0 - HTML_SUBSCRIPT_ON, // HTML 3.0 - HTML_SUBSCRIPT_OFF, // HTML 3.0 - HTML_SUPERSCRIPT_ON, // HTML 3.0 - HTML_SUPERSCRIPT_OFF, // HTML 3.0 - HTML_TABLE_ON, // HTML 3.0 - HTML_TABLE_OFF, // HTML 3.0 - HTML_TABLEDATA_ON, // HTML 3.0 - HTML_TABLEDATA_OFF, // HTML 3.0 - HTML_TABLEHEADER_ON, // HTML 3.0 - HTML_TABLEHEADER_OFF, // HTML 3.0 - HTML_TABLEROW_ON, // HTML 3.0 - HTML_TABLEROW_OFF, // HTML 3.0 - HTML_TBODY_ON, // HTML3 Table Model Draft - HTML_TBODY_OFF, // HTML3 Table Model Draft - HTML_TELETYPE_ON, - HTML_TELETYPE_OFF, - HTML_TEXTAREA_ON, - HTML_TEXTAREA_OFF, - HTML_TEXTFLOW_ON, // HTML 3.2 - HTML_TEXTFLOW_OFF, // HTML 3.2 - HTML_TEXT_ON, // HTML 3.0 - HTML_TEXT_OFF, // HTML 3.0 - HTML_TFOOT_ON, // HTML3 Table Model Draft - HTML_TFOOT_OFF, // HTML3 Table Model Draft - HTML_THEAD_ON, // HTML3 Table Model Draft - HTML_THEAD_OFF, // HTML3 Table Model Draft - HTML_TILDE_ON, // HTML 3.0 - HTML_TILDE_OFF, // HTML 3.0 - HTML_TITLE_ON, - HTML_TITLE_OFF, - HTML_UNDERLINE_ON, - HTML_UNDERLINE_OFF, - HTML_UNORDERLIST_ON, - HTML_UNORDERLIST_OFF, - HTML_VARIABLE_ON, - HTML_VARIABLE_OFF, - HTML_VECTOR_ON, // HTML 3.0 - HTML_VECTOR_OFF, // HTML 3.0 - - // obsolete features - HTML_XMP_ON, - HTML_XMP_OFF, - HTML_LISTING_ON, - HTML_LISTING_OFF, - - // proposed features - HTML_DEFINSTANCE_ON, - HTML_DEFINSTANCE_OFF, - HTML_STRIKE_ON, - HTML_STRIKE_OFF, - - HTML_UNKNOWNCONTROL_ON, - HTML_UNKNOWNCONTROL_OFF, - - HTML_BGSOUND = HTML_TOKEN_MICROSOFT|HTML_TOKEN_START, - - HTML_COMMENT2_ON = HTML_TOKEN_MICROSOFT|HTML_TOKEN_ONOFF, // HTML 2.0 ? - HTML_COMMENT2_OFF, // HTML 2.0 ? - HTML_MARQUEE_ON, - HTML_MARQUEE_OFF, - HTML_PLAINTEXT2_ON, // HTML 2.0 ? - HTML_PLAINTEXT2_OFF, // HTML 2.0 ? - - HTML_SDFIELD_ON, - HTML_SDFIELD_OFF -}; - -// HTML Attribut-Token (=Optionen) - -// beginnen immer ab 256, groesser als ein char -const int HTML_OPTION_START = 0x100; - -enum HTML_OPTION_IDS -{ -HTML_OPTION_BOOL_START = HTML_OPTION_START, - -// Attribute ohne Wert - HTML_O_BOX = HTML_OPTION_BOOL_START, - HTML_O_CHECKED, - HTML_O_COMPACT, - HTML_O_CONTINUE, - HTML_O_CONTROLS, // IExplorer 2.0 - HTML_O_DECLARE, // IExplorer 3.0b5 - HTML_O_DISABLED, - HTML_O_FOLDED, // Netscape internal - HTML_O_ISMAP, - HTML_O_MAYSCRIPT, // Netcape 3.0 - HTML_O_MULTIPLE, - HTML_O_NOFLOW, - HTML_O_NOHREF, // Netscape - HTML_O_NORESIZE, // Netscape 2.0 - HTML_O_NOSHADE, // Netscape - HTML_O_NOWRAP, - HTML_O_PLAIN, - HTML_O_SDFIXED, - HTML_O_SELECTED, - HTML_O_SHAPES, // IExplorer 3.0b5 -HTML_OPTION_BOOL_END, - -// Attribute mit einem String als Wert -HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END, - HTML_O_ABOVE = HTML_OPTION_STRING_START, - HTML_O_ACCEPT, - HTML_O_ACCESSKEY, - HTML_O_ADD_DATE, // Netscape internal - HTML_O_ALT, - HTML_O_AXES, - HTML_O_AXIS, - HTML_O_BELOW, - HTML_O_CHAR, // HTML3 Table Model Draft - HTML_O_CLASS, - HTML_O_CLIP, - HTML_O_CODE, // HotJava - HTML_O_CODETYPE, - HTML_O_COLSPEC, - HTML_O_CONTENT, - HTML_O_COORDS, // Netscape 2.0 - HTML_O_DP, - HTML_O_ENCTYPE, - HTML_O_ERROR, - HTML_O_FACE, // IExplorer 2.0 - HTML_O_FRAMEBORDER, // IExplorer 3.0 - HTML_O_HTTPEQUIV, - HTML_O_LANGUAGE, // JavaScript - HTML_O_LAST_MODIFIED, // Netscape internal - HTML_O_LAST_VISIT, // Netscape internal - HTML_O_MD, - HTML_O_N, - HTML_O_NAME, - HTML_O_NOTATION, - HTML_O_PROMPT, - HTML_O_SHAPE, - HTML_O_STANDBY, - HTML_O_STYLE, // Style Sheets - HTML_O_TITLE, - HTML_O_VALUE, - HTML_O_SDVAL, // StarDiv NumberValue - HTML_O_SDNUM, // StarDiv NumberFormat - HTML_O_SDLIBRARY, - HTML_O_SDMODULE, -HTML_OPTION_STRING_END, - -// Attribute mit einem SGML-Identifier als Wert -HTML_OPTION_SGMLID_START = HTML_OPTION_STRING_END, - HTML_O_FROM = HTML_OPTION_SGMLID_START, - HTML_O_ID, - HTML_O_TARGET, // Netscape 2.0 - HTML_O_TO, - HTML_O_UNTIL, -HTML_OPTION_SGMLID_END, - -// Attribute mit einem URI als Wert -HTML_OPTION_URI_START = HTML_OPTION_SGMLID_END, - HTML_O_ACTION = HTML_OPTION_URI_START, - HTML_O_ARCHIVE, - HTML_O_BACKGROUND, - HTML_O_CLASSID, - HTML_O_CODEBASE, // HotJava - HTML_O_DATA, - HTML_O_DYNSRC, // IExplorer 3.0 - HTML_O_DYNSYNC, // IExplorer 2.0 - HTML_O_IMAGEMAP, - HTML_O_HREF, - HTML_O_LOWSRC, // Netscape 3.0 - HTML_O_SCRIPT, - HTML_O_SRC, - HTML_O_USEMAP, // Netscape 2.0 -HTML_OPTION_URI_END, - -// Attribute mit Entity-Namen als Wert -HTML_OPTION_ENTITY_START = HTML_OPTION_URI_END, - HTML_O_DINGBAT = HTML_OPTION_ENTITY_START, - HTML_O_SYM, -HTML_OPTION_ENTITY_END, - -// Attribute mit einer Farbe als Wert (alle Netscape) -HTML_OPTION_COLOR_START = HTML_OPTION_ENTITY_END, - HTML_O_ALINK = HTML_OPTION_COLOR_START, - HTML_O_BGCOLOR, - HTML_O_BORDERCOLOR, // IExplorer 2.0 - HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0 - HTML_O_BORDERCOLORDARK, // IExplorer 2.0 - HTML_O_COLOR, - HTML_O_LINK, - HTML_O_TEXT, - HTML_O_VLINK, -HTML_OPTION_COLOR_END, - -// Attribute mit einem numerischen Wert -HTML_OPTION_NUMBER_START = HTML_OPTION_COLOR_END, - HTML_O_BORDER = HTML_OPTION_NUMBER_START, - HTML_O_CELLSPACING, // HTML3 Table Model Draft - HTML_O_CELLPADDING, // HTML3 Table Model Draft - HTML_O_CHAROFF, // HTML3 Table Model Draft - HTML_O_COLSPAN, - HTML_O_FRAMESPACING, // IExplorer 3.0 - HTML_O_GUTTER, // Netscape 3.0b5 - HTML_O_INDENT, - HTML_O_HEIGHT, - HTML_O_HSPACE, // Netscape - HTML_O_LEFT, - HTML_O_LEFTMARGIN, // IExplorer 2.0 - HTML_O_LOOP, // IExplorer 2.0 - HTML_O_MARGINWIDTH, // Netscape 2.0 - HTML_O_MARGINHEIGHT, // Netscape 2.0 - HTML_O_MAX, - HTML_O_MAXLENGTH, - HTML_O_MIN, - HTML_O_PAGEX, - HTML_O_PAGEY, - HTML_O_POINTSIZE, - HTML_O_ROWSPAN, - HTML_O_SCROLLAMOUNT, // IExplorer 2.0 - HTML_O_SCROLLDELAY, // IExplorer 2.0 - HTML_O_SEQNUM, - HTML_O_SKIP, - HTML_O_SPAN, // HTML3 Table Model Draft - HTML_O_TABINDEX, - HTML_O_TOP, - HTML_O_TOPMARGIN, // IExplorer 2.0 - HTML_O_VSPACE, // Netscape - HTML_O_WEIGHT, - HTML_O_WIDTH, - HTML_O_X, - HTML_O_Y, - HTML_O_ZINDEX, -HTML_OPTION_NUMBER_END, - -// Attribute mit Enum-Werten -HTML_OPTION_ENUM_START = HTML_OPTION_NUMBER_END, - HTML_O_BEHAVIOR = HTML_OPTION_ENUM_START, // IExplorer 2.0 - HTML_O_BGPROPERTIES, // IExplorer 2.0 - HTML_O_CLEAR, - HTML_O_DIR, - HTML_O_DIRECTION, // IExplorer 2.0 - HTML_O_FORMAT, - HTML_O_FRAME, // HTML3 Table Model Draft - HTML_O_LANG, - HTML_O_METHOD, - HTML_O_PALETTE, - HTML_O_REL, - HTML_O_REV, - HTML_O_RULES, // HTML3 Table Model Draft - HTML_O_SCROLLING, // Netscape 2.0 - HTML_O_SDREADONLY, - HTML_O_SUBTYPE, - HTML_O_TYPE, - HTML_O_VALIGN, - HTML_O_VALUETYPE, - HTML_O_VISIBILITY, - HTML_O_WRAP, -HTML_OPTION_ENUM_END, - -// Attribute mit Script-Code als Wert -HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END, - HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScaript - HTML_O_ONBLUR, // JavaScript - HTML_O_ONCHANGE, // JavaScript - HTML_O_ONCLICK, // JavaScript - HTML_O_ONERROR, // JavaScript - HTML_O_ONFOCUS, // JavaScript - HTML_O_ONLOAD, // JavaScript - HTML_O_ONMOUSEOUT, // JavaScript - HTML_O_ONMOUSEOVER, // JavaScript - HTML_O_ONRESET, // JavaScript - HTML_O_ONSELECT, // JavaScript - HTML_O_ONSUBMIT, // JavaScript - HTML_O_ONUNLOAD, // JavaScript - - HTML_O_SDONABORT, // StarBasic - HTML_O_SDONBLUR, // StarBasic - HTML_O_SDONCHANGE, // StarBasic - HTML_O_SDONCLICK, // StarBasic - HTML_O_SDONERROR, // StarBasic - HTML_O_SDONFOCUS, // StarBasic - HTML_O_SDONLOAD, // StarBasic - HTML_O_SDONMOUSEOUT, // StarBasic - HTML_O_SDONMOUSEOVER, // StarBasic - HTML_O_SDONRESET, // StarBasic - HTML_O_SDONSELECT, // StarBasic - HTML_O_SDONSUBMIT, // StarBasic - HTML_O_SDONUNLOAD, // StarBasic -HTML_OPTION_SCRIPT_END, - -// Attribute mit Kontext-abhaengigen Werten -HTML_OPTION_CONTEXT_START = HTML_OPTION_SCRIPT_END, - HTML_O_ALIGN = HTML_OPTION_CONTEXT_START, - HTML_O_COLS, // Netscape 2.0 vs HTML 2.0 - HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0 - HTML_O_SIZE, - HTML_O_START, - HTML_O_UNITS, -HTML_OPTION_CONTEXT_END, - -// eine unbekannte Option -HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END, -HTML_OPTION_END -}; - -#endif // _HTMLTOKN_H diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/imagemgr.hrc deleted file mode 100644 index a30660bba3b2..000000000000 --- a/svtools/inc/imagemgr.hrc +++ /dev/null @@ -1,193 +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: imagemgr.hrc,v $ - * $Revision: 1.15 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMAGEMGR_HRC -#define _SVTOOLS_IMAGEMGR_HRC - -// includes ****************************************************************** - -#define IMAGELIST_START 3076 // must match to old Id's in SFX! - -#define IMG_IMPRESS (IMAGELIST_START + 47) -#define IMG_WORKPLACE (IMAGELIST_START + 48) -#define IMG_BITMAP (IMAGELIST_START + 49) -#define IMG_CALC (IMAGELIST_START + 50) -#define IMG_CALCTEMPLATE (IMAGELIST_START + 51) -#define IMG_CHART (IMAGELIST_START + 52) -#define IMG_DATABASE (IMAGELIST_START + 53) -#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) -#define IMG_EXCEL (IMAGELIST_START + 55) -#define IMG_EXCELTEMPLATE (IMAGELIST_START + 56) -#define IMG_FTPSERVER (IMAGELIST_START + 58) -#define IMG_GALLERY (IMAGELIST_START + 59) -#define IMG_GALLERYTHEME (IMAGELIST_START + 60) -#define IMG_GIF (IMAGELIST_START + 61) -#define IMG_HELP (IMAGELIST_START + 62) -#define IMG_HTML (IMAGELIST_START + 63) -#define IMG_JPG (IMAGELIST_START + 64) -#define IMG_LINK (IMAGELIST_START + 65) -#define IMG_LOTUS (IMAGELIST_START + 66) -#define IMG_MATH (IMAGELIST_START + 68) -#define IMG_MATHTEMPLATE (IMAGELIST_START + 69) -#define IMG_FILE (IMAGELIST_START + 74) -#define IMG_APP (IMAGELIST_START + 75) -#define IMG_PCD (IMAGELIST_START + 76) -#define IMG_PCT (IMAGELIST_START + 77) -#define IMG_PCX (IMAGELIST_START + 78) -#define IMG_SIM (IMAGELIST_START + 79) -#define IMG_TEXTFILE (IMAGELIST_START + 80) -#define IMG_SVHELP (IMAGELIST_START + 81) -#define IMG_TIFF (IMAGELIST_START + 82) -#define IMG_URL (IMAGELIST_START + 83) -#define IMG_WMF (IMAGELIST_START + 84) -#define IMG_WORD (IMAGELIST_START + 85) -#define IMG_WRITER (IMAGELIST_START + 86) -#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) -#define IMG_FIXEDDEV (IMAGELIST_START + 88) -#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89) -#define IMG_CDROMDEV (IMAGELIST_START + 90) -#define IMG_NETWORKDEV (IMAGELIST_START + 91) -#define IMG_RAMDEV (IMAGELIST_START + 92) -#define IMG_TABLEFOLDER (IMAGELIST_START + 111) -#define IMG_TABLE (IMAGELIST_START + 112) -#define IMG_FOLDER (IMAGELIST_START + 113) -#define IMG_EXPANDEDFOLDER (IMAGELIST_START + 114) -#define IMG_XXX (IMAGELIST_START + 117) -#define IMG_GALLERYIMPORT (IMAGELIST_START + 122) -#define IMG_QUERYFOLDER (IMAGELIST_START + 125) -#define IMG_QUERY (IMAGELIST_START + 126) -#define IMG_FORM (IMAGELIST_START + 127) -#define IMG_FORMFOLDER (IMAGELIST_START + 128) -#define IMG_REPORT (IMAGELIST_START + 129) -#define IMG_REPORTFOLDER (IMAGELIST_START + 130) -#define IMG_OTHERS (IMAGELIST_START + 138) -#define IMG_MACROLIB (IMAGELIST_START + 140) -#define IMG_DXF (IMAGELIST_START + 141) -#define IMG_MET (IMAGELIST_START + 142) -#define IMG_PNG (IMAGELIST_START + 143) -#define IMG_SGF (IMAGELIST_START + 144) -#define IMG_SGV (IMAGELIST_START + 145) -#define IMG_SVM (IMAGELIST_START + 146) -#define IMG_GLOBAL_DOC (IMAGELIST_START + 150) -#define IMG_DRAW (IMAGELIST_START + 151) -#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) -#define IMG_TASK (IMAGELIST_START + 160) -#define IMG_APPOINTMENT (IMAGELIST_START + 161) -#define IMG_RELATION (IMAGELIST_START + 163) -#define IMG_IMPRESSPACKED (IMAGELIST_START + 165) -#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166) -#define IMG_POWERPOINT (IMAGELIST_START + 167) -#define IMG_POWERPOINTTEMPLATE (IMAGELIST_START + 168) -#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) -#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) -#define IMG_OO_MATH_DOC (IMAGELIST_START + 171) -#define IMG_OO_GLOBAL_DOC (IMAGELIST_START + 172) -#define IMG_OO_IMPRESS_DOC (IMAGELIST_START + 173) -#define IMG_OO_CALC_DOC (IMAGELIST_START + 174) -#define IMG_OO_WRITER_DOC (IMAGELIST_START + 175) -#define IMG_OO_DRAW_TEMPLATE (IMAGELIST_START + 176) -#define IMG_OO_IMPRESS_TEMPLATE (IMAGELIST_START + 177) -#define IMG_OO_CALC_TEMPLATE (IMAGELIST_START + 178) -#define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) -#define IMG_EXTENSION (IMAGELIST_START + 180) - -#define RID_DESCRIPTION_START 256 - -#define STR_DESCRIPTION_SOURCEFILE (RID_DESCRIPTION_START + 0) -#define STR_DESCRIPTION_BOOKMARKFILE (RID_DESCRIPTION_START + 1) -#define STR_DESCRIPTION_GRAPHIC_DOC (RID_DESCRIPTION_START + 2) -#define STR_DESCRIPTION_CFGFILE (RID_DESCRIPTION_START + 3) -#define STR_DESCRIPTION_APPLICATION (RID_DESCRIPTION_START + 4) -#define STR_DESCRIPTION_DATABASE_TABLE (RID_DESCRIPTION_START + 5) -#define STR_DESCRIPTION_SYSFILE (RID_DESCRIPTION_START + 6) -#define STR_DESCRIPTION_WORD_DOC (RID_DESCRIPTION_START + 7) -#define STR_DESCRIPTION_HELP_DOC (RID_DESCRIPTION_START + 8) -#define STR_DESCRIPTION_HTMLFILE (RID_DESCRIPTION_START + 9) -#define STR_DESCRIPTION_ARCHIVFILE (RID_DESCRIPTION_START + 10) -#define STR_DESCRIPTION_LOGFILE (RID_DESCRIPTION_START + 11) -#define STR_DESCRIPTION_SMATH_DOC (RID_DESCRIPTION_START + 12) -#define STR_DESCRIPTION_SCHART_DOC (RID_DESCRIPTION_START + 13) -#define STR_DESCRIPTION_SDRAW_DOC (RID_DESCRIPTION_START + 14) -#define STR_DESCRIPTION_SCALC_DOC (RID_DESCRIPTION_START + 15) -#define STR_DESCRIPTION_SIMPRESS_DOC (RID_DESCRIPTION_START + 16) -#define STR_DESCRIPTION_SWRITER_DOC (RID_DESCRIPTION_START + 17) -#define STR_DESCRIPTION_GLOBALDOC (RID_DESCRIPTION_START + 18) -#define STR_DESCRIPTION_SIMAGE_DOC (RID_DESCRIPTION_START + 19) -#define STR_DESCRIPTION_TEXTFILE (RID_DESCRIPTION_START + 20) -#define STR_DESCRIPTION_LINK (RID_DESCRIPTION_START + 21) -#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC (RID_DESCRIPTION_START + 22) -#define STR_DESCRIPTION_EXCEL_DOC (RID_DESCRIPTION_START + 23) -#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC (RID_DESCRIPTION_START + 24) -#define STR_DESCRIPTION_BATCHFILE (RID_DESCRIPTION_START + 25) -#define STR_DESCRIPTION_FILE (RID_DESCRIPTION_START + 26) -#define STR_DESCRIPTION_FOLDER (RID_DESCRIPTION_START + 27) -#define STR_DESCRIPTION_FACTORY_WRITER (RID_DESCRIPTION_START + 28) -#define STR_DESCRIPTION_FACTORY_CALC (RID_DESCRIPTION_START + 29) -#define STR_DESCRIPTION_FACTORY_IMPRESS (RID_DESCRIPTION_START + 30) -#define STR_DESCRIPTION_FACTORY_DRAW (RID_DESCRIPTION_START + 31) -#define STR_DESCRIPTION_FACTORY_WRITERWEB (RID_DESCRIPTION_START + 32) -#define STR_DESCRIPTION_FACTORY_GLOBALDOC (RID_DESCRIPTION_START + 33) -#define STR_DESCRIPTION_FACTORY_MATH (RID_DESCRIPTION_START + 34) -#define STR_DESCRIPTION_CALC_TEMPLATE (RID_DESCRIPTION_START + 35) -#define STR_DESCRIPTION_DRAW_TEMPLATE (RID_DESCRIPTION_START + 36) -#define STR_DESCRIPTION_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 37) -#define STR_DESCRIPTION_WRITER_TEMPLATE (RID_DESCRIPTION_START + 38) -#define STR_DESCRIPTION_LOCALE_VOLUME (RID_DESCRIPTION_START + 39) -#define STR_DESCRIPTION_FLOPPY_VOLUME (RID_DESCRIPTION_START + 40) -#define STR_DESCRIPTION_CDROM_VOLUME (RID_DESCRIPTION_START + 41) -#define STR_DESCRIPTION_REMOTE_VOLUME (RID_DESCRIPTION_START + 42) -#define STR_DESCRIPTION_POWERPOINT (RID_DESCRIPTION_START + 43) -#define STR_DESCRIPTION_POWERPOINT_TEMPLATE (RID_DESCRIPTION_START + 44) -#define STR_DESCRIPTION_POWERPOINT_SHOW (RID_DESCRIPTION_START + 45) -#define STR_DESCRIPTION_SXMATH_DOC (RID_DESCRIPTION_START + 46) -#define STR_DESCRIPTION_SXCHART_DOC (RID_DESCRIPTION_START + 47) -#define STR_DESCRIPTION_SXDRAW_DOC (RID_DESCRIPTION_START + 48) -#define STR_DESCRIPTION_SXCALC_DOC (RID_DESCRIPTION_START + 49) -#define STR_DESCRIPTION_SXIMPRESS_DOC (RID_DESCRIPTION_START + 50) -#define STR_DESCRIPTION_SXWRITER_DOC (RID_DESCRIPTION_START + 51) -#define STR_DESCRIPTION_SXGLOBAL_DOC (RID_DESCRIPTION_START + 52) -#define STR_DESCRIPTION_MATHML_DOC (RID_DESCRIPTION_START + 53) -#define STR_DESCRIPTION_SDATABASE_DOC (RID_DESCRIPTION_START + 54) -#define STR_DESCRIPTION_OO_DATABASE_DOC (RID_DESCRIPTION_START + 55) -#define STR_DESCRIPTION_OO_DRAW_DOC (RID_DESCRIPTION_START + 56) -#define STR_DESCRIPTION_OO_MATH_DOC (RID_DESCRIPTION_START + 57) -#define STR_DESCRIPTION_OO_GLOBAL_DOC (RID_DESCRIPTION_START + 58) -#define STR_DESCRIPTION_OO_IMPRESS_DOC (RID_DESCRIPTION_START + 59) -#define STR_DESCRIPTION_OO_CALC_DOC (RID_DESCRIPTION_START + 60) -#define STR_DESCRIPTION_OO_WRITER_DOC (RID_DESCRIPTION_START + 61) -#define STR_DESCRIPTION_OO_DRAW_TEMPLATE (RID_DESCRIPTION_START + 62) -#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 63) -#define STR_DESCRIPTION_OO_CALC_TEMPLATE (RID_DESCRIPTION_START + 64) -#define STR_DESCRIPTION_OO_WRITER_TEMPLATE (RID_DESCRIPTION_START + 65) -#define STR_DESCRIPTION_FACTORY_DATABASE (RID_DESCRIPTION_START + 66) -#define STR_DESCRIPTION_EXTENSION (RID_DESCRIPTION_START + 67) - -#endif - diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/imagemgr.hxx deleted file mode 100644 index 67159de7450d..000000000000 --- a/svtools/inc/imagemgr.hxx +++ /dev/null @@ -1,98 +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: imagemgr.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMAGEMGR_HXX -#define _SVTOOLS_IMAGEMGR_HXX - -// includes ****************************************************************** - -#include "svtools/svtdllapi.h" -#include "sal/types.h" - -class Image; -class String; -class INetURLObject; - -namespace svtools { - -struct VolumeInfo -{ - sal_Bool m_bIsVolume; - sal_Bool m_bIsRemote; - sal_Bool m_bIsRemoveable; - sal_Bool m_bIsFloppy; - sal_Bool m_bIsCompactDisc; - - VolumeInfo() : - m_bIsVolume ( sal_False ), - m_bIsRemote ( sal_False ), - m_bIsRemoveable ( sal_False ), - m_bIsFloppy ( sal_False ), - m_bIsCompactDisc( sal_False ) {} - - VolumeInfo( sal_Bool _bIsVolume, - sal_Bool _bIsRemote, - sal_Bool _bIsRemoveable, - sal_Bool _bIsFloppy, - sal_Bool _bIsCompactDisc ) : - m_bIsVolume ( _bIsVolume ), - m_bIsRemote ( _bIsRemote ), - m_bIsRemoveable ( _bIsRemoveable ), - m_bIsFloppy ( _bIsFloppy ), - m_bIsCompactDisc( _bIsCompactDisc ) {} -}; - -} - -class SvFileInformationManager -{ -private: - SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); - -public: - // depricated, because no high contrast mode - SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False ); - - // now with high contrast mode - SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast ); - - SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo ); -}; - -#endif - diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/imageresourceaccess.hxx deleted file mode 100644 index 5b6767c5f7c9..000000000000 --- a/svtools/inc/imageresourceaccess.hxx +++ /dev/null @@ -1,93 +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: imageresourceaccess.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX -#define SVTOOLS_INC_IMAGERESOURCEACCESS_HXX - -#include "svtools/svtdllapi.h" - -/** === begin UNO includes === **/ -#include -#include -/** === end UNO includes === **/ - -class SvStream; -//........................................................................ -namespace svt -{ -//........................................................................ - - //==================================================================== - //= GraphicAccess - //==================================================================== - /** helper class for obtaining streams (which also can be used with the ImageProducer) - from a resource - */ - class GraphicAccess - { - private: - GraphicAccess(); // never implemented - - public: - /** determines whether the given URL denotes an image within a resource - ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) - */ - SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); - - /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves - an SvStream for this image. - - This method works for arbitrary URLs denoting an image, since the - GraphicsProvider service is used - to resolve the URL. However, obtaining the stream is expensive (since - the image must be copied), so you are strongly encouraged to only use it - when you know that the image is small enough. - */ - SVT_DLLPUBLIC static SvStream* getImageStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::rtl::OUString& _rImageResourceURL - ); - - /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves - an XInputStream for this image. - */ - SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - getImageXStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::rtl::OUString& _rImageResourceURL - ); - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX - diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/imgdef.hxx deleted file mode 100644 index 2881fe5150bc..000000000000 --- a/svtools/inc/imgdef.hxx +++ /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: imgdef.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMGDEF_HXX -#define _SVTOOLS_IMGDEF_HXX - -enum SfxSymbolsSize -{ - SFX_SYMBOLS_SIZE_SMALL, - SFX_SYMBOLS_SIZE_LARGE, - SFX_SYMBOLS_SIZE_AUTO -}; - -#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 -#define SFX_TOOLBOX_CHANGEOUTSTYLE 0x0002 -#define SFX_TOOLBOX_CHANGEBUTTONTYPE 0x0004 - -#endif // _SVTOOLS_IMGDEF_HXX - diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/indexentryres.hxx deleted file mode 100644 index f2c73000ed67..000000000000 --- a/svtools/inc/indexentryres.hxx +++ /dev/null @@ -1,23 +0,0 @@ - -#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX -#define SVTOOLS_INDEXENTRYRESSOURCE_HXX - -#include "svtools/svtdllapi.h" -#include - -class IndexEntryRessourceData; - -class SVT_DLLPUBLIC IndexEntryRessource -{ - private: - IndexEntryRessourceData *mp_Data; - - public: - IndexEntryRessource (); - ~IndexEntryRessource (); - const String& GetTranslation (const String& r_Algorithm); -}; - -#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ - - diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/inetimg.hxx deleted file mode 100644 index 8068f4deda3f..000000000000 --- a/svtools/inc/inetimg.hxx +++ /dev/null @@ -1,89 +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: inetimg.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _INETIMG_HXX -#define _INETIMG_HXX - -#include -#include - -class SvData; -class SotDataObject; -class SotDataMemberObject; - -//========================================================================= - -class INetImage -{ - String aImageURL; - String aTargetURL; - String aTargetFrame; - String aAlternateText; - Size aSizePixel; - -protected: - String CopyExchange() const; - void PasteExchange( const String& rString ); - - void SetImageURL( const String& rS ) { aImageURL = rS; } - void SetTargetURL( const String& rS ) { aTargetURL = rS; } - void SetTargetFrame( const String& rS ) { aTargetFrame = rS; } - void SetAlternateText( const String& rS ){ aAlternateText = rS; } - void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; } - -public: - INetImage( - const String& rImageURL, - const String& rTargetURL, - const String& rTargetFrame, - const String& rAlternateText, - const Size& rSizePixel ) - : aImageURL( rImageURL ), - aTargetURL( rTargetURL ), - aTargetFrame( rTargetFrame ), - aAlternateText( rAlternateText ), - aSizePixel( rSizePixel ) - {} - INetImage() - {} - - const String& GetImageURL() const { return aImageURL; } - const String& GetTargetURL() const { return aTargetURL; } - const String& GetTargetFrame() const { return aTargetFrame; } - const String& GetAlternateText() const { return aAlternateText; } - const Size& GetSizePixel() const { return aSizePixel; } - - // Im-/Export - sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; - sal_Bool Read( SvStream& rIStm, ULONG nFormat ); -}; - -#endif // #ifndef _INETIMG_HXX - - diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/itemdel.hxx deleted file mode 100644 index 1af9b6e55421..000000000000 --- a/svtools/inc/itemdel.hxx +++ /dev/null @@ -1,42 +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: itemdel.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_ITEMDEL_HXX -#define _SVTOOLS_ITEMDEL_HXX - -#include "svtools/svtdllapi.h" - -class SfxPoolItem; - -SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ); - -void DeleteOnIdleItems(); - -#endif - diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx deleted file mode 100644 index 08fe6d57b652..000000000000 --- a/svtools/inc/ivctrl.hxx +++ /dev/null @@ -1,393 +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: ivctrl.hxx,v $ - * $Revision: 1.20 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _ICNVW_HXX -#define _ICNVW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include - -class SvPtrarr; -class ResId; -class Point; -class SvxIconChoiceCtrl_Impl; -class Image; - -#define ICNVIEW_FLAG_POS_LOCKED 0x0001 -#define ICNVIEW_FLAG_SELECTED 0x0002 -#define ICNVIEW_FLAG_FOCUSED 0x0004 -#define ICNVIEW_FLAG_IN_USE 0x0008 -#define ICNVIEW_FLAG_CURSORED 0x0010 // Rahmen um Image -#define ICNVIEW_FLAG_POS_MOVED 0x0020 // per D&D verschoben aber nicht gelockt -#define ICNVIEW_FLAG_DROP_TARGET 0x0040 // im QueryDrop gesetzt -#define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Emphasis nicht painten -#define ICNVIEW_FLAG_USER1 0x0100 -#define ICNVIEW_FLAG_USER2 0x0200 -#define ICNVIEW_FLAG_PRED_SET 0x0400 // Predecessor wurde umgesetzt - -enum SvxIconChoiceCtrlTextMode -{ - IcnShowTextFull = 1, // BoundRect nach unten aufplustern - IcnShowTextShort, // Abkuerzung mit "..." - IcnShowTextSmart, // Text komplett anzeigen, wenn moeglich (n.i.) - IcnShowTextDontKnow // Einstellung der View -}; - -enum SvxIconChoiceCtrlPositionMode -{ - IcnViewPositionModeFree = 0, // freies pixelgenaues Positionieren - IcnViewPositionModeAutoArrange = 1, // automatisches Ausrichten - IcnViewPositionModeAutoAdjust = 2, // automatisches Anordnen - IcnViewPositionModeLast = IcnViewPositionModeAutoAdjust -}; - -class SvxIconChoiceCtrlEntry -{ - Image aImage; - Image aImageHC; - - String aText; - String aQuickHelpText; - void* pUserData; - - friend class SvxIconChoiceCtrl_Impl; - friend class IcnCursor_Impl; - friend class EntryList_Impl; - friend class IcnGridMap_Impl; - - Rectangle aRect; // Bounding-Rect des Entries - Rectangle aGridRect; // nur gesetzt im Grid-Modus - ULONG nPos; - - // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen - // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus - // kann die sichtbare Reihenfolge aber anders sein. Die Eintraege werden deshalb dann - // verkettet - SvxIconChoiceCtrlEntry* pblink; // backward (linker Nachbar) - SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) - - SvxIconChoiceCtrlTextMode eTextMode; - USHORT nX,nY; // fuer Tastatursteuerung - USHORT nFlags; - - void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } - void SetFlags( USHORT nMask ) { nFlags |= nMask; } - void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } - - // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) - void SetBacklink( SvxIconChoiceCtrlEntry* pA ) - { - pA->pflink->pblink = this; // X <- B - this->pflink = pA->pflink; // X -> B - this->pblink = pA; // A <- X - pA->pflink = this; // A -> X - } - // loest eine Verbindung (A <-> this <-> B ==> A <-> B) - void Unlink() - { - this->pblink->pflink = this->pflink; - this->pflink->pblink = this->pblink; - this->pflink = 0; - this->pblink = 0; - } - -public: - SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 ); - ~SvxIconChoiceCtrlEntry () {} - - void SetImage ( const Image& rImage ) { aImage = rImage; } - void SetImageHC ( const Image& rImage ) { aImageHC = rImage; } - Image GetImage () const { return aImage; } - Image GetImageHC () const { return aImageHC; } - void SetText ( const String& rText ) { aText = rText; } - String GetText () const { return aText; } - String SVT_DLLPUBLIC GetDisplayText() const; - void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } - String GetQuickHelpText() const { return aQuickHelpText; } - void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } - void* GetUserData () { return pUserData; } - - const Rectangle & GetBoundRect() const { return aRect; } - - void SetFocus ( BOOL bSet ) - { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } - - SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } - USHORT GetFlags() const { return nFlags; } - BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } - BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } - BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } - BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } - BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } - BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } - BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } - void SetMoved( BOOL bMoved ); - BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } - void LockPos( BOOL bLock ); - // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead - SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } - SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } - -// sal_Unicode GetMnemonicChar() const; -}; - -enum SvxIconChoiceCtrlColumnAlign -{ - IcnViewAlignLeft = 1, - IcnViewAlignRight, - IcnViewAlignCenter -}; - -class SvxIconChoiceCtrlColumnInfo -{ - String aColText; - Image aColImage; - long nWidth; - SvxIconChoiceCtrlColumnAlign eAlignment; - USHORT nSubItem; - -public: - SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, - SvxIconChoiceCtrlColumnAlign eAlign ) : - nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} - SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); - - void SetText( const String& rText ) { aColText = rText; } - void SetImage( const Image& rImg ) { aColImage = rImg; } - void SetWidth( long nWd ) { nWidth = nWd; } - void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } - void SetSubItem( USHORT nSub) { nSubItem = nSub; } - - const String& GetText() const { return aColText; } - const Image& GetImage() const { return aColImage; } - long GetWidth() const { return nWidth; } - SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } - USHORT GetSubItem() const { return nSubItem; } -}; - -//################################################################################################################################### -/* - Window-Bits: - WB_ICON // Text unter dem Icon - WB_SMALL_ICON // Text rechts neben Icon, beliebige Positionierung - WB_DETAILS // Text rechts neben Icon, eingeschraenkte Posit. - WB_BORDER - WB_NOHIDESELECTION // Selektion inaktiv zeichnen, wenn kein Fokus - WB_NOHSCROLL - WB_NOVSCROLL - WB_NOSELECTION - WB_SMART_ARRANGE // im Arrange die Vis-Area beibehalten - WB_ALIGN_TOP // Anordnung zeilenweise von links nach rechts - WB_ALIGN_LEFT // Anordnung spaltenweise von oben nach unten - WB_NODRAGSELECTION // Keine Selektion per Tracking-Rect - WB_NOCOLUMNHEADER // keine Headerbar in Detailsview (Headerbar not implemented) - WB_NOPOINTERFOCUS // Kein GrabFocus im MouseButtonDown - WB_HIGHLIGHTFRAME // der unter der Maus befindliche Eintrag wird hervorgehoben - WB_NOASYNCSELECTHDL // Selektionshandler synchron aufrufen, d.h. Events nicht sammeln -*/ - -#define WB_ICON WB_RECTSTYLE -#define WB_SMALLICON WB_SMALLSTYLE -#define WB_DETAILS WB_VCENTER -#define WB_NOHSCROLL WB_SPIN -#define WB_NOVSCROLL WB_DRAG -#define WB_NOSELECTION WB_REPEAT -#define WB_NODRAGSELECTION WB_PATHELLIPSIS -#define WB_SMART_ARRANGE WB_PASSWORD -#define WB_ALIGN_TOP WB_TOP -#define WB_ALIGN_LEFT WB_LEFT -#define WB_NOCOLUMNHEADER WB_CENTER -#define WB_HIGHLIGHTFRAME WB_INFO -#define WB_NOASYNCSELECTHDL WB_NOLABEL - -class MnemonicGenerator; - -class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control -{ - friend class SvxIconChoiceCtrl_Impl; - - Link _aClickIconHdl; - Link _aDocRectChangedHdl; - Link _aVisRectChangedHdl; - KeyEvent* _pCurKeyEvent; - SvxIconChoiceCtrl_Impl* _pImp; - BOOL _bAutoFontColor; - -protected: - - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); - virtual void DocumentRectChanged(); - virtual void VisibleRectChanged(); - virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void ClickIcon(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void DrawEntryImage( - SvxIconChoiceCtrlEntry* pEntry, - const Point& rPos, - OutputDevice& rDev ); - - virtual String GetEntryText( - SvxIconChoiceCtrlEntry* pEntry, - BOOL bInplaceEdit ); - - virtual void FillLayoutData() const; - - void CallImplEventListeners(ULONG nEvent, void* pData); - -public: - - SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); - SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ); - virtual ~SvtIconChoiceCtrl(); - - void SetStyle( WinBits nWinStyle ); - WinBits GetStyle() const; - - BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); - - void SetUpdateMode( BOOL bUpdateMode ); - void SetFont( const Font& rFont ); - void SetPointFont( const Font& rFont ); - - void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; } - const Link& GetClickHdl() const { return _aClickIconHdl; } - - using OutputDevice::SetBackground; - void SetBackground( const Wallpaper& rWallpaper ); - - void ArrangeIcons(); - - - SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, - ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, - ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - - /** creates automatic mnemonics for all icon texts in the control - */ - void CreateAutoMnemonics( void ); - - /** creates automatic mnemonics for all icon texts in the control - - @param _rUsedMnemonics - a MnemonicGenerator at which some other mnemonics are already registered. - This can be used if the control needs to share the "mnemonic space" with other elements, - such as a menu bar. - */ - void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics ); - - void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); - - BOOL DoKeyInput( const KeyEvent& rKEvt ); - - BOOL IsEntryEditing() const; - void Clear(); - - ULONG GetEntryCount() const; - SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; - ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; - using Window::SetCursor; - void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); - SvxIconChoiceCtrlEntry* GetCursor() const; - - // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster - void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); - - // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt - // ==TRUE : Bitmap oder Text muss getroffen sein - SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; - // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; - // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; - - // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben - SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; - - void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); - SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; - - // offene asynchron abzuarbeitende Aktionen ausfuehren. Muss vor dem Speichern von - // Eintragspositionen etc. gerufen werden - void Flush(); - - - virtual BOOL HasBackground() const; - virtual BOOL HasFont() const; - virtual BOOL HasFontTextColor() const; - virtual BOOL HasFontFillColor() const; - - void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } - BOOL AutoFontColor () { return _bAutoFontColor; } - - Point GetLogicPos( const Point& rPosPixel ) const; - Point GetPixelPos( const Point& rPosLogic ) const; - void SetSelectionMode( SelectionMode eMode ); - - BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); - - Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; - Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; - - void SetNoSelection(); - - // ACCESSIBILITY ========================================================== - - /** Creates and returns the accessible object of the Box. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); -}; - -#endif // _ICNVW_HXX - diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx deleted file mode 100644 index 4d2043d7b992..000000000000 --- a/svtools/inc/localresaccess.hxx +++ /dev/null @@ -1,85 +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: localresaccess.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ -#define _SVTOOLS_LOCALRESACCESS_HXX_ - -#include -#include -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //========================================================================= - //= OLocalResourceAccess - //========================================================================= - /** helper class for acessing local resources - */ - class OLocalResourceAccess : public Resource - { - protected: - ResMgr* m_pManager; - - public: - OLocalResourceAccess( const ResId& _rId ) - :Resource( _rId.SetAutoRelease( sal_False ) ) - ,m_pManager( _rId.GetResMgr() ) - { - } - - OLocalResourceAccess(const ResId& _rId, RESOURCE_TYPE _rType) - :Resource(_rId.SetRT(_rType).SetAutoRelease(sal_False)) - ,m_pManager(_rId.GetResMgr()) - { - OSL_ENSURE( m_pManager != NULL, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); - } - - ~OLocalResourceAccess() - { - if ( m_pManager ) - m_pManager->Increment( m_pManager->GetRemainSize() ); - FreeResource(); - } - - inline BOOL IsAvailableRes( const ResId& _rId ) const - { - return Resource::IsAvailableRes( _rId ); - } - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // _SVTOOLS_LOCALRESACCESS_HXX_ - diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/prgsbar.hxx deleted file mode 100644 index ca569ac152f4..000000000000 --- a/svtools/inc/prgsbar.hxx +++ /dev/null @@ -1,103 +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: prgsbar.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PRGSBAR_HXX -#define _PRGSBAR_HXX - -#include "svtools/svtdllapi.h" -#include - -/************************************************************************* - -Beschreibung -============ - -class ProgressBar - -Diese Klasse dient zur Anzeige einer Progress-Anzeige. - --------------------------------------------------------------------------- - -WinBits - -WB_BORDER Border um das Fenster -WB_3DLOOK 3D-Darstellung - --------------------------------------------------------------------------- - -Methoden - -Mit SetValue() setzt man einen Prozent-Wert zwischen 0 und 100. Wenn Werte -groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken. - -*************************************************************************/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_STDPROGRESSBAR WB_BORDER - -// --------------- -// - ProgressBar - -// --------------- - -class SVT_DLLPUBLIC ProgressBar : public Window -{ -private: - Point maPos; - long mnPrgsWidth; - long mnPrgsHeight; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbCalcNew; - -#ifdef _SV_PRGSBAR_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); -#endif - -public: - ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); - ProgressBar( Window* pParent, const ResId& rResId ); - ~ProgressBar(); - - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void SetValue( USHORT nNewPercent ); - USHORT GetValue() const { return mnPercent; } -}; - -#endif // _PRGSBAR_HXX diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx deleted file mode 100644 index 14ed6abceed6..000000000000 --- a/svtools/inc/roadmap.hxx +++ /dev/null @@ -1,140 +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: roadmap.hxx,v $ - * $Revision: 1.10 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_ROADMAP_HXX -#define _SVTOOLS_ROADMAP_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -#ifndef _SVTOOLS_HYPERLABEL_HXX -#include "svtools/hyperlabel.hxx" -#endif - - - - -class Bitmap; -//......................................................................... -namespace svt -{ -//......................................................................... - - struct RoadmapTypes - { - public: - typedef sal_Int16 ItemId; - typedef sal_Int32 ItemIndex; - }; - - class RoadmapImpl; - class RoadmapItem; - - //===================================================================== - //= Roadmap - //===================================================================== - class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes - { - protected: - RoadmapImpl* m_pImpl; - // Window overridables - void Paint( const Rectangle& _rRect ); - void implInit(); - - public: - ORoadmap( Window* _pParent, const ResId& _rId ); - ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); - ~ORoadmap( ); - - void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True ); - const BitmapEx& GetRoadmapBitmap( ) const; - - void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); - sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const; - - void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); - ::rtl::OUString GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex = 0 ); - void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); - - void SetRoadmapInteractive( sal_Bool _bInteractive ); - sal_Bool IsRoadmapInteractive(); - - void SetRoadmapComplete( sal_Bool _bComplete ); - sal_Bool IsRoadmapComplete() const; - - ItemIndex GetItemCount() const; - ItemId GetItemID( ItemIndex _nIndex ) const; - ItemIndex GetItemIndex( ItemId _nID ) const; - - void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); - void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); - void DeleteRoadmapItem( ItemIndex _nIndex ); - - ItemId GetCurrentRoadmapItemID() const; - sal_Bool SelectRoadmapItemByID( ItemId _nItemID ); - - void SetItemSelectHdl( const Link& _rHdl ); - Link GetItemSelectHdl( ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void GetFocus(); - - - protected: - long PreNotify( NotifyEvent& rNEvt ); - - protected: - /// called when an item has been selected by any means - virtual void Select(); - - private: - DECL_LINK(ImplClickHdl, HyperLabel*); - - RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); - const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; - - RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); - const RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ) const; - RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); - - void DrawHeadline(); - void DeselectOldRoadmapItems(); - ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); - ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); - RoadmapItem* GetByPointer(Window* pWindow); - RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); - void UpdatefollowingHyperLabels( ItemIndex _Index ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif - diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx deleted file mode 100644 index f76399ffd824..000000000000 --- a/svtools/inc/rtfkeywd.hxx +++ /dev/null @@ -1,1144 +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: rtfkeywd.hxx,v $ - * $Revision: 1.13.134.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RTFKEYWD_HXX -#define _RTFKEYWD_HXX - -#include "sal/config.h" - -#define OOO_STRING_SVTOOLS_RTF_HEXCHAR "\\'" -#define OOO_STRING_SVTOOLS_RTF_IGNORE "\\*" -#define OOO_STRING_SVTOOLS_RTF_OPTHYPH "\\-" -#define OOO_STRING_SVTOOLS_RTF_SUBENTRY "\\:" -#define OOO_STRING_SVTOOLS_RTF_ABSH "\\absh" -#define OOO_STRING_SVTOOLS_RTF_ABSW "\\absw" -#define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" -#define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" -#define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" -#define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" -#define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" -#define OOO_STRING_SVTOOLS_RTF_B "\\b" -#define OOO_STRING_SVTOOLS_RTF_BGBDIAG "\\bgbdiag" -#define OOO_STRING_SVTOOLS_RTF_BGCROSS "\\bgcross" -#define OOO_STRING_SVTOOLS_RTF_BGDCROSS "\\bgdcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKBDIAG "\\bgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_BGDKCROSS "\\bgdkcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKDCROSS "\\bgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKFDIAG "\\bgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_BGDKHORIZ "\\bgdkhoriz" -#define OOO_STRING_SVTOOLS_RTF_BGDKVERT "\\bgdkvert" -#define OOO_STRING_SVTOOLS_RTF_BGFDIAG "\\bgfdiag" -#define OOO_STRING_SVTOOLS_RTF_BGHORIZ "\\bghoriz" -#define OOO_STRING_SVTOOLS_RTF_BGVERT "\\bgvert" -#define OOO_STRING_SVTOOLS_RTF_BIN "\\bin" -#define OOO_STRING_SVTOOLS_RTF_BINFSXN "\\binfsxn" -#define OOO_STRING_SVTOOLS_RTF_BINSXN "\\binsxn" -#define OOO_STRING_SVTOOLS_RTF_BKMKCOLF "\\bkmkcolf" -#define OOO_STRING_SVTOOLS_RTF_BKMKCOLL "\\bkmkcoll" -#define OOO_STRING_SVTOOLS_RTF_BKMKEND "\\bkmkend" -#define OOO_STRING_SVTOOLS_RTF_BKMKSTART "\\bkmkstart" -#define OOO_STRING_SVTOOLS_RTF_BLUE "\\blue" -#define OOO_STRING_SVTOOLS_RTF_BOX "\\box" -#define OOO_STRING_SVTOOLS_RTF_BRDRB "\\brdrb" -#define OOO_STRING_SVTOOLS_RTF_BRDRBAR "\\brdrbar" -#define OOO_STRING_SVTOOLS_RTF_BRDRBTW "\\brdrbtw" -#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf" -#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb" -#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot" -#define OOO_STRING_SVTOOLS_RTF_BRDRHAIR "\\brdrhair" -#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl" -#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr" -#define OOO_STRING_SVTOOLS_RTF_BRDRS "\\brdrs" -#define OOO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh" -#define OOO_STRING_SVTOOLS_RTF_BRDRT "\\brdrt" -#define OOO_STRING_SVTOOLS_RTF_BRDRTH "\\brdrth" -#define OOO_STRING_SVTOOLS_RTF_BRDRW "\\brdrw" -#define OOO_STRING_SVTOOLS_RTF_BRSP "\\brsp" -#define OOO_STRING_SVTOOLS_RTF_BULLET "\\bullet" -#define OOO_STRING_SVTOOLS_RTF_BUPTIM "\\buptim" -#define OOO_STRING_SVTOOLS_RTF_BXE "\\bxe" -#define OOO_STRING_SVTOOLS_RTF_CAPS "\\caps" -#define OOO_STRING_SVTOOLS_RTF_CB "\\cb" -#define OOO_STRING_SVTOOLS_RTF_CBPAT "\\cbpat" -#define OOO_STRING_SVTOOLS_RTF_CELL "\\cell" -#define OOO_STRING_SVTOOLS_RTF_CELLX "\\cellx" -#define OOO_STRING_SVTOOLS_RTF_CF "\\cf" -#define OOO_STRING_SVTOOLS_RTF_CFPAT "\\cfpat" -#define OOO_STRING_SVTOOLS_RTF_CHATN "\\chatn" -#define OOO_STRING_SVTOOLS_RTF_CHDATE "\\chdate" -#define OOO_STRING_SVTOOLS_RTF_CHDPA "\\chdpa" -#define OOO_STRING_SVTOOLS_RTF_CHDPL "\\chdpl" -#define OOO_STRING_SVTOOLS_RTF_CHFTN "\\chftn" -#define OOO_STRING_SVTOOLS_RTF_CHFTNSEP "\\chftnsep" -#define OOO_STRING_SVTOOLS_RTF_CHFTNSEPC "\\chftnsepc" -#define OOO_STRING_SVTOOLS_RTF_CHPGN "\\chpgn" -#define OOO_STRING_SVTOOLS_RTF_CHTIME "\\chtime" -#define OOO_STRING_SVTOOLS_RTF_CLBGBDIAG "\\clbgbdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGCROSS "\\clbgcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDCROSS "\\clbgdcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG "\\clbgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS "\\clbgdkcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS "\\clbgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG "\\clbgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKHOR "\\clbgdkhor" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKVERT "\\clbgdkvert" -#define OOO_STRING_SVTOOLS_RTF_CLBGFDIAG "\\clbgfdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGHORIZ "\\clbghoriz" -#define OOO_STRING_SVTOOLS_RTF_CLBGVERT "\\clbgvert" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRB "\\clbrdrb" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRL "\\clbrdrl" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRR "\\clbrdrr" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRT "\\clbrdrt" -#define OOO_STRING_SVTOOLS_RTF_CLCBPAT "\\clcbpat" -#define OOO_STRING_SVTOOLS_RTF_CLCFPAT "\\clcfpat" -#define OOO_STRING_SVTOOLS_RTF_CLMGF "\\clmgf" -#define OOO_STRING_SVTOOLS_RTF_CLMRG "\\clmrg" -#define OOO_STRING_SVTOOLS_RTF_CLSHDNG "\\clshdng" -#define OOO_STRING_SVTOOLS_RTF_COLNO "\\colno" -#define OOO_STRING_SVTOOLS_RTF_COLORTBL "\\colortbl" -#define OOO_STRING_SVTOOLS_RTF_COLS "\\cols" -#define OOO_STRING_SVTOOLS_RTF_COLSR "\\colsr" -#define OOO_STRING_SVTOOLS_RTF_COLSX "\\colsx" -#define OOO_STRING_SVTOOLS_RTF_COLUMN "\\column" -#define OOO_STRING_SVTOOLS_RTF_COLW "\\colw" -#define OOO_STRING_SVTOOLS_RTF_COMMENT "\\comment" -#define OOO_STRING_SVTOOLS_RTF_CREATIM "\\creatim" -#define OOO_STRING_SVTOOLS_RTF_CTRL "\\ctrl" -#define OOO_STRING_SVTOOLS_RTF_DEFF "\\deff" -#define OOO_STRING_SVTOOLS_RTF_DEFFORMAT "\\defformat" -#define OOO_STRING_SVTOOLS_RTF_DEFLANG "\\deflang" -#define OOO_STRING_SVTOOLS_RTF_DEFTAB "\\deftab" -#define OOO_STRING_SVTOOLS_RTF_DELETED "\\deleted" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTX "\\dfrmtxtx" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTY "\\dfrmtxty" -#define OOO_STRING_SVTOOLS_RTF_DIBITMAP "\\dibitmap" -#define OOO_STRING_SVTOOLS_RTF_DN "\\dn" -#define OOO_STRING_SVTOOLS_RTF_DOCCOMM "\\doccomm" -#define OOO_STRING_SVTOOLS_RTF_DOCTEMP "\\doctemp" -#define OOO_STRING_SVTOOLS_RTF_DROPCAPLI "\\dropcapli" -#define OOO_STRING_SVTOOLS_RTF_DROPCAPT "\\dropcapt" -#define OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP "\\absnoovrlp" -#define OOO_STRING_SVTOOLS_RTF_DXFRTEXT "\\dxfrtext" -#define OOO_STRING_SVTOOLS_RTF_DY "\\dy" -#define OOO_STRING_SVTOOLS_RTF_EDMINS "\\edmins" -#define OOO_STRING_SVTOOLS_RTF_EMDASH "\\emdash" -#define OOO_STRING_SVTOOLS_RTF_ENDASH "\\endash" -#define OOO_STRING_SVTOOLS_RTF_ENDDOC "\\enddoc" -#define OOO_STRING_SVTOOLS_RTF_ENDNHERE "\\endnhere" -#define OOO_STRING_SVTOOLS_RTF_ENDNOTES "\\endnotes" -#define OOO_STRING_SVTOOLS_RTF_EXPND "\\expnd" -#define OOO_STRING_SVTOOLS_RTF_EXPNDTW "\\expndtw" -#define OOO_STRING_SVTOOLS_RTF_F "\\f" -#define OOO_STRING_SVTOOLS_RTF_FACINGP "\\facingp" -#define OOO_STRING_SVTOOLS_RTF_FACPGSXN "\\facpgsxn" -#define OOO_STRING_SVTOOLS_RTF_FALT "\\falt" -#define OOO_STRING_SVTOOLS_RTF_FCHARSET "\\fcharset" -#define OOO_STRING_SVTOOLS_RTF_FDECOR "\\fdecor" -#define OOO_STRING_SVTOOLS_RTF_FI "\\fi" -#define OOO_STRING_SVTOOLS_RTF_FIELD "\\field" -#define OOO_STRING_SVTOOLS_RTF_FLDDIRTY "\\flddirty" -#define OOO_STRING_SVTOOLS_RTF_FLDEDIT "\\fldedit" -#define OOO_STRING_SVTOOLS_RTF_FLDINST "\\fldinst" -#define OOO_STRING_SVTOOLS_RTF_FLDLOCK "\\fldlock" -#define OOO_STRING_SVTOOLS_RTF_FLDPRIV "\\fldpriv" -#define OOO_STRING_SVTOOLS_RTF_FLDRSLT "\\fldrslt" -#define OOO_STRING_SVTOOLS_RTF_FMODERN "\\fmodern" -#define OOO_STRING_SVTOOLS_RTF_FN "\\fn" -#define OOO_STRING_SVTOOLS_RTF_FNIL "\\fnil" -#define OOO_STRING_SVTOOLS_RTF_FONTTBL "\\fonttbl" -#define OOO_STRING_SVTOOLS_RTF_FOOTER "\\footer" -#define OOO_STRING_SVTOOLS_RTF_FOOTERF "\\footerf" -#define OOO_STRING_SVTOOLS_RTF_FOOTERL "\\footerl" -#define OOO_STRING_SVTOOLS_RTF_FOOTERR "\\footerr" -#define OOO_STRING_SVTOOLS_RTF_FOOTERY "\\footery" -#define OOO_STRING_SVTOOLS_RTF_FOOTNOTE "\\footnote" -#define OOO_STRING_SVTOOLS_RTF_FPRQ "\\fprq" -#define OOO_STRING_SVTOOLS_RTF_FRACWIDTH "\\fracwidth" -#define OOO_STRING_SVTOOLS_RTF_FROMAN "\\froman" -#define OOO_STRING_SVTOOLS_RTF_FS "\\fs" -#define OOO_STRING_SVTOOLS_RTF_FSCRIPT "\\fscript" -#define OOO_STRING_SVTOOLS_RTF_FSWISS "\\fswiss" -#define OOO_STRING_SVTOOLS_RTF_FTECH "\\ftech" -#define OOO_STRING_SVTOOLS_RTF_FTNBJ "\\ftnbj" -#define OOO_STRING_SVTOOLS_RTF_FTNCN "\\ftncn" -#define OOO_STRING_SVTOOLS_RTF_FTNRESTART "\\ftnrestart" -#define OOO_STRING_SVTOOLS_RTF_FTNSEP "\\ftnsep" -#define OOO_STRING_SVTOOLS_RTF_FTNSEPC "\\ftnsepc" -#define OOO_STRING_SVTOOLS_RTF_FTNSTART "\\ftnstart" -#define OOO_STRING_SVTOOLS_RTF_FTNTJ "\\ftntj" -#define OOO_STRING_SVTOOLS_RTF_GREEN "\\green" -#define OOO_STRING_SVTOOLS_RTF_GUTTER "\\gutter" -#define OOO_STRING_SVTOOLS_RTF_GUTTERSXN "\\guttersxn" -#define OOO_STRING_SVTOOLS_RTF_HEADER "\\header" -#define OOO_STRING_SVTOOLS_RTF_HEADERF "\\headerf" -#define OOO_STRING_SVTOOLS_RTF_HEADERL "\\headerl" -#define OOO_STRING_SVTOOLS_RTF_HEADERR "\\headerr" -#define OOO_STRING_SVTOOLS_RTF_HEADERY "\\headery" -#define OOO_STRING_SVTOOLS_RTF_HR "\\hr" -#define OOO_STRING_SVTOOLS_RTF_HYPHHOTZ "\\hyphhotz" -#define OOO_STRING_SVTOOLS_RTF_I "\\i" -#define OOO_STRING_SVTOOLS_RTF_ID "\\id" -#define OOO_STRING_SVTOOLS_RTF_INFO "\\info" -#define OOO_STRING_SVTOOLS_RTF_INTBL "\\intbl" -#define OOO_STRING_SVTOOLS_RTF_IXE "\\ixe" -#define OOO_STRING_SVTOOLS_RTF_KEEP "\\keep" -#define OOO_STRING_SVTOOLS_RTF_KEEPN "\\keepn" -#define OOO_STRING_SVTOOLS_RTF_KERNING "\\kerning" -#define OOO_STRING_SVTOOLS_RTF_KEYCODE "\\keycode" -#define OOO_STRING_SVTOOLS_RTF_KEYWORDS "\\keywords" -#define OOO_STRING_SVTOOLS_RTF_LANDSCAPE "\\landscape" -#define OOO_STRING_SVTOOLS_RTF_LANG "\\lang" -#define OOO_STRING_SVTOOLS_RTF_LDBLQUOTE "\\ldblquote" -#define OOO_STRING_SVTOOLS_RTF_LEVEL "\\level" -#define OOO_STRING_SVTOOLS_RTF_LI "\\li" -#define OOO_STRING_SVTOOLS_RTF_LIN "\\lin" -#define OOO_STRING_SVTOOLS_RTF_LINE "\\line" -#define OOO_STRING_SVTOOLS_RTF_LINEBETCOL "\\linebetcol" -#define OOO_STRING_SVTOOLS_RTF_LINECONT "\\linecont" -#define OOO_STRING_SVTOOLS_RTF_LINEMOD "\\linemod" -#define OOO_STRING_SVTOOLS_RTF_LINEPPAGE "\\lineppage" -#define OOO_STRING_SVTOOLS_RTF_LINERESTART "\\linerestart" -#define OOO_STRING_SVTOOLS_RTF_LINESTART "\\linestart" -#define OOO_STRING_SVTOOLS_RTF_LINESTARTS "\\linestarts" -#define OOO_STRING_SVTOOLS_RTF_LINEX "\\linex" -#define OOO_STRING_SVTOOLS_RTF_LNDSCPSXN "\\lndscpsxn" -#define OOO_STRING_SVTOOLS_RTF_LQUOTE "\\lquote" -#define OOO_STRING_SVTOOLS_RTF_MAC "\\mac" -#define OOO_STRING_SVTOOLS_RTF_MACPICT "\\macpict" -#define OOO_STRING_SVTOOLS_RTF_MAKEBACKUP "\\makebackup" -#define OOO_STRING_SVTOOLS_RTF_MARGB "\\margb" -#define OOO_STRING_SVTOOLS_RTF_MARGBSXN "\\margbsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGL "\\margl" -#define OOO_STRING_SVTOOLS_RTF_MARGLSXN "\\marglsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGMIRROR "\\margmirror" -#define OOO_STRING_SVTOOLS_RTF_MARGR "\\margr" -#define OOO_STRING_SVTOOLS_RTF_MARGRSXN "\\margrsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGT "\\margt" -#define OOO_STRING_SVTOOLS_RTF_MARGTSXN "\\margtsxn" -#define OOO_STRING_SVTOOLS_RTF_MIN "\\min" -#define OOO_STRING_SVTOOLS_RTF_MO "\\mo" -#define OOO_STRING_SVTOOLS_RTF_NEXTCSET "\\nextcset" -#define OOO_STRING_SVTOOLS_RTF_NEXTFILE "\\nextfile" -#define OOO_STRING_SVTOOLS_RTF_NOFCHARS "\\nofchars" -#define OOO_STRING_SVTOOLS_RTF_NOFPAGES "\\nofpages" -#define OOO_STRING_SVTOOLS_RTF_NOFWORDS "\\nofwords" -#define OOO_STRING_SVTOOLS_RTF_NOLINE "\\noline" -#define OOO_STRING_SVTOOLS_RTF_NOSUPERSUB "\\nosupersub" -#define OOO_STRING_SVTOOLS_RTF_NOWRAP "\\nowrap" -#define OOO_STRING_SVTOOLS_RTF_OPERATOR "\\operator" -#define OOO_STRING_SVTOOLS_RTF_OUTL "\\outl" -#define OOO_STRING_SVTOOLS_RTF_PAGE "\\page" -#define OOO_STRING_SVTOOLS_RTF_PAGEBB "\\pagebb" -#define OOO_STRING_SVTOOLS_RTF_PAPERH "\\paperh" -#define OOO_STRING_SVTOOLS_RTF_PAPERW "\\paperw" -#define OOO_STRING_SVTOOLS_RTF_PAR "\\par" -#define OOO_STRING_SVTOOLS_RTF_PARD "\\pard" -#define OOO_STRING_SVTOOLS_RTF_PC "\\pc" -#define OOO_STRING_SVTOOLS_RTF_PCA "\\pca" -#define OOO_STRING_SVTOOLS_RTF_PGHSXN "\\pghsxn" -#define OOO_STRING_SVTOOLS_RTF_PGNCONT "\\pgncont" -#define OOO_STRING_SVTOOLS_RTF_PGNDEC "\\pgndec" -#define OOO_STRING_SVTOOLS_RTF_PGNLCLTR "\\pgnlcltr" -#define OOO_STRING_SVTOOLS_RTF_PGNLCRM "\\pgnlcrm" -#define OOO_STRING_SVTOOLS_RTF_PGNRESTART "\\pgnrestart" -#define OOO_STRING_SVTOOLS_RTF_PGNSTART "\\pgnstart" -#define OOO_STRING_SVTOOLS_RTF_PGNSTARTS "\\pgnstarts" -#define OOO_STRING_SVTOOLS_RTF_PGNUCLTR "\\pgnucltr" -#define OOO_STRING_SVTOOLS_RTF_PGNUCRM "\\pgnucrm" -#define OOO_STRING_SVTOOLS_RTF_PGNX "\\pgnx" -#define OOO_STRING_SVTOOLS_RTF_PGNY "\\pgny" -#define OOO_STRING_SVTOOLS_RTF_PGWSXN "\\pgwsxn" -#define OOO_STRING_SVTOOLS_RTF_PHCOL "\\phcol" -#define OOO_STRING_SVTOOLS_RTF_PHMRG "\\phmrg" -#define OOO_STRING_SVTOOLS_RTF_PHPG "\\phpg" -#define OOO_STRING_SVTOOLS_RTF_PICCROPB "\\piccropb" -#define OOO_STRING_SVTOOLS_RTF_PICCROPL "\\piccropl" -#define OOO_STRING_SVTOOLS_RTF_PICCROPR "\\piccropr" -#define OOO_STRING_SVTOOLS_RTF_PICCROPT "\\piccropt" -#define OOO_STRING_SVTOOLS_RTF_PICH "\\pich" -#define OOO_STRING_SVTOOLS_RTF_PICHGOAL "\\pichgoal" -#define OOO_STRING_SVTOOLS_RTF_PICSCALED "\\picscaled" -#define OOO_STRING_SVTOOLS_RTF_PICSCALEX "\\picscalex" -#define OOO_STRING_SVTOOLS_RTF_PICSCALEY "\\picscaley" -#define OOO_STRING_SVTOOLS_RTF_PICT "\\pict" -#define OOO_STRING_SVTOOLS_RTF_PICW "\\picw" -#define OOO_STRING_SVTOOLS_RTF_PICWGOAL "\\picwgoal" -#define OOO_STRING_SVTOOLS_RTF_PLAIN "\\plain" -#define OOO_STRING_SVTOOLS_RTF_PMMETAFILE "\\pmmetafile" -#define OOO_STRING_SVTOOLS_RTF_POSNEGX "\\posnegx" -#define OOO_STRING_SVTOOLS_RTF_POSNEGY "\\posnegy" -#define OOO_STRING_SVTOOLS_RTF_POSX "\\posx" -#define OOO_STRING_SVTOOLS_RTF_POSXC "\\posxc" -#define OOO_STRING_SVTOOLS_RTF_POSXI "\\posxi" -#define OOO_STRING_SVTOOLS_RTF_POSXL "\\posxl" -#define OOO_STRING_SVTOOLS_RTF_POSXO "\\posxo" -#define OOO_STRING_SVTOOLS_RTF_POSXR "\\posxr" -#define OOO_STRING_SVTOOLS_RTF_POSY "\\posy" -#define OOO_STRING_SVTOOLS_RTF_POSYB "\\posyb" -#define OOO_STRING_SVTOOLS_RTF_POSYC "\\posyc" -#define OOO_STRING_SVTOOLS_RTF_POSYIL "\\posyil" -#define OOO_STRING_SVTOOLS_RTF_POSYT "\\posyt" -#define OOO_STRING_SVTOOLS_RTF_PRINTIM "\\printim" -#define OOO_STRING_SVTOOLS_RTF_PSOVER "\\psover" -#define OOO_STRING_SVTOOLS_RTF_PVMRG "\\pvmrg" -#define OOO_STRING_SVTOOLS_RTF_PVPARA "\\pvpara" -#define OOO_STRING_SVTOOLS_RTF_PVPG "\\pvpg" -#define OOO_STRING_SVTOOLS_RTF_QC "\\qc" -#define OOO_STRING_SVTOOLS_RTF_QJ "\\qj" -#define OOO_STRING_SVTOOLS_RTF_QL "\\ql" -#define OOO_STRING_SVTOOLS_RTF_QR "\\qr" -#define OOO_STRING_SVTOOLS_RTF_RDBLQUOTE "\\rdblquote" -#define OOO_STRING_SVTOOLS_RTF_RED "\\red" -#define OOO_STRING_SVTOOLS_RTF_REVBAR "\\revbar" -#define OOO_STRING_SVTOOLS_RTF_REVISED "\\revised" -#define OOO_STRING_SVTOOLS_RTF_REVISIONS "\\revisions" -#define OOO_STRING_SVTOOLS_RTF_REVPROP "\\revprop" -#define OOO_STRING_SVTOOLS_RTF_REVTIM "\\revtim" -#define OOO_STRING_SVTOOLS_RTF_RI "\\ri" -#define OOO_STRING_SVTOOLS_RTF_RIN "\\rin" -#define OOO_STRING_SVTOOLS_RTF_ROW "\\row" -#define OOO_STRING_SVTOOLS_RTF_RQUOTE "\\rquote" -#define OOO_STRING_SVTOOLS_RTF_RTF "\\rtf" -#define OOO_STRING_SVTOOLS_RTF_RXE "\\rxe" -#define OOO_STRING_SVTOOLS_RTF_S "\\s" -#define OOO_STRING_SVTOOLS_RTF_SA "\\sa" -#define OOO_STRING_SVTOOLS_RTF_SB "\\sb" -#define OOO_STRING_SVTOOLS_RTF_SBASEDON "\\sbasedon" -#define OOO_STRING_SVTOOLS_RTF_SBKCOL "\\sbkcol" -#define OOO_STRING_SVTOOLS_RTF_SBKEVEN "\\sbkeven" -#define OOO_STRING_SVTOOLS_RTF_SBKNONE "\\sbknone" -#define OOO_STRING_SVTOOLS_RTF_SBKODD "\\sbkodd" -#define OOO_STRING_SVTOOLS_RTF_SBKPAGE "\\sbkpage" -#define OOO_STRING_SVTOOLS_RTF_SBYS "\\sbys" -#define OOO_STRING_SVTOOLS_RTF_SCAPS "\\scaps" -#define OOO_STRING_SVTOOLS_RTF_SECT "\\sect" -#define OOO_STRING_SVTOOLS_RTF_SECTD "\\sectd" -#define OOO_STRING_SVTOOLS_RTF_SHAD "\\shad" -#define OOO_STRING_SVTOOLS_RTF_SHADING "\\shading" -#define OOO_STRING_SVTOOLS_RTF_SHIFT "\\shift" -#define OOO_STRING_SVTOOLS_RTF_SL "\\sl" -#define OOO_STRING_SVTOOLS_RTF_SNEXT "\\snext" -#define OOO_STRING_SVTOOLS_RTF_STRIKE "\\strike" -#define OOO_STRING_SVTOOLS_RTF_STYLESHEET "\\stylesheet" -#define OOO_STRING_SVTOOLS_RTF_SUB "\\sub" -#define OOO_STRING_SVTOOLS_RTF_SUBJECT "\\subject" -#define OOO_STRING_SVTOOLS_RTF_SUPER "\\super" -#define OOO_STRING_SVTOOLS_RTF_TAB "\\tab" -#define OOO_STRING_SVTOOLS_RTF_TB "\\tb" -#define OOO_STRING_SVTOOLS_RTF_TC "\\tc" -#define OOO_STRING_SVTOOLS_RTF_TCF "\\tcf" -#define OOO_STRING_SVTOOLS_RTF_TCL "\\tcl" -#define OOO_STRING_SVTOOLS_RTF_TEMPLATE "\\template" -#define OOO_STRING_SVTOOLS_RTF_TITLE "\\title" -#define OOO_STRING_SVTOOLS_RTF_TITLEPG "\\titlepg" -#define OOO_STRING_SVTOOLS_RTF_TLDOT "\\tldot" -#define OOO_STRING_SVTOOLS_RTF_TLEQ "\\tleq" -#define OOO_STRING_SVTOOLS_RTF_TLHYPH "\\tlhyph" -#define OOO_STRING_SVTOOLS_RTF_TLTH "\\tlth" -#define OOO_STRING_SVTOOLS_RTF_TLUL "\\tlul" -#define OOO_STRING_SVTOOLS_RTF_TQC "\\tqc" -#define OOO_STRING_SVTOOLS_RTF_TQDEC "\\tqdec" -#define OOO_STRING_SVTOOLS_RTF_TQR "\\tqr" -#define OOO_STRING_SVTOOLS_RTF_TQL "\\tql" -#define OOO_STRING_SVTOOLS_RTF_TRGAPH "\\trgaph" -#define OOO_STRING_SVTOOLS_RTF_TRLEFT "\\trleft" -#define OOO_STRING_SVTOOLS_RTF_TROWD "\\trowd" -#define OOO_STRING_SVTOOLS_RTF_TRQC "\\trqc" -#define OOO_STRING_SVTOOLS_RTF_TRQL "\\trql" -#define OOO_STRING_SVTOOLS_RTF_TRQR "\\trqr" -#define OOO_STRING_SVTOOLS_RTF_TRRH "\\trrh" -#define OOO_STRING_SVTOOLS_RTF_TX "\\tx" -#define OOO_STRING_SVTOOLS_RTF_TXE "\\txe" -#define OOO_STRING_SVTOOLS_RTF_UL "\\ul" -#define OOO_STRING_SVTOOLS_RTF_ULD "\\uld" -#define OOO_STRING_SVTOOLS_RTF_ULDB "\\uldb" -#define OOO_STRING_SVTOOLS_RTF_ULNONE "\\ulnone" -#define OOO_STRING_SVTOOLS_RTF_ULW "\\ulw" -#define OOO_STRING_SVTOOLS_RTF_UP "\\up" -#define OOO_STRING_SVTOOLS_RTF_V "\\v" -#define OOO_STRING_SVTOOLS_RTF_VERN "\\vern" -#define OOO_STRING_SVTOOLS_RTF_VERSION "\\version" -#define OOO_STRING_SVTOOLS_RTF_VERTALB "\\vertalb" -#define OOO_STRING_SVTOOLS_RTF_VERTALC "\\vertalc" -#define OOO_STRING_SVTOOLS_RTF_VERTALJ "\\vertalj" -#define OOO_STRING_SVTOOLS_RTF_VERTALT "\\vertalt" -#define OOO_STRING_SVTOOLS_RTF_WBITMAP "\\wbitmap" -#define OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL "\\wbmbitspixel" -#define OOO_STRING_SVTOOLS_RTF_WBMPLANES "\\wbmplanes" -#define OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES "\\wbmwidthbytes" -#define OOO_STRING_SVTOOLS_RTF_WIDOWCTRL "\\widowctrl" -#define OOO_STRING_SVTOOLS_RTF_WMETAFILE "\\wmetafile" -#define OOO_STRING_SVTOOLS_RTF_XE "\\xe" -#define OOO_STRING_SVTOOLS_RTF_YR "\\yr" -#define OOO_STRING_SVTOOLS_RTF_NOBRKHYPH "\\_" -#define OOO_STRING_SVTOOLS_RTF_FORMULA "\\|" -#define OOO_STRING_SVTOOLS_RTF_NOBREAK "\\~" -#define OOO_STRING_SVTOOLS_RTF_AB "\\ab" -#define OOO_STRING_SVTOOLS_RTF_ACAPS "\\acaps" -#define OOO_STRING_SVTOOLS_RTF_ACF "\\acf" -#define OOO_STRING_SVTOOLS_RTF_ADDITIVE "\\additive" -#define OOO_STRING_SVTOOLS_RTF_ADN "\\adn" -#define OOO_STRING_SVTOOLS_RTF_AENDDOC "\\aenddoc" -#define OOO_STRING_SVTOOLS_RTF_AENDNOTES "\\aendnotes" -#define OOO_STRING_SVTOOLS_RTF_AEXPND "\\aexpnd" -#define OOO_STRING_SVTOOLS_RTF_AF "\\af" -#define OOO_STRING_SVTOOLS_RTF_AFS "\\afs" -#define OOO_STRING_SVTOOLS_RTF_AFTNBJ "\\aftnbj" -#define OOO_STRING_SVTOOLS_RTF_AFTNCN "\\aftncn" -#define OOO_STRING_SVTOOLS_RTF_AFTNNALC "\\aftnnalc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNAR "\\aftnnar" -#define OOO_STRING_SVTOOLS_RTF_AFTNNAUC "\\aftnnauc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCHI "\\aftnnchi" -#define OOO_STRING_SVTOOLS_RTF_AFTNNRLC "\\aftnnrlc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNRUC "\\aftnnruc" -#define OOO_STRING_SVTOOLS_RTF_AFTNRESTART "\\aftnrestart" -#define OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT "\\aftnrstcont" -#define OOO_STRING_SVTOOLS_RTF_AFTNSEP "\\aftnsep" -#define OOO_STRING_SVTOOLS_RTF_AFTNSEPC "\\aftnsepc" -#define OOO_STRING_SVTOOLS_RTF_AFTNSTART "\\aftnstart" -#define OOO_STRING_SVTOOLS_RTF_AFTNTJ "\\aftntj" -#define OOO_STRING_SVTOOLS_RTF_AI "\\ai" -#define OOO_STRING_SVTOOLS_RTF_ALANG "\\alang" -#define OOO_STRING_SVTOOLS_RTF_ALLPROT "\\allprot" -#define OOO_STRING_SVTOOLS_RTF_ANNOTPROT "\\annotprot" -#define OOO_STRING_SVTOOLS_RTF_AOUTL "\\aoutl" -#define OOO_STRING_SVTOOLS_RTF_ASCAPS "\\ascaps" -#define OOO_STRING_SVTOOLS_RTF_ASHAD "\\ashad" -#define OOO_STRING_SVTOOLS_RTF_ASTRIKE "\\astrike" -#define OOO_STRING_SVTOOLS_RTF_ATNAUTHOR "\\atnauthor" -#define OOO_STRING_SVTOOLS_RTF_ATNICN "\\atnicn" -#define OOO_STRING_SVTOOLS_RTF_ATNREF "\\atnref" -#define OOO_STRING_SVTOOLS_RTF_ATNTIME "\\atntime" -#define OOO_STRING_SVTOOLS_RTF_ATRFEND "\\atrfend" -#define OOO_STRING_SVTOOLS_RTF_ATRFSTART "\\atrfstart" -#define OOO_STRING_SVTOOLS_RTF_AUL "\\aul" -#define OOO_STRING_SVTOOLS_RTF_AULD "\\auld" -#define OOO_STRING_SVTOOLS_RTF_AULDB "\\auldb" -#define OOO_STRING_SVTOOLS_RTF_AULNONE "\\aulnone" -#define OOO_STRING_SVTOOLS_RTF_AULW "\\aulw" -#define OOO_STRING_SVTOOLS_RTF_AUP "\\aup" -#define OOO_STRING_SVTOOLS_RTF_BKMKPUB "\\bkmkpub" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASH "\\brdrdash" -#define OOO_STRING_SVTOOLS_RTF_BRKFRM "\\brkfrm" -#define OOO_STRING_SVTOOLS_RTF_CCHS "\\cchs" -#define OOO_STRING_SVTOOLS_RTF_CPG "\\cpg" -#define OOO_STRING_SVTOOLS_RTF_CS "\\cs" -#define OOO_STRING_SVTOOLS_RTF_CVMME "\\cvmme" -#define OOO_STRING_SVTOOLS_RTF_DATAFIELD "\\datafield" -#define OOO_STRING_SVTOOLS_RTF_DO "\\do" -#define OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN "\\dobxcolumn" -#define OOO_STRING_SVTOOLS_RTF_DOBXMARGIN "\\dobxmargin" -#define OOO_STRING_SVTOOLS_RTF_DOBXPAGE "\\dobxpage" -#define OOO_STRING_SVTOOLS_RTF_DOBYMARGIN "\\dobymargin" -#define OOO_STRING_SVTOOLS_RTF_DOBYPAGE "\\dobypage" -#define OOO_STRING_SVTOOLS_RTF_DOBYPARA "\\dobypara" -#define OOO_STRING_SVTOOLS_RTF_DODHGT "\\dodhgt" -#define OOO_STRING_SVTOOLS_RTF_DOLOCK "\\dolock" -#define OOO_STRING_SVTOOLS_RTF_DPAENDHOL "\\dpaendhol" -#define OOO_STRING_SVTOOLS_RTF_DPAENDL "\\dpaendl" -#define OOO_STRING_SVTOOLS_RTF_DPAENDSOL "\\dpaendsol" -#define OOO_STRING_SVTOOLS_RTF_DPAENDW "\\dpaendw" -#define OOO_STRING_SVTOOLS_RTF_DPARC "\\dparc" -#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPX "\\dparcflipx" -#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPY "\\dparcflipy" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTHOL "\\dpastarthol" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTL "\\dpastartl" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTSOL "\\dpastartsol" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTW "\\dpastartw" -#define OOO_STRING_SVTOOLS_RTF_DPCALLOUT "\\dpcallout" -#define OOO_STRING_SVTOOLS_RTF_DPCOA "\\dpcoa" -#define OOO_STRING_SVTOOLS_RTF_DPCOACCENT "\\dpcoaccent" -#define OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT "\\dpcobestfit" -#define OOO_STRING_SVTOOLS_RTF_DPCOBORDER "\\dpcoborder" -#define OOO_STRING_SVTOOLS_RTF_DPCODABS "\\dpcodabs" -#define OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM "\\dpcodbottom" -#define OOO_STRING_SVTOOLS_RTF_DPCODCENTER "\\dpcodcenter" -#define OOO_STRING_SVTOOLS_RTF_DPCODTOP "\\dpcodtop" -#define OOO_STRING_SVTOOLS_RTF_DPCOLENGTH "\\dpcolength" -#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSX "\\dpcominusx" -#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSY "\\dpcominusy" -#define OOO_STRING_SVTOOLS_RTF_DPCOOFFSET "\\dpcooffset" -#define OOO_STRING_SVTOOLS_RTF_DPCOSMARTA "\\dpcosmarta" -#define OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE "\\dpcotdouble" -#define OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT "\\dpcotright" -#define OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE "\\dpcotsingle" -#define OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE "\\dpcottriple" -#define OOO_STRING_SVTOOLS_RTF_DPCOUNT "\\dpcount" -#define OOO_STRING_SVTOOLS_RTF_DPELLIPSE "\\dpellipse" -#define OOO_STRING_SVTOOLS_RTF_DPENDGROUP "\\dpendgroup" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCB "\\dpfillbgcb" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCG "\\dpfillbgcg" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCR "\\dpfillbgcr" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY "\\dpfillbggray" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL "\\dpfillbgpal" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCB "\\dpfillfgcb" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCG "\\dpfillfgcg" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCR "\\dpfillfgcr" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY "\\dpfillfggray" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL "\\dpfillfgpal" -#define OOO_STRING_SVTOOLS_RTF_DPFILLPAT "\\dpfillpat" -#define OOO_STRING_SVTOOLS_RTF_DPGROUP "\\dpgroup" -#define OOO_STRING_SVTOOLS_RTF_DPLINE "\\dpline" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOB "\\dplinecob" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOG "\\dplinecog" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOR "\\dplinecor" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDADO "\\dplinedado" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDADODO "\\dplinedadodo" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDASH "\\dplinedash" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDOT "\\dplinedot" -#define OOO_STRING_SVTOOLS_RTF_DPLINEGRAY "\\dplinegray" -#define OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW "\\dplinehollow" -#define OOO_STRING_SVTOOLS_RTF_DPLINEPAL "\\dplinepal" -#define OOO_STRING_SVTOOLS_RTF_DPLINESOLID "\\dplinesolid" -#define OOO_STRING_SVTOOLS_RTF_DPLINEW "\\dplinew" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT "\\dppolycount" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYGON "\\dppolygon" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYLINE "\\dppolyline" -#define OOO_STRING_SVTOOLS_RTF_DPPTX "\\dpptx" -#define OOO_STRING_SVTOOLS_RTF_DPPTY "\\dppty" -#define OOO_STRING_SVTOOLS_RTF_DPRECT "\\dprect" -#define OOO_STRING_SVTOOLS_RTF_DPROUNDR "\\dproundr" -#define OOO_STRING_SVTOOLS_RTF_DPSHADOW "\\dpshadow" -#define OOO_STRING_SVTOOLS_RTF_DPSHADX "\\dpshadx" -#define OOO_STRING_SVTOOLS_RTF_DPSHADY "\\dpshady" -#define OOO_STRING_SVTOOLS_RTF_DPTXBX "\\dptxbx" -#define OOO_STRING_SVTOOLS_RTF_DPTXBXMAR "\\dptxbxmar" -#define OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT "\\dptxbxtext" -#define OOO_STRING_SVTOOLS_RTF_DPX "\\dpx" -#define OOO_STRING_SVTOOLS_RTF_DPXSIZE "\\dpxsize" -#define OOO_STRING_SVTOOLS_RTF_DPY "\\dpy" -#define OOO_STRING_SVTOOLS_RTF_DPYSIZE "\\dpysize" -#define OOO_STRING_SVTOOLS_RTF_DS "\\ds" -#define OOO_STRING_SVTOOLS_RTF_EMSPACE "\\emspace" -#define OOO_STRING_SVTOOLS_RTF_ENSPACE "\\enspace" -#define OOO_STRING_SVTOOLS_RTF_FBIDI "\\fbidi" -#define OOO_STRING_SVTOOLS_RTF_FET "\\fet" -#define OOO_STRING_SVTOOLS_RTF_FID "\\fid" -#define OOO_STRING_SVTOOLS_RTF_FILE "\\file" -#define OOO_STRING_SVTOOLS_RTF_FILETBL "\\filetbl" -#define OOO_STRING_SVTOOLS_RTF_FLDALT "\\fldalt" -#define OOO_STRING_SVTOOLS_RTF_FNETWORK "\\fnetwork" -#define OOO_STRING_SVTOOLS_RTF_FONTEMB "\\fontemb" -#define OOO_STRING_SVTOOLS_RTF_FONTFILE "\\fontfile" -#define OOO_STRING_SVTOOLS_RTF_FORMDISP "\\formdisp" -#define OOO_STRING_SVTOOLS_RTF_FORMPROT "\\formprot" -#define OOO_STRING_SVTOOLS_RTF_FORMSHADE "\\formshade" -#define OOO_STRING_SVTOOLS_RTF_FOSNUM "\\fosnum" -#define OOO_STRING_SVTOOLS_RTF_FRELATIVE "\\frelative" -#define OOO_STRING_SVTOOLS_RTF_FTNALT "\\ftnalt" -#define OOO_STRING_SVTOOLS_RTF_FTNIL "\\ftnil" -#define OOO_STRING_SVTOOLS_RTF_FTNNALC "\\ftnnalc" -#define OOO_STRING_SVTOOLS_RTF_FTNNAR "\\ftnnar" -#define OOO_STRING_SVTOOLS_RTF_FTNNAUC "\\ftnnauc" -#define OOO_STRING_SVTOOLS_RTF_FTNNCHI "\\ftnnchi" -#define OOO_STRING_SVTOOLS_RTF_FTNNRLC "\\ftnnrlc" -#define OOO_STRING_SVTOOLS_RTF_FTNNRUC "\\ftnnruc" -#define OOO_STRING_SVTOOLS_RTF_FTNRSTCONT "\\ftnrstcont" -#define OOO_STRING_SVTOOLS_RTF_FTNRSTPG "\\ftnrstpg" -#define OOO_STRING_SVTOOLS_RTF_FTTRUETYPE "\\fttruetype" -#define OOO_STRING_SVTOOLS_RTF_FVALIDDOS "\\fvaliddos" -#define OOO_STRING_SVTOOLS_RTF_FVALIDHPFS "\\fvalidhpfs" -#define OOO_STRING_SVTOOLS_RTF_FVALIDMAC "\\fvalidmac" -#define OOO_STRING_SVTOOLS_RTF_FVALIDNTFS "\\fvalidntfs" -#define OOO_STRING_SVTOOLS_RTF_HYPHAUTO "\\hyphauto" -#define OOO_STRING_SVTOOLS_RTF_HYPHCAPS "\\hyphcaps" -#define OOO_STRING_SVTOOLS_RTF_HYPHCONSEC "\\hyphconsec" -#define OOO_STRING_SVTOOLS_RTF_HYPHPAR "\\hyphpar" -#define OOO_STRING_SVTOOLS_RTF_LINKSELF "\\linkself" -#define OOO_STRING_SVTOOLS_RTF_LINKSTYLES "\\linkstyles" -#define OOO_STRING_SVTOOLS_RTF_LTRCH "\\ltrch" -#define OOO_STRING_SVTOOLS_RTF_LTRDOC "\\ltrdoc" -#define OOO_STRING_SVTOOLS_RTF_LTRMARK "\\ltrmark" -#define OOO_STRING_SVTOOLS_RTF_LTRPAR "\\ltrpar" -#define OOO_STRING_SVTOOLS_RTF_LTRROW "\\ltrrow" -#define OOO_STRING_SVTOOLS_RTF_LTRSECT "\\ltrsect" -#define OOO_STRING_SVTOOLS_RTF_NOCOLBAL "\\nocolbal" -#define OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL "\\noextrasprl" -#define OOO_STRING_SVTOOLS_RTF_NOTABIND "\\notabind" -#define OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR "\\nowidctlpar" -#define OOO_STRING_SVTOOLS_RTF_OBJALIAS "\\objalias" -#define OOO_STRING_SVTOOLS_RTF_OBJALIGN "\\objalign" -#define OOO_STRING_SVTOOLS_RTF_OBJAUTLINK "\\objautlink" -#define OOO_STRING_SVTOOLS_RTF_OBJCLASS "\\objclass" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPB "\\objcropb" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPL "\\objcropl" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPR "\\objcropr" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPT "\\objcropt" -#define OOO_STRING_SVTOOLS_RTF_OBJDATA "\\objdata" -#define OOO_STRING_SVTOOLS_RTF_OBJECT "\\object" -#define OOO_STRING_SVTOOLS_RTF_OBJEMB "\\objemb" -#define OOO_STRING_SVTOOLS_RTF_OBJH "\\objh" -#define OOO_STRING_SVTOOLS_RTF_OBJICEMB "\\objicemb" -#define OOO_STRING_SVTOOLS_RTF_OBJLINK "\\objlink" -#define OOO_STRING_SVTOOLS_RTF_OBJLOCK "\\objlock" -#define OOO_STRING_SVTOOLS_RTF_OBJNAME "\\objname" -#define OOO_STRING_SVTOOLS_RTF_OBJPUB "\\objpub" -#define OOO_STRING_SVTOOLS_RTF_OBJSCALEX "\\objscalex" -#define OOO_STRING_SVTOOLS_RTF_OBJSCALEY "\\objscaley" -#define OOO_STRING_SVTOOLS_RTF_OBJSECT "\\objsect" -#define OOO_STRING_SVTOOLS_RTF_OBJSETSIZE "\\objsetsize" -#define OOO_STRING_SVTOOLS_RTF_OBJSUB "\\objsub" -#define OOO_STRING_SVTOOLS_RTF_OBJTIME "\\objtime" -#define OOO_STRING_SVTOOLS_RTF_OBJTRANSY "\\objtransy" -#define OOO_STRING_SVTOOLS_RTF_OBJUPDATE "\\objupdate" -#define OOO_STRING_SVTOOLS_RTF_OBJW "\\objw" -#define OOO_STRING_SVTOOLS_RTF_OTBLRUL "\\otblrul" -#define OOO_STRING_SVTOOLS_RTF_PGNHN "\\pgnhn" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSC "\\pgnhnsc" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSH "\\pgnhnsh" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSM "\\pgnhnsm" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSN "\\pgnhnsn" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSP "\\pgnhnsp" -#define OOO_STRING_SVTOOLS_RTF_PICBMP "\\picbmp" -#define OOO_STRING_SVTOOLS_RTF_PICBPP "\\picbpp" -#define OOO_STRING_SVTOOLS_RTF_PN "\\pn" -#define OOO_STRING_SVTOOLS_RTF_PNACROSS "\\pnacross" -#define OOO_STRING_SVTOOLS_RTF_PNB "\\pnb" -#define OOO_STRING_SVTOOLS_RTF_PNCAPS "\\pncaps" -#define OOO_STRING_SVTOOLS_RTF_PNCARD "\\pncard" -#define OOO_STRING_SVTOOLS_RTF_PNCF "\\pncf" -#define OOO_STRING_SVTOOLS_RTF_PNDEC "\\pndec" -#define OOO_STRING_SVTOOLS_RTF_PNF "\\pnf" -#define OOO_STRING_SVTOOLS_RTF_PNFS "\\pnfs" -#define OOO_STRING_SVTOOLS_RTF_PNHANG "\\pnhang" -#define OOO_STRING_SVTOOLS_RTF_PNI "\\pni" -#define OOO_STRING_SVTOOLS_RTF_PNINDENT "\\pnindent" -#define OOO_STRING_SVTOOLS_RTF_PNLCLTR "\\pnlcltr" -#define OOO_STRING_SVTOOLS_RTF_PNLCRM "\\pnlcrm" -#define OOO_STRING_SVTOOLS_RTF_PNLVL "\\pnlvl" -#define OOO_STRING_SVTOOLS_RTF_PNLVLBLT "\\pnlvlblt" -#define OOO_STRING_SVTOOLS_RTF_PNLVLBODY "\\pnlvlbody" -#define OOO_STRING_SVTOOLS_RTF_PNLVLCONT "\\pnlvlcont" -#define OOO_STRING_SVTOOLS_RTF_PNNUMONCE "\\pnnumonce" -#define OOO_STRING_SVTOOLS_RTF_PNORD "\\pnord" -#define OOO_STRING_SVTOOLS_RTF_PNORDT "\\pnordt" -#define OOO_STRING_SVTOOLS_RTF_PNPREV "\\pnprev" -#define OOO_STRING_SVTOOLS_RTF_PNQC "\\pnqc" -#define OOO_STRING_SVTOOLS_RTF_PNQL "\\pnql" -#define OOO_STRING_SVTOOLS_RTF_PNQR "\\pnqr" -#define OOO_STRING_SVTOOLS_RTF_PNRESTART "\\pnrestart" -#define OOO_STRING_SVTOOLS_RTF_PNSCAPS "\\pnscaps" -#define OOO_STRING_SVTOOLS_RTF_PNSECLVL "\\pnseclvl" -#define OOO_STRING_SVTOOLS_RTF_PNSP "\\pnsp" -#define OOO_STRING_SVTOOLS_RTF_PNSTART "\\pnstart" -#define OOO_STRING_SVTOOLS_RTF_PNSTRIKE "\\pnstrike" -#define OOO_STRING_SVTOOLS_RTF_PNTEXT "\\pntext" -#define OOO_STRING_SVTOOLS_RTF_PNTXTA "\\pntxta" -#define OOO_STRING_SVTOOLS_RTF_PNTXTB "\\pntxtb" -#define OOO_STRING_SVTOOLS_RTF_PNUCLTR "\\pnucltr" -#define OOO_STRING_SVTOOLS_RTF_PNUCRM "\\pnucrm" -#define OOO_STRING_SVTOOLS_RTF_PNUL "\\pnul" -#define OOO_STRING_SVTOOLS_RTF_PNULD "\\pnuld" -#define OOO_STRING_SVTOOLS_RTF_PNULDB "\\pnuldb" -#define OOO_STRING_SVTOOLS_RTF_PNULNONE "\\pnulnone" -#define OOO_STRING_SVTOOLS_RTF_PNULW "\\pnulw" -#define OOO_STRING_SVTOOLS_RTF_PRCOLBL "\\prcolbl" -#define OOO_STRING_SVTOOLS_RTF_PRINTDATA "\\printdata" -#define OOO_STRING_SVTOOLS_RTF_PSZ "\\psz" -#define OOO_STRING_SVTOOLS_RTF_PUBAUTO "\\pubauto" -#define OOO_STRING_SVTOOLS_RTF_RESULT "\\result" -#define OOO_STRING_SVTOOLS_RTF_REVAUTH "\\revauth" -#define OOO_STRING_SVTOOLS_RTF_REVDTTM "\\revdttm" -#define OOO_STRING_SVTOOLS_RTF_REVPROT "\\revprot" -#define OOO_STRING_SVTOOLS_RTF_REVTBL "\\revtbl" -#define OOO_STRING_SVTOOLS_RTF_RSLTBMP "\\rsltbmp" -#define OOO_STRING_SVTOOLS_RTF_RSLTMERGE "\\rsltmerge" -#define OOO_STRING_SVTOOLS_RTF_RSLTPICT "\\rsltpict" -#define OOO_STRING_SVTOOLS_RTF_RSLTRTF "\\rsltrtf" -#define OOO_STRING_SVTOOLS_RTF_RSLTTXT "\\rslttxt" -#define OOO_STRING_SVTOOLS_RTF_RTLCH "\\rtlch" -#define OOO_STRING_SVTOOLS_RTF_RTLDOC "\\rtldoc" -#define OOO_STRING_SVTOOLS_RTF_RTLMARK "\\rtlmark" -#define OOO_STRING_SVTOOLS_RTF_RTLPAR "\\rtlpar" -#define OOO_STRING_SVTOOLS_RTF_RTLROW "\\rtlrow" -#define OOO_STRING_SVTOOLS_RTF_RTLSECT "\\rtlsect" -#define OOO_STRING_SVTOOLS_RTF_SEC "\\sec" -#define OOO_STRING_SVTOOLS_RTF_SECTNUM "\\sectnum" -#define OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED "\\sectunlocked" -#define OOO_STRING_SVTOOLS_RTF_SLMULT "\\slmult" -#define OOO_STRING_SVTOOLS_RTF_SOFTCOL "\\softcol" -#define OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT "\\softlheight" -#define OOO_STRING_SVTOOLS_RTF_SOFTLINE "\\softline" -#define OOO_STRING_SVTOOLS_RTF_SOFTPAGE "\\softpage" -#define OOO_STRING_SVTOOLS_RTF_SPRSSPBF "\\sprsspbf" -#define OOO_STRING_SVTOOLS_RTF_SPRSTSP "\\sprstsp" -#define OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT "\\subdocument" -#define OOO_STRING_SVTOOLS_RTF_SWPBDR "\\swpbdr" -#define OOO_STRING_SVTOOLS_RTF_TCN "\\tcn" -#define OOO_STRING_SVTOOLS_RTF_TRANSMF "\\transmf" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRB "\\trbrdrb" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRH "\\trbrdrh" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRL "\\trbrdrl" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRR "\\trbrdrr" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRT "\\trbrdrt" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRV "\\trbrdrv" -#define OOO_STRING_SVTOOLS_RTF_TRHDR "\\trhdr" -#define OOO_STRING_SVTOOLS_RTF_TRKEEP "\\trkeep" -#define OOO_STRING_SVTOOLS_RTF_TRPADDB "\\trpaddb" -#define OOO_STRING_SVTOOLS_RTF_TRPADDL "\\trpaddl" -#define OOO_STRING_SVTOOLS_RTF_TRPADDR "\\trpaddr" -#define OOO_STRING_SVTOOLS_RTF_TRPADDT "\\trpaddt" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFB "\\trpaddfb" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFL "\\trpaddfl" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFR "\\trpaddfr" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFT "\\trpaddft" -#define OOO_STRING_SVTOOLS_RTF_WRAPTRSP "\\wraptrsp" -#define OOO_STRING_SVTOOLS_RTF_XEF "\\xef" -#define OOO_STRING_SVTOOLS_RTF_ZWJ "\\zwj" -#define OOO_STRING_SVTOOLS_RTF_ZWNJ "\\zwnj" - -// neue Tokens zur 1.5 -#define OOO_STRING_SVTOOLS_RTF_ABSLOCK "\\abslock" -#define OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT "\\adjustright" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG "\\aftnnchosung" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCNUM "\\aftnncnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBAR "\\aftnndbar" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM "\\aftnndbnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD "\\aftnndbnumd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK "\\aftnndbnumk" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT "\\aftnndbnumt" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGANADA "\\aftnnganada" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM "\\aftnngbnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD "\\aftnngbnumd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK "\\aftnngbnumk" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML "\\aftnngbnuml" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC "\\aftnnzodiac" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD "\\aftnnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL "\\aftnnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_ANIMTEXT "\\animtext" -#define OOO_STRING_SVTOOLS_RTF_ANSICPG "\\ansicpg" -#define OOO_STRING_SVTOOLS_RTF_BACKGROUND "\\background" -#define OOO_STRING_SVTOOLS_RTF_BDBFHDR "\\bdbfhdr" -#define OOO_STRING_SVTOOLS_RTF_BLIPTAG "\\bliptag" -#define OOO_STRING_SVTOOLS_RTF_BLIPUID "\\blipuid" -#define OOO_STRING_SVTOOLS_RTF_BLIPUPI "\\blipupi" -#define OOO_STRING_SVTOOLS_RTF_BRDRART "\\brdrart" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHD "\\brdrdashd" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDD "\\brdrdashdd" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR "\\brdrdashdotstr" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm" -#define OOO_STRING_SVTOOLS_RTF_BRDREMBOSS "\\brdremboss" -#define OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE "\\brdrengrave" -#define OOO_STRING_SVTOOLS_RTF_BRDRFRAME "\\brdrframe" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG "\\brdrthtnlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG "\\brdrthtnmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG "\\brdrthtnsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG "\\brdrtnthlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG "\\brdrtnthmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG "\\brdrtnthsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG "\\brdrtnthtnlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG "\\brdrtnthtnmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG "\\brdrtnthtnsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE "\\brdrtriple" -#define OOO_STRING_SVTOOLS_RTF_BRDRWAVY "\\brdrwavy" -#define OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB "\\brdrwavydb" -#define OOO_STRING_SVTOOLS_RTF_CATEGORY "\\category" -#define OOO_STRING_SVTOOLS_RTF_CGRID "\\cgrid" -#define OOO_STRING_SVTOOLS_RTF_CHARSCALEX "\\charscalex" -#define OOO_STRING_SVTOOLS_RTF_CHBGBDIAG "\\chbgbdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGCROSS "\\chbgcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDCROSS "\\chbgdcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG "\\chbgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS "\\chbgdkcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS "\\chbgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG "\\chbgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ "\\chbgdkhoriz" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKVERT "\\chbgdkvert" -#define OOO_STRING_SVTOOLS_RTF_CHBGFDIAG "\\chbgfdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGHORIZ "\\chbghoriz" -#define OOO_STRING_SVTOOLS_RTF_CHBGVERT "\\chbgvert" -#define OOO_STRING_SVTOOLS_RTF_CHBRDR "\\chbrdr" -#define OOO_STRING_SVTOOLS_RTF_CHCBPAT "\\chcbpat" -#define OOO_STRING_SVTOOLS_RTF_CHCFPAT "\\chcfpat" -#define OOO_STRING_SVTOOLS_RTF_CHSHDNG "\\chshdng" -#define OOO_STRING_SVTOOLS_RTF_CLPADL "\\clpadl" -#define OOO_STRING_SVTOOLS_RTF_CLPADT "\\clpadt" -#define OOO_STRING_SVTOOLS_RTF_CLPADB "\\clpadb" -#define OOO_STRING_SVTOOLS_RTF_CLPADR "\\clpadr" -#define OOO_STRING_SVTOOLS_RTF_CLPADFL "\\clpadfl" -#define OOO_STRING_SVTOOLS_RTF_CLPADFT "\\clpadft" -#define OOO_STRING_SVTOOLS_RTF_CLPADFB "\\clpadfb" -#define OOO_STRING_SVTOOLS_RTF_CLPADFR "\\clpadfr" -#define OOO_STRING_SVTOOLS_RTF_CLTXLRTB "\\cltxlrtb" -#define OOO_STRING_SVTOOLS_RTF_CLTXTBRL "\\cltxtbrl" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALB "\\clvertalb" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALC "\\clvertalc" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALT "\\clvertalt" -#define OOO_STRING_SVTOOLS_RTF_CLVMGF "\\clvmgf" -#define OOO_STRING_SVTOOLS_RTF_CLVMRG "\\clvmrg" -#define OOO_STRING_SVTOOLS_RTF_CLTXTBRLV "\\cltxtbrlv" -#define OOO_STRING_SVTOOLS_RTF_CLTXBTLR "\\cltxbtlr" -#define OOO_STRING_SVTOOLS_RTF_CLTXLRTBV "\\cltxlrtbv" -#define OOO_STRING_SVTOOLS_RTF_COMPANY "\\company" -#define OOO_STRING_SVTOOLS_RTF_CRAUTH "\\crauth" -#define OOO_STRING_SVTOOLS_RTF_CRDATE "\\crdate" -#define OOO_STRING_SVTOOLS_RTF_DATE "\\date" -#define OOO_STRING_SVTOOLS_RTF_DEFLANGFE "\\deflangfe" -#define OOO_STRING_SVTOOLS_RTF_DFRAUTH "\\dfrauth" -#define OOO_STRING_SVTOOLS_RTF_DFRDATE "\\dfrdate" -#define OOO_STRING_SVTOOLS_RTF_DFRSTART "\\dfrstart" -#define OOO_STRING_SVTOOLS_RTF_DFRSTOP "\\dfrstop" -#define OOO_STRING_SVTOOLS_RTF_DFRXST "\\dfrxst" -#define OOO_STRING_SVTOOLS_RTF_DGMARGIN "\\dgmargin" -#define OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB "\\dntblnsbdb" -#define OOO_STRING_SVTOOLS_RTF_DOCTYPE "\\doctype" -#define OOO_STRING_SVTOOLS_RTF_DOCVAR "\\docvar" -#define OOO_STRING_SVTOOLS_RTF_DPCODESCENT "\\dpcodescent" -#define OOO_STRING_SVTOOLS_RTF_EMBO "\\embo" -#define OOO_STRING_SVTOOLS_RTF_EMFBLIP "\\emfblip" -#define OOO_STRING_SVTOOLS_RTF_EXPSHRTN "\\expshrtn" -#define OOO_STRING_SVTOOLS_RTF_FAAUTO "\\faauto" -#define OOO_STRING_SVTOOLS_RTF_FBIAS "\\fbias" -#define OOO_STRING_SVTOOLS_RTF_FFDEFRES "\\ffdefres" -#define OOO_STRING_SVTOOLS_RTF_FFDEFTEXT "\\ffdeftext" -#define OOO_STRING_SVTOOLS_RTF_FFENTRYMCR "\\ffentrymcr" -#define OOO_STRING_SVTOOLS_RTF_FFEXITMCR "\\ffexitmcr" -#define OOO_STRING_SVTOOLS_RTF_FFFORMAT "\\ffformat" -#define OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX "\\ffhaslistbox" -#define OOO_STRING_SVTOOLS_RTF_FFHELPTEXT "\\ffhelptext" -#define OOO_STRING_SVTOOLS_RTF_FFHPS "\\ffhps" -#define OOO_STRING_SVTOOLS_RTF_FFL "\\ffl" -#define OOO_STRING_SVTOOLS_RTF_FFMAXLEN "\\ffmaxlen" -#define OOO_STRING_SVTOOLS_RTF_FFNAME "\\ffname" -#define OOO_STRING_SVTOOLS_RTF_FFOWNHELP "\\ffownhelp" -#define OOO_STRING_SVTOOLS_RTF_FFOWNSTAT "\\ffownstat" -#define OOO_STRING_SVTOOLS_RTF_FFPROT "\\ffprot" -#define OOO_STRING_SVTOOLS_RTF_FFRECALC "\\ffrecalc" -#define OOO_STRING_SVTOOLS_RTF_FFRES "\\ffres" -#define OOO_STRING_SVTOOLS_RTF_FFSIZE "\\ffsize" -#define OOO_STRING_SVTOOLS_RTF_FFSTATTEXT "\\ffstattext" -#define OOO_STRING_SVTOOLS_RTF_FFTYPE "\\fftype" -#define OOO_STRING_SVTOOLS_RTF_FFTYPETXT "\\fftypetxt" -#define OOO_STRING_SVTOOLS_RTF_FLDTYPE "\\fldtype" -#define OOO_STRING_SVTOOLS_RTF_FNAME "\\fname" -#define OOO_STRING_SVTOOLS_RTF_FORMFIELD "\\formfield" -#define OOO_STRING_SVTOOLS_RTF_FROMTEXT "\\fromtext" -#define OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG "\\ftnnchosung" -#define OOO_STRING_SVTOOLS_RTF_FTNNCNUM "\\ftnncnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBAR "\\ftnndbar" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUM "\\ftnndbnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD "\\ftnndbnumd" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK "\\ftnndbnumk" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT "\\ftnndbnumt" -#define OOO_STRING_SVTOOLS_RTF_FTNNGANADA "\\ftnnganada" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUM "\\ftnngbnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD "\\ftnngbnumd" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK "\\ftnngbnumk" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUML "\\ftnngbnuml" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIAC "\\ftnnzodiac" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACD "\\ftnnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACL "\\ftnnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_G "\\g" -#define OOO_STRING_SVTOOLS_RTF_GCW "\\gcw" -#define OOO_STRING_SVTOOLS_RTF_GRIDTBL "\\gridtbl" -#define OOO_STRING_SVTOOLS_RTF_HIGHLIGHT "\\highlight" -#define OOO_STRING_SVTOOLS_RTF_HLFR "\\hlfr" -#define OOO_STRING_SVTOOLS_RTF_HLINKBASE "\\hlinkbase" -#define OOO_STRING_SVTOOLS_RTF_HLLOC "\\hlloc" -#define OOO_STRING_SVTOOLS_RTF_HLSRC "\\hlsrc" -#define OOO_STRING_SVTOOLS_RTF_ILVL "\\ilvl" -#define OOO_STRING_SVTOOLS_RTF_IMPR "\\impr" -#define OOO_STRING_SVTOOLS_RTF_JPEGBLIP "\\jpegblip" -#define OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW "\\levelfollow" -#define OOO_STRING_SVTOOLS_RTF_LEVELINDENT "\\levelindent" -#define OOO_STRING_SVTOOLS_RTF_LEVELJC "\\leveljc" -#define OOO_STRING_SVTOOLS_RTF_LEVELLEGAL "\\levellegal" -#define OOO_STRING_SVTOOLS_RTF_LEVELNFC "\\levelnfc" -#define OOO_STRING_SVTOOLS_RTF_LEVELNORESTART "\\levelnorestart" -#define OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS "\\levelnumbers" -#define OOO_STRING_SVTOOLS_RTF_LEVELOLD "\\levelold" -#define OOO_STRING_SVTOOLS_RTF_LEVELPREV "\\levelprev" -#define OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE "\\levelprevspace" -#define OOO_STRING_SVTOOLS_RTF_LEVELSPACE "\\levelspace" -#define OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT "\\levelstartat" -#define OOO_STRING_SVTOOLS_RTF_LEVELTEXT "\\leveltext" -#define OOO_STRING_SVTOOLS_RTF_LINKVAL "\\linkval" -#define OOO_STRING_SVTOOLS_RTF_LIST "\\list" -#define OOO_STRING_SVTOOLS_RTF_LISTID "\\listid" -#define OOO_STRING_SVTOOLS_RTF_LISTLEVEL "\\listlevel" -#define OOO_STRING_SVTOOLS_RTF_LISTNAME "\\listname" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE "\\listoverride" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT "\\listoverridecount" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT "\\listoverrideformat" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART "\\listoverridestart" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE "\\listoverridetable" -#define OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN "\\listrestarthdn" -#define OOO_STRING_SVTOOLS_RTF_LISTSIMPLE "\\listsimple" -#define OOO_STRING_SVTOOLS_RTF_LISTTABLE "\\listtable" -#define OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID "\\listtemplateid" -#define OOO_STRING_SVTOOLS_RTF_LISTTEXT "\\listtext" -#define OOO_STRING_SVTOOLS_RTF_LS "\\ls" -#define OOO_STRING_SVTOOLS_RTF_LYTEXCTTP "\\lytexcttp" -#define OOO_STRING_SVTOOLS_RTF_LYTPRTMET "\\lytprtmet" -#define OOO_STRING_SVTOOLS_RTF_MANAGER "\\manager" -#define OOO_STRING_SVTOOLS_RTF_MSMCAP "\\msmcap" -#define OOO_STRING_SVTOOLS_RTF_NOFCHARSWS "\\nofcharsws" -#define OOO_STRING_SVTOOLS_RTF_NOLEAD "\\nolead" -#define OOO_STRING_SVTOOLS_RTF_NONSHPPICT "\\nonshppict" -#define OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND "\\nosectexpand" -#define OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID "\\nosnaplinegrid" -#define OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL "\\nospaceforul" -#define OOO_STRING_SVTOOLS_RTF_NOULTRLSPC "\\noultrlspc" -#define OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN "\\noxlattoyen" -#define OOO_STRING_SVTOOLS_RTF_OBJATTPH "\\objattph" -#define OOO_STRING_SVTOOLS_RTF_OBJHTML "\\objhtml" -#define OOO_STRING_SVTOOLS_RTF_OBJOCX "\\objocx" -#define OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP "\\oldlinewrap" -#define OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL "\\outlinelevel" -#define OOO_STRING_SVTOOLS_RTF_OVERLAY "\\overlay" -#define OOO_STRING_SVTOOLS_RTF_PANOSE "\\panose" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRB "\\pgbrdrb" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT "\\pgbrdrfoot" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD "\\pgbrdrhead" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRL "\\pgbrdrl" -#define OOO_STRING_SVTOOLS_RTF_PGBRDROPT "\\pgbrdropt" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRR "\\pgbrdrr" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP "\\pgbrdrsnap" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRT "\\pgbrdrt" -#define OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG "\\pgnchosung" -#define OOO_STRING_SVTOOLS_RTF_PGNCNUM "\\pgncnum" -#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMK "\\pgndbnumk" -#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMT "\\pgndbnumt" -#define OOO_STRING_SVTOOLS_RTF_PGNGANADA "\\pgnganada" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUM "\\pgngbnum" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMD "\\pgngbnumd" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMK "\\pgngbnumk" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUML "\\pgngbnuml" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIAC "\\pgnzodiac" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIACD "\\pgnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIACL "\\pgnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_PICPROP "\\picprop" -#define OOO_STRING_SVTOOLS_RTF_PNAIUEO "\\pnaiueo" -#define OOO_STRING_SVTOOLS_RTF_PNAIUEOD "\\pnaiueod" -#define OOO_STRING_SVTOOLS_RTF_PNCHOSUNG "\\pnchosung" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMD "\\pndbnumd" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMK "\\pndbnumk" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUML "\\pndbnuml" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMT "\\pndbnumt" -#define OOO_STRING_SVTOOLS_RTF_PNGANADA "\\pnganada" -#define OOO_STRING_SVTOOLS_RTF_PNGBLIP "\\pngblip" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUM "\\pngbnum" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUMD "\\pngbnumd" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUMK "\\pngbnumk" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUML "\\pngbnuml" -#define OOO_STRING_SVTOOLS_RTF_PNRAUTH "\\pnrauth" -#define OOO_STRING_SVTOOLS_RTF_PNRDATE "\\pnrdate" -#define OOO_STRING_SVTOOLS_RTF_PNRNFC "\\pnrnfc" -#define OOO_STRING_SVTOOLS_RTF_PNRNOT "\\pnrnot" -#define OOO_STRING_SVTOOLS_RTF_PNRPNBR "\\pnrpnbr" -#define OOO_STRING_SVTOOLS_RTF_PNRRGB "\\pnrrgb" -#define OOO_STRING_SVTOOLS_RTF_PNRSTART "\\pnrstart" -#define OOO_STRING_SVTOOLS_RTF_PNRSTOP "\\pnrstop" -#define OOO_STRING_SVTOOLS_RTF_PNRXST "\\pnrxst" -#define OOO_STRING_SVTOOLS_RTF_PNZODIAC "\\pnzodiac" -#define OOO_STRING_SVTOOLS_RTF_PNZODIACD "\\pnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_PNZODIACL "\\pnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_LFOLEVEL "\\lfolevel" -#define OOO_STRING_SVTOOLS_RTF_POSYIN "\\posyin" -#define OOO_STRING_SVTOOLS_RTF_POSYOUT "\\posyout" -#define OOO_STRING_SVTOOLS_RTF_PRIVATE "\\private" -#define OOO_STRING_SVTOOLS_RTF_PROPNAME "\\propname" -#define OOO_STRING_SVTOOLS_RTF_PROPTYPE "\\proptype" -#define OOO_STRING_SVTOOLS_RTF_REVAUTHDEL "\\revauthdel" -#define OOO_STRING_SVTOOLS_RTF_REVDTTMDEL "\\revdttmdel" -#define OOO_STRING_SVTOOLS_RTF_SAUTOUPD "\\sautoupd" -#define OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL "\\sectdefaultcl" -#define OOO_STRING_SVTOOLS_RTF_SECTEXPAND "\\sectexpand" -#define OOO_STRING_SVTOOLS_RTF_SECTLINEGRID "\\sectlinegrid" -#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL "\\sectspecifycl" -#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL "\\sectspecifyl" -#define OOO_STRING_SVTOOLS_RTF_SHIDDEN "\\shidden" -#define OOO_STRING_SVTOOLS_RTF_SHPBOTTOM "\\shpbottom" -#define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" -#define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" -#define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" -#define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" -#define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" -#define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" -#define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" -#define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" -#define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" -#define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" -#define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" -#define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" -#define OOO_STRING_SVTOOLS_RTF_SHPPICT "\\shppict" -#define OOO_STRING_SVTOOLS_RTF_SHPRIGHT "\\shpright" -#define OOO_STRING_SVTOOLS_RTF_SHPRSLT "\\shprslt" -#define OOO_STRING_SVTOOLS_RTF_SHPTOP "\\shptop" -#define OOO_STRING_SVTOOLS_RTF_SHPTXT "\\shptxt" -#define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" -#define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" -#define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" -#define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" -#define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" -#define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" -#define OOO_STRING_SVTOOLS_RTF_STATICVAL "\\staticval" -#define OOO_STRING_SVTOOLS_RTF_STEXTFLOW "\\stextflow" -#define OOO_STRING_SVTOOLS_RTF_STRIKED "\\striked" -#define OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE "\\subfontbysize" -#define OOO_STRING_SVTOOLS_RTF_TCELLD "\\tcelld" -#define OOO_STRING_SVTOOLS_RTF_TIME "\\time" -#define OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT "\\truncatefontheight" -#define OOO_STRING_SVTOOLS_RTF_UC "\\uc" -#define OOO_STRING_SVTOOLS_RTF_UD "\\ud" -#define OOO_STRING_SVTOOLS_RTF_ULDASH "\\uldash" -#define OOO_STRING_SVTOOLS_RTF_ULDASHD "\\uldashd" -#define OOO_STRING_SVTOOLS_RTF_ULDASHDD "\\uldashdd" -#define OOO_STRING_SVTOOLS_RTF_ULTH "\\ulth" -#define OOO_STRING_SVTOOLS_RTF_ULWAVE "\\ulwave" -#define OOO_STRING_SVTOOLS_RTF_ULC "\\ulc" -#define OOO_STRING_SVTOOLS_RTF_U "\\u" -#define OOO_STRING_SVTOOLS_RTF_UPR "\\upr" -#define OOO_STRING_SVTOOLS_RTF_USERPROPS "\\userprops" -#define OOO_STRING_SVTOOLS_RTF_VIEWKIND "\\viewkind" -#define OOO_STRING_SVTOOLS_RTF_VIEWSCALE "\\viewscale" -#define OOO_STRING_SVTOOLS_RTF_VIEWZK "\\viewzk" -#define OOO_STRING_SVTOOLS_RTF_WIDCTLPAR "\\widctlpar" -#define OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION "\\windowcaption" -#define OOO_STRING_SVTOOLS_RTF_WPEQN "\\wpeqn" -#define OOO_STRING_SVTOOLS_RTF_WPJST "\\wpjst" -#define OOO_STRING_SVTOOLS_RTF_WPSP "\\wpsp" -#define OOO_STRING_SVTOOLS_RTF_YXE "\\yxe" -#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTB "\\frmtxlrtb" -#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRL "\\frmtxtbrl" -#define OOO_STRING_SVTOOLS_RTF_FRMTXBTLR "\\frmtxbtlr" -#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV "\\frmtxlrtbv" -#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV "\\frmtxtbrlv" - -// MS-2000 Tokens -#define OOO_STRING_SVTOOLS_RTF_ULTHD "\\ulthd" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASH "\\ulthdash" -#define OOO_STRING_SVTOOLS_RTF_ULLDASH "\\ulldash" -#define OOO_STRING_SVTOOLS_RTF_ULTHLDASH "\\ulthldash" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASHD "\\ulthdashd" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASHDD "\\ulthdashdd" -#define OOO_STRING_SVTOOLS_RTF_ULHWAVE "\\ulhwave" -#define OOO_STRING_SVTOOLS_RTF_ULULDBWAVE "\\ululdbwave" -#define OOO_STRING_SVTOOLS_RTF_LOCH "\\loch" -#define OOO_STRING_SVTOOLS_RTF_HICH "\\hich" -#define OOO_STRING_SVTOOLS_RTF_DBCH "\\dbch" -#define OOO_STRING_SVTOOLS_RTF_LANGFE "\\langfe" -#define OOO_STRING_SVTOOLS_RTF_ADEFLANG "\\adeflang" -#define OOO_STRING_SVTOOLS_RTF_ADEFF "\\adeff" -#define OOO_STRING_SVTOOLS_RTF_ACCNONE "\\accnone" -#define OOO_STRING_SVTOOLS_RTF_ACCDOT "\\accdot" -#define OOO_STRING_SVTOOLS_RTF_ACCCOMMA "\\acccomma" -#define OOO_STRING_SVTOOLS_RTF_TWOINONE "\\twoinone" -#define OOO_STRING_SVTOOLS_RTF_HORZVERT "\\horzvert" -#define OOO_STRING_SVTOOLS_RTF_FAHANG "\\fahang" -#define OOO_STRING_SVTOOLS_RTF_FAVAR "\\favar" -#define OOO_STRING_SVTOOLS_RTF_FACENTER "\\facenter" -#define OOO_STRING_SVTOOLS_RTF_FAROMAN "\\faroman" -#define OOO_STRING_SVTOOLS_RTF_FAFIXED "\\fafixed" -#define OOO_STRING_SVTOOLS_RTF_NOCWRAP "\\nocwrap" -#define OOO_STRING_SVTOOLS_RTF_NOOVERFLOW "\\nooverflow" -#define OOO_STRING_SVTOOLS_RTF_ASPALPHA "\\aspalpha" - -// SWG spezifische Attribute -#define OOO_STRING_SVTOOLS_RTF_GRFALIGNV "\\grfalignv" -#define OOO_STRING_SVTOOLS_RTF_GRFALIGNH "\\grfalignh" -#define OOO_STRING_SVTOOLS_RTF_GRFMIRROR "\\grfmirror" -#define OOO_STRING_SVTOOLS_RTF_HEADERYB "\\headeryb" -#define OOO_STRING_SVTOOLS_RTF_HEADERXL "\\headerxl" -#define OOO_STRING_SVTOOLS_RTF_HEADERXR "\\headerxr" -#define OOO_STRING_SVTOOLS_RTF_FOOTERYT "\\footeryt" -#define OOO_STRING_SVTOOLS_RTF_FOOTERXL "\\footerxl" -#define OOO_STRING_SVTOOLS_RTF_FOOTERXR "\\footerxr" -#define OOO_STRING_SVTOOLS_RTF_HEADERYH "\\headeryh" -#define OOO_STRING_SVTOOLS_RTF_FOOTERYH "\\footeryh" -#define OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN "\\swcolmnblnc" -#define OOO_STRING_SVTOOLS_RTF_UPDNPROP "\\updnprop" -#define OOO_STRING_SVTOOLS_RTF_PRTDATA "\\prtdata" -#define OOO_STRING_SVTOOLS_RTF_BKMKKEY "\\bkmkkey" - -// Attribute fuer die freifliegenden Rahmen -#define OOO_STRING_SVTOOLS_RTF_FLYPRINT "\\flyprint" -#define OOO_STRING_SVTOOLS_RTF_FLYOPAQUE "\\flyopaque" -#define OOO_STRING_SVTOOLS_RTF_FLYPRTCTD "\\flyprtctd" -#define OOO_STRING_SVTOOLS_RTF_FLYMAINCNT "\\flymaincnt" -#define OOO_STRING_SVTOOLS_RTF_FLYVERT "\\flyvert" -#define OOO_STRING_SVTOOLS_RTF_FLYHORZ "\\flyhorz" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTL "\\dfrmtxtl" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTR "\\dfrmtxtr" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTU "\\dfrmtxtu" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTW "\\dfrmtxtw" -#define OOO_STRING_SVTOOLS_RTF_FLYANCHOR "\\flyanchor" -#define OOO_STRING_SVTOOLS_RTF_FLYCNTNT "\\flycntnt" -#define OOO_STRING_SVTOOLS_RTF_FLYCOLUMN "\\flycolumn" -#define OOO_STRING_SVTOOLS_RTF_FLYPAGE "\\flypage" -#define OOO_STRING_SVTOOLS_RTF_FLYINPARA "\\flyinpara" -#define OOO_STRING_SVTOOLS_RTF_BRDBOX "\\brdbox" -#define OOO_STRING_SVTOOLS_RTF_BRDLNCOL "\\brdlncol" -#define OOO_STRING_SVTOOLS_RTF_BRDLNIN "\\brdlnin" -#define OOO_STRING_SVTOOLS_RTF_BRDLNOUT "\\brdlnout" -#define OOO_STRING_SVTOOLS_RTF_BRDLNDIST "\\brdlndist" -#define OOO_STRING_SVTOOLS_RTF_SHADOW "\\shadow" -#define OOO_STRING_SVTOOLS_RTF_SHDWDIST "\\shdwdist" -#define OOO_STRING_SVTOOLS_RTF_SHDWSTYLE "\\shdwstyle" -#define OOO_STRING_SVTOOLS_RTF_SHDWCOL "\\shdwcol" -#define OOO_STRING_SVTOOLS_RTF_SHDWFCOL "\\shdwfcol" -#define OOO_STRING_SVTOOLS_RTF_PGDSCTBL "\\pgdsctbl" -#define OOO_STRING_SVTOOLS_RTF_PGDSC "\\pgdsc" -#define OOO_STRING_SVTOOLS_RTF_PGDSCUSE "\\pgdscuse" -#define OOO_STRING_SVTOOLS_RTF_PGDSCNXT "\\pgdscnxt" -#define OOO_STRING_SVTOOLS_RTF_HYPHEN "\\hyphen" -#define OOO_STRING_SVTOOLS_RTF_HYPHLEAD "\\hyphlead" -#define OOO_STRING_SVTOOLS_RTF_HYPHTRAIL "\\hyphtrail" -#define OOO_STRING_SVTOOLS_RTF_HYPHMAX "\\hyphmax" -#define OOO_STRING_SVTOOLS_RTF_TLSWG "\\tlswg" -#define OOO_STRING_SVTOOLS_RTF_PGBRK "\\pgbrk" -#define OOO_STRING_SVTOOLS_RTF_PGDSCNO "\\pgdscno" -#define OOO_STRING_SVTOOLS_RTF_SOUTLVL "\\soutlvl" -#define OOO_STRING_SVTOOLS_RTF_SHP "\\shp" -#define OOO_STRING_SVTOOLS_RTF_SN "\\sn" -#define OOO_STRING_SVTOOLS_RTF_SV "\\sv" - -// Support for overline attributes -#define OOO_STRING_SVTOOLS_RTF_OL "\\ol" -#define OOO_STRING_SVTOOLS_RTF_OLD "\\old" -#define OOO_STRING_SVTOOLS_RTF_OLDB "\\oldb" -#define OOO_STRING_SVTOOLS_RTF_OLNONE "\\olnone" -#define OOO_STRING_SVTOOLS_RTF_OLW "\\olw" -#define OOO_STRING_SVTOOLS_RTF_OLDASH "\\oldash" -#define OOO_STRING_SVTOOLS_RTF_OLDASHD "\\oldashd" -#define OOO_STRING_SVTOOLS_RTF_OLDASHDD "\\oldashdd" -#define OOO_STRING_SVTOOLS_RTF_OLTH "\\olth" -#define OOO_STRING_SVTOOLS_RTF_OLWAVE "\\olwave" -#define OOO_STRING_SVTOOLS_RTF_OLC "\\olc" -#define OOO_STRING_SVTOOLS_RTF_OLTHD "\\olthd" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASH "\\olthdash" -#define OOO_STRING_SVTOOLS_RTF_OLLDASH "\\olldash" -#define OOO_STRING_SVTOOLS_RTF_OLTHLDASH "\\olthldash" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASHD "\\olthdashd" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASHDD "\\olthdashdd" -#define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" -#define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" - -#endif // _RTFKEYWD_HXX diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx deleted file mode 100644 index ba20add1d968..000000000000 --- a/svtools/inc/rtfout.hxx +++ /dev/null @@ -1,70 +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: rtfout.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RTFOUT_HXX -#define _RTFOUT_HXX - -#include "svtools/svtdllapi.h" -#include - -#ifndef _RTL_TEXTENC_H_ -#include -#endif - -class String; -class SvStream; - -class SVT_DLLPUBLIC RTFOutFuncs -{ -public: -#if defined(MAC) || defined(UNX) - static const sal_Char sNewLine; // nur \012 oder \015 -#else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 -#endif - - static SvStream& Out_Char( SvStream&, sal_Unicode cChar, - int *pUCMode, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - static SvStream& Out_String( SvStream&, const String&, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - static SvStream& Out_Fontname( SvStream&, const String&, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - - static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); -}; - - -#endif - - diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h deleted file mode 100644 index c7981361ffc9..000000000000 --- a/svtools/inc/rtftoken.h +++ /dev/null @@ -1,1276 +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: rtftoken.h,v $ - * $Revision: 1.13.134.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ - -#ifndef _RTFTOKEN_H -#define _RTFTOKEN_H - -class String; - -// suche die TokenID zu dem Token -int GetRTFToken( const String& rSearch ); - -enum RTF_TOKEN_RANGES { - RTF_NOGROUP = 0x0100, - RTF_DOCFMT = 0x0200, - RTF_SECTFMT = 0x0300, - RTF_PARFMT = 0x0400, - RTF_TABSTOPDEF = 0x0500, - RTF_BRDRDEF = 0x0600, - RTF_CHRFMT = 0x0700, - RTF_SPECCHAR = 0x0800, - RTF_APOCTL = 0x0900, - RTF_SHADINGDEF = 0x0A00, - // free = 0x0B00, - RTF_DRAWOBJECTS = 0x0C00, - RTF_OBJECTS = 0x0D00, - RTF_NUMBULLETS = 0x0E00, - - // !!! kann hinein verodert werden (Border/Background) !!!! - RTF_TABLEDEF = 0x1000, - - // !!! kann hinein verodert werden (Border/Tab) !!!! - RTF_SWGDEFS = 0x4000 -}; - -enum RTF_TOKEN_IDS { - - RTF_TEXTTOKEN = RTF_NOGROUP, - RTF_SINGLECHAR, - RTF_UNKNOWNCONTROL, - RTF_UNKNOWNDATA, - - RTF_RTF, - RTF_ANSITYPE, - RTF_MACTYPE, - RTF_PCTYPE, - RTF_PCATYPE, - RTF_NEXTTYPE, - - RTF_STYLESHEET, - RTF_SBASEDON, - RTF_SNEXT, - RTF_SHIDDEN, - RTF_SAUTOUPD, - - RTF_KEYCODE, - RTF_FNKEY, - RTF_ALTKEY, - RTF_SHIFTKEY, - RTF_CTRLKEY, - - RTF_FONTTBL, - RTF_DEFF, - RTF_FNIL, - RTF_FROMAN, - RTF_FSWISS, - RTF_FMODERN, - RTF_FSCRIPT, - RTF_FDECOR, - RTF_FTECH, - - RTF_COLORTBL, - RTF_RED, - RTF_GREEN, - RTF_BLUE, - - RTF_INFO, - RTF_TITLE, - RTF_SUBJECT, - RTF_AUTHOR, - RTF_OPERATOR, - RTF_KEYWORDS, - RTF_COMMENT, - RTF_VERSION, - RTF_DOCCOMM, - RTF_VERN, - RTF_CREATIM, - RTF_REVTIM, - RTF_PRINTIM, - RTF_BUPTIM, - RTF_EDMINS, - RTF_NOFPAGES, - RTF_NOFWORDS, - RTF_NOFCHARS, - RTF_ID, - RTF_YR, - RTF_MO, - RTF_DY, - RTF_HR, - RTF_MIN, - RTF_USERPROPS, - RTF_CATEGORY, - RTF_COMPANY, - RTF_MANAGER, - RTF_PROPNAME, - RTF_LINKVAL, - RTF_NOFCHARSWS, - RTF_HLINKBASE, - RTF_STATICVAL, - RTF_PROPTYPE, - - RTF_ANNOTATION, - RTF_ATNID, - - RTF_FOOTNOTE, - - RTF_XE, - RTF_BXE, - RTF_IXE, - RTF_RXE, - RTF_TXE, - RTF_YXE, - - RTF_TC, - RTF_TCF, - RTF_TCL, - - RTF_BKMKSTART, - RTF_BKMKEND, - - RTF_PICT, // Bitmaps - RTF_PICW, - RTF_PICH, - RTF_WBMBITSPIXEL, - RTF_WBMPLANES, - RTF_WBMWIDTHBYTES, - RTF_PICWGOAL, - RTF_PICHGOAL, - RTF_BIN, - RTF_PICSCALEX, - RTF_PICSCALEY, - RTF_PICSCALED, - RTF_WBITMAP, - RTF_WMETAFILE, - RTF_MACPICT, - RTF_OSMETAFILE, - RTF_DIBITMAP, - RTF_PICCROPT, - RTF_PICCROPB, - RTF_PICCROPL, - RTF_PICCROPR, - RTF_PICDATA, - RTF_PICBMP, - RTF_PICBPP, - RTF_PICPROP, - RTF_SHPPICT, - RTF_EMFBLIP, - RTF_PNGBLIP, - RTF_JPEGBLIP, - RTF_NONSHPPICT, - RTF_BLIPTAG, - RTF_BLIPUID, - RTF_BLIPUPI, - - RTF_FIELD, // Felder - RTF_FLDDIRTY, - RTF_FLDEDIT, - RTF_FLDLOCK, - RTF_FLDPRIV, - RTF_FLDINST, - RTF_FLDRSLT, - RTF_FLDTYPE, - RTF_TIME, - RTF_DATE, - RTF_WPEQN, - - RTF_NOLINE, - RTF_REVISED, - - RTF_BKMKCOLF, - RTF_BKMKCOLL, - RTF_PSOVER, - RTF_DOCTEMP, - RTF_DELETED, - - RTF_FCHARSET, - RTF_FALT, - RTF_FPRQ, - RTF_PANOSE, - RTF_FNAME, - RTF_FBIAS, - - RTF_ADDITIVE, - RTF_BKMKPUB, - RTF_CPG, - RTF_DATAFIELD, - - RTF_FBIDI, - RTF_FID, - RTF_FILE, - RTF_FILETBL, - RTF_FNETWORK, - RTF_FONTEMB, - RTF_FONTFILE, - RTF_FOSNUM, - RTF_FRELATIVE, - RTF_FTNIL, - RTF_FTTRUETYPE, - RTF_FVALIDDOS, - RTF_FVALIDHPFS, - RTF_FVALIDMAC, - RTF_FVALIDNTFS, - RTF_LINKSELF, - RTF_PUBAUTO, - RTF_REVTBL, - RTF_RTLMARK, - RTF_SEC, - RTF_TCN, - RTF_XEF, - - RTF_UD, // Unicode - RTF_UPR, - RTF_U, - RTF_UC, - RTF_ANSICPG, - - RTF_FFEXITMCR, // Form Fields - RTF_FFENTRYMCR, - RTF_FFDEFTEXT, - RTF_FFFORMAT, - RTF_FFSTATTEXT, - RTF_FORMFIELD, - RTF_FFNAME, - RTF_FFHELPTEXT, - RTF_FFL, - RTF_FFOWNHELP, - RTF_FFOWNSTAT, - RTF_FFMAXLEN, - RTF_FFHASLISTBOX, - RTF_FFHPS, - RTF_FFPROT, - RTF_FFTYPE, - RTF_FFTYPETXT, - RTF_FFSIZE, - RTF_FFRECALC, - RTF_FFRES, - RTF_FFDEFRES, - - RTF_HIGHLIGHT, - -/* */ - - RTF_DEFTAB = RTF_DOCFMT, - RTF_HYPHHOTZ, - RTF_LINESTART, - RTF_FRACWIDTH, - RTF_NEXTFILE, - RTF_TEMPLATE, - RTF_MAKEBACKUP, - RTF_DEFFORMAT, - RTF_DEFLANG, - RTF_FTNSEP, - RTF_FTNSEPC, - RTF_FTNCN, - RTF_ENDNOTES, - RTF_ENDDOC, - RTF_FTNTJ, - RTF_FTNBJ, - RTF_FTNSTART, - RTF_FTNRESTART, - RTF_PAPERW, - RTF_PAPERH, - RTF_MARGL, - RTF_MARGR, - RTF_MARGT, - RTF_MARGB, - RTF_FACINGP, - RTF_GUTTER, - RTF_MARGMIRROR, - RTF_LANDSCAPE, - RTF_PGNSTART, - RTF_WIDOWCTRL, - RTF_REVISIONS, - RTF_REVPROP, - RTF_REVBAR, - - RTF_AENDDOC, - RTF_AENDNOTES, - RTF_AFTNBJ, - RTF_AFTNCN, - RTF_AFTNNALC, - RTF_AFTNNAR, - RTF_AFTNNAUC, - RTF_AFTNNCHI, - RTF_AFTNNRLC, - RTF_AFTNNRUC, - RTF_AFTNRESTART, - RTF_AFTNRSTCONT, - RTF_AFTNSEP, - RTF_AFTNSEPC, - RTF_AFTNSTART, - RTF_AFTNTJ, - RTF_ALLPROT, - RTF_ANNOTPROT, - RTF_ATNAUTHOR, - RTF_ATNICN, - RTF_ATNREF, - RTF_ATNTIME, - RTF_ATRFEND, - RTF_ATRFSTART, - RTF_BRKFRM, - RTF_CVMME, - RTF_FET, - RTF_FLDALT, - RTF_FORMDISP, - RTF_FORMPROT, - RTF_FORMSHADE, - RTF_FTNALT, - RTF_FTNNALC, - RTF_FTNNAR, - RTF_FTNNAUC, - RTF_FTNNCHI, - RTF_FTNNRLC, - RTF_FTNNRUC, - RTF_FTNRSTCONT, - RTF_FTNRSTPG, - RTF_HYPHAUTO, - RTF_HYPHCAPS, - RTF_HYPHCONSEC, - RTF_LINKSTYLES, - RTF_LTRDOC, - RTF_NOCOLBAL, - RTF_NOEXTRASPRL, - RTF_NOTABIND, - RTF_OTBLRUL, - RTF_PRCOLBL, - RTF_PRINTDATA, - RTF_PSZ, - RTF_REVPROT, - RTF_RTLDOC, - RTF_SPRSSPBF, - RTF_SPRSTSP, - RTF_SWPBDR, - RTF_TRANSMF, - RTF_WRAPTRSP, - - RTF_PRIVATE, - RTF_NOULTRLSPC, - RTF_MSMCAP, - RTF_NOLEAD, - RTF_NOSPACEFORUL, - RTF_LYTEXCTTP, - RTF_LYTPRTMET, - RTF_DNTBLNSBDB, - RTF_FROMTEXT, - RTF_EXPSHRTN, - RTF_PGBRDRT, - RTF_SPRSBSP, - RTF_PGBRDRR, - RTF_PGBRDRSNAP, - RTF_BDBFHDR, - RTF_SUBFONTBYSIZE, - RTF_TRUNCATEFONTHEIGHT, - RTF_SPRSLNSP, - RTF_SPRSTSM, - RTF_PGBRDRL, - RTF_WPJST, - RTF_PGBRDRB, - RTF_WPSP, - RTF_NOXLATTOYEN, - RTF_OLDLINEWRAP, - RTF_PGBRDRFOOT, - RTF_PGBRDRHEAD, - RTF_DEFLANGFE, - RTF_DOCTYPE, - RTF_PGBRDROPT, - RTF_VIEWKIND, - RTF_VIEWSCALE, - RTF_WINDOWCAPTION, - RTF_BRDRART, - RTF_VIEWZK, - RTF_DOCVAR, - - RTF_DGMARGIN, - RTF_AFTNNCHOSUNG, - RTF_AFTNNCNUM, - RTF_AFTNNDBAR, - RTF_AFTNNDBNUM, - RTF_AFTNNDBNUMD, - RTF_AFTNNDBNUMK, - RTF_AFTNNDBNUMT, - RTF_AFTNNGANADA, - RTF_AFTNNGBNUM, - RTF_AFTNNGBNUMD, - RTF_AFTNNGBNUMK, - RTF_AFTNNGBNUML, - RTF_AFTNNZODIAC, - RTF_AFTNNZODIACD, - RTF_AFTNNZODIACL, - RTF_FTNNCHOSUNG, - RTF_FTNNCNUM, - RTF_FTNNDBAR, - RTF_FTNNDBNUM, - RTF_FTNNDBNUMD, - RTF_FTNNDBNUMK, - RTF_FTNNDBNUMT, - RTF_FTNNGANADA, - RTF_FTNNGBNUM, - RTF_FTNNGBNUMD, - RTF_FTNNGBNUMK, - RTF_FTNNGBNUML, - RTF_FTNNZODIAC, - RTF_FTNNZODIACD, - RTF_FTNNZODIACL, - - RTF_ADEFLANG, - RTF_ADEFF, - -/* */ - - RTF_SECTD = RTF_SECTFMT, - RTF_ENDNHERE, - RTF_BINFSXN, - RTF_BINSXN, - RTF_SBKNONE, - RTF_SBKCOL, - RTF_SBKPAGE, - RTF_SBKEVEN, - RTF_SBKODD, - RTF_COLS, - RTF_COLSX, - RTF_COLNO, - RTF_COLSR, - RTF_COLW, - RTF_LINEBETCOL, - RTF_LINEMOD, - RTF_LINEX, - RTF_LINESTARTS, - RTF_LINERESTART, - RTF_LINEPAGE, - RTF_LINECONT, - RTF_PGWSXN, - RTF_PGHSXN, - RTF_MARGLSXN, - RTF_MARGRSXN, - RTF_MARGTSXN, - RTF_MARGBSXN, - RTF_GUTTERSXN, - RTF_LNDSCPSXN, - RTF_FACPGSXN, - RTF_TITLEPG, - RTF_HEADERY, - RTF_FOOTERY, - RTF_PGNSTARTS, - RTF_PGNCONT, - RTF_PGNRESTART, - RTF_PGNX, - RTF_PGNY, - RTF_PGNDEC, - RTF_PGNUCRM, - RTF_PGNLCRM, - RTF_PGNUCLTR, - RTF_PGNLCLTR, - RTF_VERTALT, - RTF_VERTALB, - RTF_VERTALC, - RTF_VERTALJ, - - RTF_FOOTER, - RTF_FOOTERL, - RTF_FOOTERR, - RTF_FOOTERF, - RTF_HEADER, - RTF_HEADERL, - RTF_HEADERR, - RTF_HEADERF, - RTF_DS, - RTF_LTRSECT, - RTF_PGNHN, - RTF_PGNHNSC, - RTF_PGNHNSH, - RTF_PGNHNSM, - RTF_PGNHNSN, - RTF_PGNHNSP, - RTF_RTLSECT, - RTF_SECTUNLOCKED, - RTF_STEXTFLOW, - RTF_PGNCHOSUNG, - RTF_PGNCNUM, - RTF_PGNDBNUMK, - RTF_PGNDBNUMT, - RTF_PGNGANADA, - RTF_PGNGBNUM, - RTF_PGNGBNUMD, - RTF_PGNGBNUMK, - RTF_PGNGBNUML, - RTF_PGNZODIAC, - RTF_PGNZODIACD, - RTF_PGNZODIACL, - RTF_SECTDEFAULTCL, - RTF_SECTEXPAND, - RTF_SECTLINEGRID, - RTF_SECTSPECIFYCL, - RTF_SECTSPECIFYL, - - // Swg-Header/Footer-Tokens - RTF_HEADER_YB = (RTF_SECTFMT|RTF_SWGDEFS), - RTF_HEADER_XL, - RTF_HEADER_XR, - RTF_FOOTER_YT, - RTF_FOOTER_XL, - RTF_FOOTER_XR, - RTF_HEADER_YH, - RTF_FOOTER_YH, - RTF_BALANCED_COLUMN, - - -/* */ - - RTF_PARD = RTF_PARFMT, - RTF_S, - RTF_INTBL, - RTF_KEEP, - RTF_KEEPN, - RTF_LEVEL, - RTF_PAGEBB, - RTF_SBYS, - RTF_QL, - RTF_QR, - RTF_QJ, - RTF_QC, - RTF_FI, - RTF_LI, - RTF_LIN, - RTF_RI, - RTF_RIN, - RTF_SB, - RTF_SA, - RTF_SL, - RTF_HYPHPAR, - RTF_LTRPAR, - RTF_NOWIDCTLPAR, - RTF_RTLPAR, - RTF_SLMULT, - RTF_SUBDOCUMENT, - - RTF_WIDCTLPAR, - - RTF_LISTTEXT, - RTF_POSYIN, - RTF_PNRNOT, - RTF_BRDRDASHDOTSTR, - RTF_POSYOUT, - RTF_BRDRDASHD, - RTF_BRDRDASHDD, - RTF_BRDRENGRAVE, - RTF_BRDRTHTNLG, - RTF_BRDREMBOSS, - RTF_BRDRTNTHTNLG, - RTF_BRDRDASHSM, - RTF_BRDRTHTNMG, - RTF_OVERLAY, - RTF_BRDRTNTHSG, - RTF_BRDRTNTHMG, - RTF_BRDRTHTNSG, - RTF_BRDRTNTHLG, - RTF_BRDRTRIPLE, - RTF_BRDRTNTHTNSG, - RTF_BRDRTNTHTNMG, - RTF_BRDRWAVYDB, - RTF_BRDRWAVY, - RTF_ILVL, - RTF_DFRSTOP, - RTF_DFRXST, - RTF_PNRAUTH, - RTF_DFRSTART, - RTF_OUTLINELEVEL, - RTF_DFRAUTH, - RTF_DFRDATE, - RTF_PNRRGB, - RTF_PNRPNBR, - RTF_PNRSTART, - RTF_PNRXST, - RTF_PNRSTOP, - RTF_PNRDATE, - RTF_PNRNFC, - RTF_NOSNAPLINEGRID, - RTF_FAAUTO, - RTF_FAHANG, - RTF_FAVAR, - RTF_FACENTER, - RTF_FAROMAN, - RTF_FAFIXED, - RTF_ADJUSTRIGHT, - RTF_LS, - RTF_NOCWRAP, - RTF_NOOVERFLOW, - RTF_ASPALPHA, - - -/* */ - - RTF_TX = RTF_TABSTOPDEF, - RTF_TB, - RTF_TQL, - RTF_TQR, - RTF_TQC, - RTF_TQDEC, - RTF_TLDOT, - RTF_TLHYPH, - RTF_TLUL, - RTF_TLTH, - RTF_TLEQ, - - // Swg-TabStop-Tokens - RTF_TLSWG = (RTF_TABSTOPDEF|RTF_SWGDEFS), - -/* */ - - RTF_BRDRT = RTF_BRDRDEF, - RTF_BRDRB, - RTF_BRDRL, - RTF_BRDRR, - RTF_BRDRBTW, - RTF_BRDRBAR, - RTF_BOX, - RTF_BRSP, - RTF_BRDRW, - RTF_BRDRCF, - RTF_BRDRS, - RTF_BRDRTH, - RTF_BRDRSH, - RTF_BRDRDB, - RTF_BRDRDOT, - RTF_BRDRHAIR, - RTF_BRDRDASH, - RTF_BRDRFRAME, - - // Swg-Border-Tokens - RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS), - RTF_BRDLINE_COL, - RTF_BRDLINE_IN, - RTF_BRDLINE_OUT, - RTF_BRDLINE_DIST, - -/* */ - - RTF_PLAIN = RTF_CHRFMT, - RTF_B, - RTF_CAPS, - RTF_DN, - RTF_SUB, - RTF_NOSUPERSUB, - RTF_EXPND, - RTF_EXPNDTW, - RTF_KERNING, - RTF_F, - RTF_FS, - RTF_I, - RTF_OUTL, - RTF_SCAPS, - RTF_SHAD, - RTF_STRIKE, - RTF_UL, - RTF_ULD, - RTF_ULDB, - RTF_ULNONE, - RTF_ULW, - RTF_OL, - RTF_OLD, - RTF_OLDB, - RTF_OLNONE, - RTF_OLW, - RTF_UP, - RTF_SUPER, - RTF_V, - RTF_CF, - RTF_CB, - RTF_LANG, - RTF_CCHS, - RTF_CS, - RTF_LTRCH, - RTF_REVAUTH, - RTF_REVDTTM, - RTF_RTLCH, - - RTF_CHBGFDIAG, - RTF_CHBGDKVERT, - RTF_CHBGDKHORIZ, - RTF_CHBRDR, - RTF_CHBGVERT, - RTF_CHBGHORIZ, - RTF_CHBGDKFDIAG, - RTF_CHBGDCROSS, - RTF_CHBGCROSS, - RTF_CHBGBDIAG, - RTF_CHBGDKDCROSS, - RTF_CHBGDKCROSS, - RTF_CHBGDKBDIAG, - RTF_ULDASHD, - RTF_ULDASH, - RTF_ULDASHDD, - RTF_ULWAVE, - RTF_ULC, - RTF_ULTH, - RTF_OLDASHD, - RTF_OLDASH, - RTF_OLDASHDD, - RTF_OLWAVE, - RTF_OLC, - RTF_OLTH, - RTF_EMBO, - RTF_IMPR, - RTF_STRIKED, - RTF_CRDATE, - RTF_CRAUTH, - RTF_CHARSCALEX, - RTF_CHCBPAT, - RTF_CHCFPAT, - RTF_CHSHDNG, - RTF_REVAUTHDEL, - RTF_REVDTTMDEL, - RTF_CGRID, - RTF_GCW, - RTF_NOSECTEXPAND, - RTF_GRIDTBL, - RTF_G, - RTF_ANIMTEXT, - RTF_ULTHD, - RTF_ULTHDASH, - RTF_ULLDASH, - RTF_ULTHLDASH, - RTF_ULTHDASHD, - RTF_ULTHDASHDD, - RTF_ULHWAVE, - RTF_ULULDBWAVE, - RTF_OLTHD, - RTF_OLTHDASH, - RTF_OLLDASH, - RTF_OLTHLDASH, - RTF_OLTHDASHD, - RTF_OLTHDASHDD, - RTF_OLHWAVE, - RTF_OLOLDBWAVE, - - // association control words - RTF_AB, - RTF_ACAPS, - RTF_ACF, - RTF_ADN, - RTF_AEXPND, - RTF_AF, - RTF_AFS, - RTF_AI, - RTF_ALANG, - RTF_AOUTL, - RTF_ASCAPS, - RTF_ASHAD, - RTF_ASTRIKE, - RTF_AUL, - RTF_AULD, - RTF_AULDB, - RTF_AULNONE, - RTF_AULW, - RTF_AUP, - - RTF_LOCH, - RTF_HICH, - RTF_DBCH, - RTF_LANGFE, - RTF_ACCNONE, - RTF_ACCDOT, - RTF_ACCCOMMA, - RTF_TWOINONE, - RTF_HORZVERT, - - // Swg-Border-Tokens - RTF_SWG_ESCPROP = (RTF_CHRFMT|RTF_SWGDEFS), - RTF_HYPHEN, - RTF_HYPHLEAD, - RTF_HYPHTRAIL, - RTF_HYPHMAX, - - -/* */ - - RTF_CHDATE = RTF_SPECCHAR, - RTF_CHDATEL, - RTF_CHDATEA, - RTF_CHTIME, - RTF_CHPGN, - RTF_CHFTN, - RTF_CHATN, - RTF_CHFTNSEP, - RTF_CHFTNSEPC, - RTF_CELL, - RTF_ROW, - RTF_PAR, - RTF_SECT, - RTF_PAGE, - RTF_COLUM, - RTF_LINE, - RTF_TAB, - RTF_EMDASH, - RTF_ENDASH, - RTF_BULLET, - RTF_LQUOTE, - RTF_RQUOTE, - RTF_LDBLQUOTE, - RTF_RDBLQUOTE, - RTF_FORMULA, - RTF_NONBREAKINGSPACE, - RTF_OPTIONALHYPHEN, - RTF_NONBREAKINGHYPHEN, - RTF_SUBENTRYINDEX, - RTF_IGNOREFLAG, - RTF_HEX, - RTF_EMSPACE, - RTF_ENSPACE, - RTF_LTRMARK, - RTF_SECTNUM, - RTF_SOFTCOL, - RTF_SOFTLHEIGHT, - RTF_SOFTLINE, - RTF_SOFTPAGE, - RTF_ZWJ, - RTF_ZWNJ, - -/* */ - - RTF_ABSW = RTF_APOCTL, - RTF_ABSH, - RTF_NOWRAP, - RTF_DXFRTEXT, - RTF_DFRMTXTX, - RTF_DFRMTXTY, - RTF_DROPCAPLI, - RTF_DROPCAPT, - RTF_ABSNOOVRLP, - RTF_PHMRG, - RTF_PHPG, - RTF_PHCOL, - RTF_POSX, - RTF_POSNEGX, - RTF_POSXC, - RTF_POSXI, - RTF_POSXO, - RTF_POSXL, - RTF_POSXR, - RTF_PVMRG, - RTF_PVPG, - RTF_PVPARA, - RTF_POSY, - RTF_POSNEGY, - RTF_POSYT, - RTF_POSYIL, - RTF_POSYB, - RTF_POSYC, - RTF_ABSLOCK, - RTF_FRMTXLRTB, - RTF_FRMTXTBRL, - RTF_FRMTXBTLR, - RTF_FRMTXLRTBV, - RTF_FRMTXTBRLV, - - // Swg-Frame-Tokens - RTF_FLYPRINT = (RTF_APOCTL|RTF_SWGDEFS), - RTF_FLYOPAQUE, - RTF_FLYPRTCTD, - RTF_FLYMAINCNT, - RTF_FLYVERT, - RTF_FLYHORZ, - RTF_FLYOUTLEFT, - RTF_FLYOUTRIGHT, - RTF_FLYOUTUPPER, - RTF_FLYOUTLOWER, - RTF_FLYANCHOR, - RTF_FLY_CNTNT, - RTF_FLY_COLUMN, - RTF_FLY_PAGE, - RTF_FLY_INPARA, - - -/* */ - - RTF_SHADING = RTF_SHADINGDEF, - RTF_CFPAT, - RTF_CBPAT, - RTF_BGHORIZ, - RTF_BGVERT, - RTF_BGFDIAG, - RTF_BGBDIAG, - RTF_BGCROSS, - RTF_BGDCROSS, - RTF_BGDKHORIZ, - RTF_BGDKVERT, - RTF_BGDKFDIAG, - RTF_BGDKBDIAG, - RTF_BGDKCROSS, - RTF_BGDKDCROSS, - -/* */ - - RTF_TROWD = RTF_TABLEDEF, - RTF_TRGAPH, - RTF_TRLEFT, - RTF_TRRH, - - RTF_TRQL, - RTF_TRQR, - RTF_TRQC, - - RTF_CLMGF, - RTF_CLMRG, - RTF_CELLX, - RTF_LTRROW, - RTF_RTLROW, - RTF_TRBRDRB, - RTF_TRBRDRH, - RTF_TRBRDRL, - RTF_TRBRDRR, - RTF_TRBRDRT, - RTF_TRBRDRV, - RTF_TRHDR, - RTF_TRKEEP, - RTF_TRPADDB, - RTF_TRPADDL, - RTF_TRPADDR, - RTF_TRPADDT, - RTF_TRPADDFB, - RTF_TRPADDFL, - RTF_TRPADDFR, - RTF_TRPADDFT, - RTF_TCELLD, - RTF_CLTXTBRL, - RTF_CLTXLRTB, - RTF_CLVERTALB, - RTF_CLVERTALT, - RTF_CLVERTALC, - RTF_CLVMGF, - RTF_CLVMRG, - RTF_CLTXTBRLV, - RTF_CLTXBTLR, - RTF_CLTXLRTBV, - RTF_CLPADL, - RTF_CLPADT, - RTF_CLPADB, - RTF_CLPADR, - RTF_CLPADFL, - RTF_CLPADFT, - RTF_CLPADFB, - RTF_CLPADFR, - - - RTF_CLBRDRT = (RTF_BRDRDEF|RTF_TABLEDEF), - RTF_CLBRDRL, - RTF_CLBRDRB, - RTF_CLBRDRR, - - RTF_CLCFPAT = (RTF_SHADINGDEF|RTF_TABLEDEF), - RTF_CLCBPAT, - RTF_CLSHDNG, - RTF_CLBGHORIZ, - RTF_CLBGVERT, - RTF_CLBGFDIAG, - RTF_CLBGBDIAG, - RTF_CLBGCROSS, - RTF_CLBGDCROSS, - RTF_CLBGDKHOR, - RTF_CLBGDKVERT, - RTF_CLBGDKFDIAG, - RTF_CLBGDKBDIAG, - RTF_CLBGDKCROSS, - RTF_CLBGDKDCROSS, - -/* */ - - -/* */ - - RTF_DO = RTF_DRAWOBJECTS, - RTF_DOBXCOLUMN, - RTF_DOBXMARGIN, - RTF_DOBXPAGE, - RTF_DOBYMARGIN, - RTF_DOBYPAGE, - RTF_DOBYPARA, - RTF_DODHGT, - RTF_DOLOCK, - RTF_DPAENDHOL, - RTF_DPAENDL, - RTF_DPAENDSOL, - RTF_DPAENDW, - RTF_DPARC, - RTF_DPARCFLIPX, - RTF_DPARCFLIPY, - RTF_DPASTARTHOL, - RTF_DPASTARTL, - RTF_DPASTARTSOL, - RTF_DPASTARTW, - RTF_DPCALLOUT, - RTF_DPCOA, - RTF_DPCOACCENT, - RTF_DPCOBESTFIT, - RTF_DPCOBORDER, - RTF_DPCODABS, - RTF_DPCODBOTTOM, - RTF_DPCODCENTER, - RTF_DPCODTOP, - RTF_DPCOLENGTH, - RTF_DPCOMINUSX, - RTF_DPCOMINUSY, - RTF_DPCOOFFSET, - RTF_DPCOSMARTA, - RTF_DPCOTDOUBLE, - RTF_DPCOTRIGHT, - RTF_DPCOTSINGLE, - RTF_DPCOTTRIPLE, - RTF_DPCOUNT, - RTF_DPELLIPSE, - RTF_DPENDGROUP, - RTF_DPFILLBGCB, - RTF_DPFILLBGCG, - RTF_DPFILLBGCR, - RTF_DPFILLBGGRAY, - RTF_DPFILLBGPAL, - RTF_DPFILLFGCB, - RTF_DPFILLFGCG, - RTF_DPFILLFGCR, - RTF_DPFILLFGGRAY, - RTF_DPFILLFGPAL, - RTF_DPFILLPAT, - RTF_DPGROUP, - RTF_DPLINE, - RTF_DPLINECOB, - RTF_DPLINECOG, - RTF_DPLINECOR, - RTF_DPLINEDADO, - RTF_DPLINEDADODO, - RTF_DPLINEDASH, - RTF_DPLINEDOT, - RTF_DPLINEGRAY, - RTF_DPLINEHOLLOW, - RTF_DPLINEPAL, - RTF_DPLINESOLID, - RTF_DPLINEW, - RTF_DPPOLYCOUNT, - RTF_DPPOLYGON, - RTF_DPPOLYLINE, - RTF_DPPTX, - RTF_DPPTY, - RTF_DPRECT, - RTF_DPROUNDR, - RTF_DPSHADOW, - RTF_DPSHADX, - RTF_DPSHADY, - RTF_DPTXBX, - RTF_DPTXBXMAR, - RTF_DPTXBXTEXT, - RTF_DPX, - RTF_DPXSIZE, - RTF_DPY, - RTF_DPYSIZE, - - RTF_DPCODESCENT, - RTF_BACKGROUND, - RTF_SHPBYPAGE, - RTF_SHPBYPARA, - RTF_SHPBYMARGIN, - RTF_SHPBXCOLUMN, - RTF_SHPBXMARGIN, - RTF_SHPBXPAGE, - RTF_SHPLOCKANCHOR, - RTF_SHPWR, - RTF_HLLOC, - RTF_HLSRC, - RTF_SHPWRK, - RTF_SHPTOP, - RTF_SHPRSLT, - RTF_HLFR, - RTF_SHPTXT, - RTF_SHPFHDR, - RTF_SHPGRP, - RTF_SHPRIGHT, - RTF_SHPFBLWTXT, - RTF_SHPZ, - RTF_SHPBOTTOM, - RTF_SHPLEFT, - RTF_SHPLID, - -/* */ - - RTF_OBJALIAS = RTF_OBJECTS, - RTF_OBJALIGN, - RTF_OBJAUTLINK, - RTF_OBJCLASS, - RTF_OBJCROPB, - RTF_OBJCROPL, - RTF_OBJCROPR, - RTF_OBJCROPT, - RTF_OBJDATA, - RTF_OBJECT, - RTF_OBJEMB, - RTF_OBJH, - RTF_OBJICEMB, - RTF_OBJLINK, - RTF_OBJLOCK, - RTF_OBJNAME, - RTF_OBJPUB, - RTF_OBJSCALEX, - RTF_OBJSCALEY, - RTF_OBJSECT, - RTF_OBJSETSIZE, - RTF_OBJSUB, - RTF_OBJTIME, - RTF_OBJTRANSY, - RTF_OBJUPDATE, - RTF_OBJW, - RTF_RESULT, - RTF_RSLTBMP, - RTF_RSLTMERGE, - RTF_RSLTPICT, - RTF_RSLTRTF, - RTF_RSLTTXT, - RTF_OBJOCX, - RTF_OBJHTML, - RTF_OBJATTPH, - -/* */ - - RTF_PN = RTF_NUMBULLETS, - RTF_PNACROSS, - RTF_PNB, - RTF_PNCAPS, - RTF_PNCARD, - RTF_PNCF, - RTF_PNDEC, - RTF_PNF, - RTF_PNFS, - RTF_PNHANG, - RTF_PNI, - RTF_PNINDENT, - RTF_PNLCLTR, - RTF_PNLCRM, - RTF_PNLVL, - RTF_PNLVLBLT, - RTF_PNLVLBODY, - RTF_PNLVLCONT, - RTF_PNNUMONCE, - RTF_PNORD, - RTF_PNORDT, - RTF_PNPREV, - RTF_PNQC, - RTF_PNQL, - RTF_PNQR, - RTF_PNRESTART, - RTF_PNSCAPS, - RTF_PNSECLVL, - RTF_PNSP, - RTF_PNSTART, - RTF_PNSTRIKE, - RTF_PNTEXT, - RTF_PNTXTA, - RTF_PNTXTB, - RTF_PNUCLTR, - RTF_PNUCRM, - RTF_PNUL, - RTF_PNULD, - RTF_PNULDB, - RTF_PNULNONE, - RTF_PNULW, - RTF_LIST, - RTF_LISTLEVEL, - RTF_LISTOVERRIDE, - RTF_LISTOVERRIDETABLE, - RTF_LISTTABLE, - RTF_LISTNAME, - RTF_LEVELNUMBERS, - RTF_LEVELNORESTART, - RTF_LEVELNFC, - RTF_LEVELOLD, - RTF_LISTOVERRIDECOUNT, - RTF_LISTTEMPLATEID, - RTF_LEVELINDENT, - RTF_LEVELFOLLOW, - RTF_LEVELLEGAL, - RTF_LEVELJC, - RTF_LISTOVERRIDESTART, - RTF_LISTID, - RTF_LISTRESTARTHDN, - RTF_LEVELTEXT, - RTF_LISTOVERRIDEFORMAT, - RTF_LEVELPREVSPACE, - RTF_LEVELPREV, - RTF_LEVELSPACE, - RTF_LISTSIMPLE, - RTF_LEVELSTARTAT, - RTF_PNAIUEO, - RTF_PNAIUEOD, - RTF_PNCHOSUNG, - RTF_PNDBNUMD, - RTF_PNDBNUMK, - RTF_PNDBNUML, - RTF_PNDBNUMT, - RTF_PNGANADA, - RTF_PNGBNUM, - RTF_PNGBNUMD, - RTF_PNGBNUMK, - RTF_PNGBNUML, - RTF_PNZODIAC, - RTF_PNZODIACD, - RTF_PNZODIACL, - RTF_LFOLEVEL, - -/* */ - - RTF_GRF_ALIGNV= RTF_SWGDEFS, - RTF_GRF_ALIGNH, - RTF_GRF_MIRROR, - RTF_SWG_PRTDATA, - RTF_BKMK_KEY, - RTF_SHADOW, - RTF_SHDW_DIST, - RTF_SHDW_STYLE, - RTF_SHDW_COL, - RTF_SHDW_FCOL, - RTF_PGDSCTBL, - RTF_PGDSC, - RTF_PGDSCUSE, - RTF_PGDSCNXT, - RTF_PGDSCNO, - RTF_PGBRK, - RTF_SOUTLVL, - -// shapes - RTF_SHP, RTF_SN, RTF_SV -/* - RTF_SHPLEFT, - RTF_SHPTOP, - RTF_SHPBOTTOM, - RTF_SHPRIGHT -*/ - -}; - -#endif // _RTFTOKEN_H - -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx deleted file mode 100644 index 805394999abe..000000000000 --- a/svtools/inc/ruler.hxx +++ /dev/null @@ -1,877 +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: ruler.hxx,v $ - * $Revision: 1.13 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RULER_HXX -#define _RULER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#ifndef _VIRDEV_HXX -#include -#endif -#include - -class MouseEvent; -class TrackingEvent; -class DataChangedEvent; - -/************************************************************************* - -Beschreibung -============ - -class Ruler - -Diese Klasse dient zur Anzeige eines Lineals. Dabei kann diese Klasse nicht -nur als Anzeige-Control verwendet werden, sondern auch als aktives Control -zum Setzen/Verschieben von Tabulatoren und Raendern. - --------------------------------------------------------------------------- - -WinBits - -WB_HORZ Lineal wird horizontal dargestellt -WB_VERT Lineal wird vertikal dargestellt -WB_3DLOOK 3D-Darstellung -WB_BORDER Border am unteren/rechten Rand -WB_EXTRAFIELD Feld in der linken/oberen Ecke zur Anzeige und - Auswahl von Tabs, Null-Punkt, ... -WB_RIGHT_ALIGNED Marks the vertical ruler as right aligned - --------------------------------------------------------------------------- - -Beim Lineal werden alle Werte als Pixel-Werte eingestellt. Dadurch werden -doppelte Umrechnungen und Rundungsfehler vermieden und die Raender werden -im Lineal auch an der Position angezeigt, den Sie auch im Dokument haben. -Dadurch kann die Applikation zum Beispiel bei Tabellendarstellung auch -eigene Rundungen vornehmen und die Positionen im Lineal passen trotzdem noch -zu denen im Dokument. Damit aber das Lineal weiss, wie das Dokument auf dem -Bildschirm dargestellt wird, muessen noch ein paar zusaetzliche Werte -eingestellt werden. - -Mit SetWinPos() wird der Offset des Edit-Fenster zum Lineal eingestellt. -Dabei kann auch die Breite des Fensters eingestellt werden. Wenn bei den -Werten 0 uebergeben wird, wird die Position/Breite vom Fenster automatisch -so breit gesetzt, wie das Lineal breit ist. - -Mit SetPagePos() wird der Offset der Seite zum Edit-Fenster eingestellt und -die Breite der Seite eingestellt. Wenn bei den Werten 0 uebergeben wird, -wird die Position/Breite automatisch so gesetzt, als ob die Seite das ganze -Editfenster ausfuellen wuerde. - -Mit SetBorderPos() kann der Offset eingestellt werden, ab dem der -Border ausgegeben wird. Die Position bezieht sich auf die linke bzw. obere -Fensterkante. Dies wird gebraucht, wenn ein horizontales und vertikales -Lineal gleichzeitig sichtbar sind. Beispiel: - aHRuler.SetBorderPos( aVRuler.GetSizePixel().Width()-1 ); - -Mit SetNullOffset() wird der Null-Punkt bezogen auf die Seite gesetzt. - -Alle anderen Werte (Raender, Einzug, Tabs, ...) beziehen sich auf den 0 Punkt, -der mit SetNullOffset() eingestellt wird. - -Die Werte werden zum Beispiel folgendermassen berechnet: - -- WinPos (wenn beide Fenster den gleichen Parent haben) - - Point aHRulerPos = aHRuler.GetPosPixel(); - Point aEditWinPos = aEditWin.GetPosPixel(); - aHRuler.SetWinPos( aEditWinPos().X() - aHRulerPos.X() ); - -- PagePos - - Point aPagePos = aEditWin.LogicToPixel( aEditWin.GetPagePos() ); - aHRuler.SetPagePos( aPagePos().X() ); - -- Alle anderen Werte - - Die logischen Werte zusammenaddieren, als Position umrechnen und - die vorher gemerkten Pixel-Positionen (von PagePos und NullOffset) - entsprechend abziehen. - --------------------------------------------------------------------------- - -Mit SetUnit() und SetZoom() wird eingestellt, in welcher Einheit das Lineal -die Werte anzeigt. Folgende Einheiten werden akzeptiert: - - FUNIT_MM - FUNIT_CM (Default) - FUNIT_M - FUNIT_KM - FUNIT_INCH - FUNIT_FOOT - FUNIT_MILE - FUNIT_POINT - FUNIT_PICA - --------------------------------------------------------------------------- - -Mit SetMargin1() kann der linke/obere Rand und mit SetMargin2() kann -der rechte/untere Rand gesetzt werden. Falls diese Methoden ohne Parameter -aufgerufen werden, werden keine Raender angezeigt. Wenn SetMargin1() bzw. -SetMargin2() mit Parametern aufgerufen werden, kann bei diesen -folgendes angegeben werden: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_MARGIN_SIZEABLE - Rand kann in der Groesse veraendert werden. - - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - - -Mit SetBorders() kann ein Array von Raendern gesetzt werden. Dabei muss -ein Array vom Typ RulerBorder uebergeben werden, wobei folgende Werte -initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - long nWidth - Breite des Spaltenabstands in Pixel (kann zum - Beispiel fuer Tabellenspalten auch 0 sein) - USHORT nStyle - Bit-Style: - RULER_BORDER_SIZEABLE - Spaltenabstand kann in der Groesse veraendert - werden. Dieses Flag sollte nur gesetzt werden, - wenn ein Abstand in der Groesse geaendert wird - und nicht die Groesse einer Zelle. - RULER_BORDER_MOVEABLE - Spaltenabstand/Begrenzung kann verschoben - werden. Wenn Tabellenbegrenzungen verschoben - werden, sollte dieses Flag gesetzt werden und - nicht Sizeable. Denn Sizeable gibt an, das - ein Abstand vergroessert werden kann und nicht - eine einzelne Zelle in der Groesse geaendert - werden kann. - RULER_BORDER_VARIABLE - Nicht alle Spaltenabstande sind gleich - RULER_BORDER_TABLE - Tabellenrahmen. Wenn dieser Style gesetzt - wird, muss die Spaltenbreite 0 sein. - RULER_BORDER_SNAP - Hilfslinie / Fanglinie. Wenn dieser Style - gesetzt wird, muss die Spaltenbreite 0 sein. - RULER_BORDER_MARGIN - Margin. Wenn dieser Style gesetzt wird, - muss die Spaltenbreite 0 sein. - - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetIndents() kann ein Array von Indents gesetzt werden. Diese Methode darf -nur angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als -Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende -Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_INDENT_TOP (Erstzeileneinzug) - RULER_INDENT_BOTTOM (Linker/Rechter Einzug) - RULER_INDENT_BORDER (Verical line that shows the border distance) - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_DONTKNOW (fuer alte Position oder - fuer Uneindeutigkeit) - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetTabs() kann ein Array von Tabs gesetzt werden. Diese Methode darf nur -angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als -Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende -Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_TAB_DEFAULT (kann nicht selektiert werden) - RULER_TAB_LEFT - RULER_TAB_CENTER - RULER_TAB_RIGHT - RULER_TAB_DECIMAL - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_DONTKNOW (fuer alte Position oder - fuer Uneindeutigkeit) - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetLines() koennen Positionslinien im Lineal angezeigt werden. Dabei -muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte -initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) - -Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn -Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen -mehr angezeigt. Deshalb sollten die Bemassungspfeile immer ueber die ganze -Linealbreite gesetzt werden. Dabei muss ein Array vom Typ RulerArrow -uebergeben werden, wobei folgende Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - long nWidth - Breite des Pfeils - long nLogWidth - Breite des Pfeils in logischer Einheit - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) - -Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen -Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die -Einheiten MAP_TWIP und MAP_100TH_MM (default) akzeptiert. - --------------------------------------------------------------------------- - -Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal -geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu -muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden. -Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben -von FALSE das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position -abgefragt werden und die Werte muessen an die neue Position verschoben werden. -Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich -im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst -danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber -entsprechende Set..Hdl()-Methoden gesetzt werden. - - - StartDrag() - Wird gerufen, wenn das Draggen gestartet wird. Wenn FALSE - zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei TRUE - wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert - wird, wird FALSE zurueckgegeben. - - - EndDrag() - Wird gerufen, wenn das Draggen beendet wird. - - - Drag() - Wird gerufen, wenn gedragt wird. - - - Click() - Dieser Handler wird gerufen, wenn kein Element angeklickt wurde. - Die Position kann mit GetClickPos() abgefragt werden. Dadurch - kann man zum Beispiel Tabs in das Lineal setzen. Nach Aufruf des - Click-Handlers wird gegebenenfalls das Drag sofort ausgeloest. Dadurch - ist es moeglich, einen neuen Tab im Click-Handler zu setzen und - danach gleich zu verschieben. - - - DoubleClick() - Dieser Handler wird gerufen, wenn ein DoubleClick ausserhalb des - Extrafeldes gemacht wurde. Was angeklickt wurde, kann mit - GetClickType(), GetClickAryPos() und GetClickPos() abgefragt werden. - Somit kann man zum Beispiel den Tab-Dialog anzeigen, wenn ein - Tab mit einem DoubleClick betaetigt wurde. - -Im Drag-Handler kann man abfragen, was und wohin gedragt wurde. Dazu gibt -es folgende Abfrage-Methoden. - - - GetDragType() - Liefert zurueck, was gedragt wird: - RULER_TYPE_MARGIN1 - RULER_TYPE_MARGIN2 - RULER_TYPE_BORDER - RULER_TYPE_INDENT - RULER_TYPE_TAB - - - GetDragPos() - Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset - zurueck, wohin der Anwender die Maus bewegt hat. - - - GetDragAryPos() - Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein - Tab gedragt wird. Achtung: Es wird die Array-Position waehrend des - gesammten Drag-Vorgangs von dem Item im Array was vor dem Drag gesetzt - war zurueckgeben. Dadurch ist es zum Beispiel auch moeglich, einen - Tab nicht mehr anzuzeigen, wenn die Maus nach unten/rechts aus dem - Lineal gezogen wird. - - - GetDragSize() - Wenn Borders gedragt werden, kann hierueber abgefragt werden, ob - die Groesse bzw. welche Seite oder die Position geaendert werden soll. - RULER_DRAGSIZE_MOVE oder 0 - Move - RULER_DRAGSIZE_1 - Linke/obere Kante - RULER_DRAGSIZE_2 - Rechte/untere Kante - - - IsDragDelete() - Mit dieser Methode kann abgefragt werden, ob beim Draggen die - Maus unten/rechts aus dem Fenster gezogen wurde. Damit kann - zum Beispiel festgestellt werden, ob der Benutzer einen Tab - loeschen will. - - - IsDragCanceled() - Mit dieser Methode kann im EndDrag-Handler abgefragt werden, - ob die Aktion abgebrochen wurde, indem der Anwender die - Maus oben/links vom Fenster losgelassen hat oder ESC gedrueckt - hat. In diesem Fall werden die Werte nicht uebernommen. Wird - waehrend des Draggings die Maus oben/links aus dem Fenster - gezogen, werden automatisch die alten Werte dargestellt, ohne das - der Drag-Handler gerufen wird. - Falls der Benutzer jedoch den Wert auf die alte Position - zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls - dies vermieden werden soll, muss sich die Applikation im StartDrag- - Handler den alten Wert merken und im EndDrag-Handler den Wert - vergleichen. - - - GetDragScroll() - Mit dieser Methode kann abgefragt werden, ob gescrollt werden - soll. Es wird einer der folgenden Werte zurueckgegeben: - RULER_SCROLL_NO - Drag-Position befindet sich - an keinem Rand und somit - muss nicht gescrollt werden. - RULER_SCROLL_1 - Drag-Position befindet sich - am linken/oberen Rand und - somit sollte das Programm evt. - ein Srcoll ausloesen. - RULER_SCROLL_2 - Drag-Position befindet sich - am rechten/unteren Rand und - somit sollte das Programm evt. - ein Srcoll ausloesen. - - - GetDragModifier() - Liefert die Modifier-Tasten zurueck, die beim Starten des Drag- - Vorgangs gedrueckt waren. Siehe MouseEvent. - - - GetClickPos() - Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset - zurueck, wo der Anwender die Maus gedrueckt hat. - - - GetClickType() - Liefert zurueck, was per DoubleClick betaetigt wird: - RULER_TYPE_DONTKNOW (kein Element im Linealbereich) - RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) - RULER_TYPE_MARGIN1 (nur Margin1-Kante) - RULER_TYPE_MARGIN2 (nur Margin2-Kante) - RULER_TYPE_BORDER (Border: GetClickAryPos()) - RULER_TYPE_INDENT (Einzug: GetClickAryPos()) - RULER_TYPE_TAB (Tab: GetClickAryPos()) - - - GetClickAryPos() - Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein - Tab per DoubleClick betaetigt wird. - - - GetType() - Mit dieser Methode kann man einen HitTest durchfuehren, um - gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers - auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als - Paramter ueber gibt man die Fensterposition und gegebenenfalls - einen Pointer auf einen USHORT, um die Array-Position eines - Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende - Werte zurueckgegeben: - RULER_TYPE_DONTKNOW (kein Element im Linealbereich) - RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) - RULER_TYPE_MARGIN1 (nur Margin1-Kante) - RULER_TYPE_MARGIN2 (nur Margin2-Kante) - RULER_TYPE_BORDER (Border: GetClickAryPos()) - RULER_TYPE_INDENT (Einzug: GetClickAryPos()) - RULER_TYPE_TAB (Tab: GetClickAryPos()) - -Wenn der Drag-Vorgang abgebrochen werden soll, kann der Drag-Vorgang -mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die -Drag-Steuerung: - - - IsDrag() - Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. - - - CancelDrag() - Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei - werden die alten Werte wieder hergestellt und der Drag und der - EndDrag-Handler gerufen. - -Um vom Dokument ein Drag auszuloesen, gibt es folgende Methoden: - - - StartDocDrag() - Dieser Methode werden der MouseEvent vom Dokumentfenster und - was gedragt werden soll uebergeben. Wenn als DragType - RULER_TYPE_DONTKNOW uebergeben wird, bestimmt das Lineal, was - verschoben werden soll. Bei den anderen, wird der Drag nur dann - gestartet, wenn auch an der uebergebenen Position ein entsprechendes - Element gefunden wurde. Dies ist zun Beispiel dann notwendig, wenn - zum Beispiel Einzuege und Spalten an der gleichen X-Position liegen. - Der Rueckgabewert gibt an, ob der Drag ausgeloest wurde. Wenn ein - Drag ausgeloest wird, uebernimmt das Lineal die normale Drag-Steuerung - und verhaelt sich dann so, wie als wenn direkt in das Lineal geklickt - wurde. So captured das Lineal die Mouse und uebernimmt auch die - Steuerung des Cancel (ueber Tastatur, oder wenn die Mouse ueber - oder links vom Lineal ruasgeschoben wird). Auch alle Handler werden - gerufen (inkl. des StartDrag-Handlers). Wenn ein MouseEvent mit - Click-Count 2 uebergeben wird auch der DoubleClick-Handler - entsprechend gerufen. - - - GetDocType() - Dieser Methode wird die Position vom Dokumentfenster uebergeben und - testet, was sich unter der Position befindet. Dabei kann wie bei - StartDocDrag() der entsprechende Test auf ein bestimmtes Element - eingeschraenkt werden. Im Gegensatz zu GetType() liefert diese - Methode immer DontKnow zurueck, falls kein Element getroffen wurde. - Falls man den HitTest selber durchfuehren moechte, kann man - folgende Defines fuer die Toleranz benutzen (Werte gelten fuer - eine Richtung): - RULER_MOUSE_TABLEWIDTH - fuer Tabellenspalten - RULER_MOUSE_MARGINWIDTH - fuer Margins - --------------------------------------------------------------------------- - -Fuer das Extra-Feld kann der Inhalt bestimmt werden und es gibt Handler, -womit man bestimmte Aktionen abfangen kann. - - - ExtraDown() - Dieser Handler wird gerufen, wenn im Extra-Feld die Maus - gedrueckt wird. - - - SetExtraType() - Mit dieser Methode kann festgelegt werden, was im ExtraFeld - dargestellt werden soll. - - ExtraType Was im Extrafeld dargestellt werden soll - RULER_EXTRA_DONTKNOW (Nichts) - RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) - RULER_EXTRA_TAB (Tab) - - USHORT nStyle Bitfeld als Style: - RULER_STYLE_HIGHLIGHT (selektiert) - RULER_TAB_... (ein Tab-Style) - - - GetExtraClick() - Liefert die Anzahl der Mausclicks zurueck. Dadurch ist es zum - Beispiel auch moeglich, auch durch einen DoubleClick im Extrafeld - eine Aktion auszuloesen. - - - GetExtraModifier() - Liefert die Modifier-Tasten zurueck, die beim Klicken in das Extra- - Feld gedrueckt waren. Siehe MouseEvent. - --------------------------------------------------------------------------- - -Weitere Hilfsfunktionen: - -- static Ruler::DrawTab() - Mit dieser Methode kann ein Tab auf einem OutputDevice ausgegeben - werden. Dadurch ist es moeglich, auch in Dialogen die Tabs so - anzuzeigen, wie Sie im Lineal gemalt werden. - - Diese Methode gibt den Tab zentriert an der uebergebenen Position - aus. Die Groesse der Tabs kann ueber die Defines RULER_TAB_WIDTH und - RULER_TAB_HEIGHT bestimmt werden. - --------------------------------------------------------------------------- - -Tips zur Benutzung des Lineals: - -- Bei dem Lineal muss weder im Drag-Modus noch sonst das Setzen der Werte - in SetUpdateMode() geklammert werden. Denn das Lineal sorgt von sich - aus dafuer, das wenn mehrere Werte gesetzt werden, diese automatisch - zusammengefast werden und flackerfrei ausgegeben werden. - -- Initial sollten beim Lineal zuerst die Groessen, Positionen und Werte - gesetzt werden, bevor es angezeigt wird. Dies ist deshalb wichtig, da - ansonsten viele Werte unnoetig berechnet werden. - -- Wenn das Dokumentfenster, in dem sich das Lineal befindet aktiv bzw. - deaktiv wird, sollten die Methoden Activate() und Deactivate() vom - Lineal gerufen werden. Denn je nach Einstellungen und System wird die - Anzeige entsprechend umgeschaltet. - -- Zum Beispiel sollte beim Drag von Tabs und Einzuegen nach Moeglichkeit die - alten Positionen noch mit angezeigt werden. Dazu sollte zusaetzlich beim - Setzen der Tabs und Einzuege als erstes im Array die alten Positionen - eingetragen werden und mit dem Style RULER_STYLE_DONTKNOW verknuepft - werden. Danach sollte im Array die restlichen Werte eingetragen werden. - -- Bei mehreren markierten Absaetzen und Tabellen-Zellen, sollten die Tabs - und Einzuege in grau von der ersten Zelle, bzw. vom ersten Absatz - angezeigt werden. Dies kann man auch ueber den Style RULER_STYLE_DONTKNOW - erreichen. - -- Die Bemassungspfeile sollten immer dann angezeigt, wenn beim Drag die - Alt-Taste (WW-Like) gedrueckt wird. Vielleicht sollte diese Einstellung - auch immer vornehmbar sein und vielleicht beim Drag immer die - Bemassungspfeile dargestellt werden. Bei allen Einstellung sollten die - Werte immer auf ein vielfaches eines Wertes gerundet werden, da die - Bildschirmausloesung sehr ungenau ist. - -- DoppelKlicks sollten folgendermassen behandelt werden (GetClickType()): - - RULER_TYPE_DONTKNOW - RULER_TYPE_MARGIN1 - RULER_TYPE_MARGIN2 - Wenn die Bedingunden GetClickPos() <= GetMargin1() oder - GetClickPos() >= GetMargin2() oder der Type gleich - RULER_TYPE_MARGIN1 oder RULER_TYPE_MARGIN2 ist, sollte - ein SeitenDialog angezeigt werden, wo der Focus auf dem - entsprechenden Rand steht - - RULER_TYPE_BORDER - Es sollte ein Spalten- oder Tabellen-Dialog angezeigt werden, - wo der Focus auf der entsprechenden Spalte steht, die mit - GetClickAryPos() abgefragt werden kann. - - RULER_TYPE_INDENT - Es sollte der Dialog angezeigt werden, wo die Einzuege eingestellt - werden koennen. Dabei sollte der Focus auf dem Einzug stehen, der - mit GetClickAryPos() ermittelt werden kann. - - RULER_TYPE_TAB - Es sollte ein TabDialog angezeigt werden, wo der Tab selektiert - sein sollte, der ueber GetClickAryPos() abgefragt werden kann. - -*************************************************************************/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_EXTRAFIELD ((WinBits)0x00004000) -#define WB_RIGHT_ALIGNED ((WinBits)0x00008000) -#define WB_STDRULER WB_HORZ - -// --------------- -// - Ruler-Types - -// --------------- - -struct ImplRulerHitTest; - -// -------------- -// - Ruler-Type - -// -------------- - -enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, - RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2, - RULER_TYPE_BORDER, RULER_TYPE_INDENT, RULER_TYPE_TAB }; - -enum RulerExtra { RULER_EXTRA_DONTKNOW, - RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; - -#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) -#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) -#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) - -#define RULER_DRAGSIZE_MOVE 0 -#define RULER_DRAGSIZE_1 1 -#define RULER_DRAGSIZE_2 2 - -#define RULER_MOUSE_BORDERMOVE 5 -#define RULER_MOUSE_BORDERWIDTH 5 -#define RULER_MOUSE_TABLEWIDTH 1 -#define RULER_MOUSE_MARGINWIDTH 3 - -#define RULER_SCROLL_NO 0 -#define RULER_SCROLL_1 1 -#define RULER_SCROLL_2 2 - -// --------------- -// - RulerMargin - -// --------------- - -#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) - -// --------------- -// - RulerBorder - -// --------------- - -#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) -#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) -#define RULER_BORDER_VARIABLE ((USHORT)0x0004) -#define RULER_BORDER_TABLE ((USHORT)0x0008) -#define RULER_BORDER_SNAP ((USHORT)0x0010) -#define RULER_BORDER_MARGIN ((USHORT)0x0020) - -struct RulerBorder -{ - long nPos; - long nWidth; - USHORT nStyle; - //minimum/maximum position, supported for table borders/rows - long nMinPos; - long nMaxPos; -}; - -// --------------- -// - RulerIndent - -// --------------- - -#define RULER_INDENT_TOP ((USHORT)0x0000) -#define RULER_INDENT_BOTTOM ((USHORT)0x0001) -#define RULER_INDENT_BORDER ((USHORT)0x0002) -#define RULER_INDENT_STYLE ((USHORT)0x000F) - -struct RulerIndent -{ - long nPos; - USHORT nStyle; -}; - -// ------------ -// - RulerTab - -// ------------ - -#define RULER_TAB_LEFT ((USHORT)0x0000) -#define RULER_TAB_RIGHT ((USHORT)0x0001) -#define RULER_TAB_DECIMAL ((USHORT)0x0002) -#define RULER_TAB_CENTER ((USHORT)0x0003) -#define RULER_TAB_DEFAULT ((USHORT)0x0004) -#define RULER_TAB_STYLE ((USHORT)0x000F) -#define RULER_TAB_RTL ((USHORT)0x0010) - -struct RulerTab -{ - long nPos; - USHORT nStyle; -}; - -#define RULER_TAB_WIDTH 7 -#define RULER_TAB_HEIGHT 6 - -// ------------- -// - RulerLine - -// ------------- - -struct RulerLine -{ - long nPos; - USHORT nStyle; -}; - -// -------------- -// - RulerArrow - -// -------------- - -struct RulerArrow -{ - long nPos; - long nWidth; - long nLogWidth; - USHORT nStyle; -}; - -class ImplRulerData; -// --------- -// - Ruler - -// --------- - -class SVT_DLLPUBLIC Ruler : public Window -{ -private: - VirtualDevice maVirDev; - MapMode maMapMode; - long mnBorderOff; - long mnWinOff; - long mnWinWidth; - long mnWidth; - long mnHeight; - long mnVirOff; - long mnVirWidth; - long mnVirHeight; - long mnBorderWidth; - long mnStartDragPos; - long mnDragPos; - ULONG mnUpdateEvtId; - ImplRulerData* mpSaveData; - ImplRulerData* mpData; - ImplRulerData* mpDragData; - Rectangle maExtraRect; - WinBits mnWinStyle; - USHORT mnUnitIndex; - USHORT mnDragAryPos; - USHORT mnDragSize; - USHORT mnDragScroll; - USHORT mnDragModifier; - USHORT mnExtraStyle; - USHORT mnExtraClicks; - USHORT mnExtraModifier; - RulerExtra meExtraType; - RulerType meDragType; - MapUnit meSourceUnit; - FieldUnit meUnit; - Fraction maZoom; - BOOL mbCalc; - BOOL mbFormat; - BOOL mbDrag; - BOOL mbDragDelete; - BOOL mbDragCanceled; - BOOL mbAutoWinWidth; - BOOL mbActive; - BYTE mnUpdateFlags; - Link maStartDragHdl; - Link maDragHdl; - Link maEndDragHdl; - Link maClickHdl; - Link maDoubleClickHdl; - Link maExtraDownHdl; - -#ifdef _SV_RULER_CXX - SVT_DLLPRIVATE void ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 ); - SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 ); - SVT_DLLPRIVATE void ImplVDrawText( long nX, long nY, const String& rText ); - - SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); - SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); - SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); - SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); - SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplCalc(); - SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); - SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); - SVT_DLLPRIVATE void ImplDraw(); - SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); - using Window::ImplHitTest; - SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, - ImplRulerHitTest* pHitTest, - BOOL bRequiredStyle = FALSE, - USHORT nRequiredStyle = 0 ) const; - SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; - SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); - SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); - SVT_DLLPRIVATE void ImplEndDrag(); - DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); -#endif - - // Forbidden and not implemented. - Ruler (const Ruler &); - Ruler & operator= (const Ruler &); - -public: - Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); - virtual ~Ruler(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual long StartDrag(); - virtual void Drag(); - virtual void EndDrag(); - virtual void Click(); - virtual void DoubleClick(); - virtual void ExtraDown(); - - void Activate(); - void Deactivate(); - BOOL IsActive() const { return mbActive; } - - void SetWinPos( long nOff = 0, long nWidth = 0 ); - long GetWinOffset() const { return mnWinOff; } - long GetWinWidth() const { return mnWinWidth; } - void SetPagePos( long nOff = 0, long nWidth = 0 ); - long GetPageOffset() const; - long GetPageWidth() const; - void SetBorderPos( long nOff = 0 ); - long GetBorderOffset() const { return mnBorderOff; } - Rectangle GetExtraRect() const { return maExtraRect; } - - void SetUnit( FieldUnit eNewUnit ); - FieldUnit GetUnit() const { return meUnit; } - void SetZoom( const Fraction& rNewZoom ); - Fraction GetZoom() const { return maZoom; } - - void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } - MapUnit GetSourceUnit() const { return meSourceUnit; } - - void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); - RulerExtra GetExtraType() const { return meExtraType; } - USHORT GetExtraStyle() const { return mnExtraStyle; } - USHORT GetExtraClicks() const { return mnExtraClicks; } - USHORT GetExtraModifier() const { return mnExtraModifier; } - - BOOL StartDocDrag( const MouseEvent& rMEvt, - RulerType eDragType = RULER_TYPE_DONTKNOW ); - RulerType GetDocType( const Point& rPos, - RulerType eDragType = RULER_TYPE_DONTKNOW, - USHORT* pAryPos = NULL ) const; - RulerType GetDragType() const { return meDragType; } - long GetDragPos() const { return mnDragPos; } - USHORT GetDragAryPos() const { return mnDragAryPos; } - USHORT GetDragSize() const { return mnDragSize; } - BOOL IsDragDelete() const { return mbDragDelete; } - BOOL IsDragCanceled() const { return mbDragCanceled; } - USHORT GetDragScroll() const { return mnDragScroll; } - USHORT GetDragModifier() const { return mnDragModifier; } - BOOL IsDrag() const { return mbDrag; } - void CancelDrag(); - long GetClickPos() const { return mnDragPos; } - RulerType GetClickType() const { return meDragType; } - USHORT GetClickAryPos() const { return mnDragAryPos; } - using Window::GetType; - RulerType GetType( const Point& rPos, - USHORT* pAryPos = NULL ) const; - - void SetNullOffset( long nPos ); - long GetNullOffset() const; - void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); - long GetMargin1() const; - USHORT GetMargin1Style() const; - void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); - long GetMargin2() const; - USHORT GetMargin2Style() const; - - void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); - USHORT GetLineCount() const; - const RulerLine* GetLines() const; - - void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); - USHORT GetArrowCount() const; - const RulerArrow* GetArrows() const; - - void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); - USHORT GetBorderCount() const; - const RulerBorder* GetBorders() const; - - void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); - USHORT GetIndentCount() const; - const RulerIndent* GetIndents() const; - - void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); - USHORT GetTabCount() const; - const RulerTab* GetTabs() const; - - static void DrawTab( OutputDevice* pDevice, - const Point& rPos, USHORT nStyle ); - - void SetStyle( WinBits nStyle ); - WinBits GetStyle() const { return mnWinStyle; } - - void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } - const Link& GetStartDragHdl() const { return maStartDragHdl; } - void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } - const Link& GetDragHdl() const { return maDragHdl; } - void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } - const Link& GetEndDragHdl() const { return maEndDragHdl; } - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; } - const Link& GetExtraDownHdl() const { return maExtraDownHdl; } - - //set text direction right-to-left - void SetTextRTL(BOOL bRTL); -}; - -#endif // _RULER_HXX diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/scriptedtext.hxx deleted file mode 100644 index 0bf026b11ced..000000000000 --- a/svtools/inc/scriptedtext.hxx +++ /dev/null @@ -1,132 +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: scriptedtext.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_SCRIPTEDTEXT_HXX -#define _SVTOOLS_SCRIPTEDTEXT_HXX - -#include "svtools/svtdllapi.h" -#include -#include - - -namespace rtl { class OUString; } -class OutputDevice; -class Font; -class SvtScriptedTextHelper_Impl; - - -//_____________________________________________________________________________ - -/** -This class provides drawing text with different script types on any output devices. -*/ -class SVT_DLLPUBLIC SvtScriptedTextHelper -{ -private: - SvtScriptedTextHelper_Impl* mpImpl; /// Implementation of class functionality. - - /** Assignment operator not implemented to prevent usage. */ - SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ); - -public: - /** Constructor sets an output device and no fonts. - @param _rOutDevice - A reference to an output device. */ - SvtScriptedTextHelper( OutputDevice& _rOutDevice ); - - /** Constructor sets an output device and fonts for all script types. - @param _rOutDevice - A reference to an output device. - @param _pLatinFont - The font for latin characters. - @param _pAsianFont - The font for asian characters. - @param _pCmplxFont - The font for complex text layout. */ - SvtScriptedTextHelper( - OutputDevice& _rOutDevice, - Font* _pLatinFont, - Font* _pAsianFont, - Font* _pCmplxFont ); - - /** Copy constructor. */ - SvtScriptedTextHelper( - const SvtScriptedTextHelper& _rCopy ); - - /** Destructor. */ - virtual ~SvtScriptedTextHelper(); - - /** Sets new fonts and recalculates the text width. - @param _pLatinFont - The font for latin characters. - @param _pAsianFont - The font for asian characters. - @param _pCmplxFont - The font for complex text layout. */ - void SetFonts( Font* _pLatinFont, Font* _pAsianFont, Font* _pCmplxFont ); - - /** Sets the default font of the current output device to all script types. */ - void SetDefaultFont(); - - /** Sets a new text and calculates all script breaks and the text width. - @param _rText - The new text. - @param _xBreakIter - The break iterator for iterating through the script portions. */ - void SetText( - const ::rtl::OUString& _rText, - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); - - /** Returns the previously set text. - @return The current text. */ - const ::rtl::OUString& GetText() const; - - /** Returns the calculated width the text will take in the current output device. - @return The calculated text width. */ - sal_Int32 GetTextWidth() const; - - /** Returns the maximum height the text will take in the current output device. - @return The maximum text height. */ - sal_Int32 GetTextHeight() const; - - /** Returns a size struct containing the width and height of the text in the current output device. - @return A size struct with the text dimensions. */ - const Size& GetTextSize() const; - - /** Draws the text in the current output device. - @param _rPos - The position of the top left edge of the text. */ - void DrawText( const Point& _rPos ); -}; - -//_____________________________________________________________________________ - -#endif - diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx deleted file mode 100644 index c4c06aeb96ab..000000000000 --- a/svtools/inc/scrwin.hxx +++ /dev/null @@ -1,115 +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: scrwin.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SCRWIN_HXX -#define _SCRWIN_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _SCRBAR_HXX //autogen -#include -#endif - -class DataChangedEvent; - -// ------------------------- -// - ScrollableWindow-Type - -// ------------------------- - -typedef USHORT ScrollableWindowFlags; - -#define SCRWIN_THUMBDRAGGING 1 -#define SCRWIN_VCENTER 2 -#define SCRWIN_HCENTER 4 -#define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) - -// -------------------- -// - ScrollableWindow - -// -------------------- - -class SVT_DLLPUBLIC ScrollableWindow: public Window -{ -private: - Point aPixOffset; // offset to virtual window (pixel) - Size aTotPixSz; // total size of virtual window (pixel) - long nLinePixH; // size of a line/column (pixel) - long nColumnPixW; - - ScrollBar aVScroll; // the scrollbars - ScrollBar aHScroll; - ScrollBarBox aCornerWin; // window in the bottom right corner - BOOL bScrolling:1, // user controlled scrolling - bHandleDragging:1, // scroll window while dragging - bHCenter:1, - bVCenter:1; - -#ifdef _SVT_SCRWIN_CXX - SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); - DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); -#endif - -public: - ScrollableWindow( Window* pParent, WinBits nBits = 0, - ScrollableWindowFlags = SCRWIN_DEFAULT ); - ScrollableWindow( Window* pParent, const ResId& rId, - ScrollableWindowFlags = SCRWIN_DEFAULT ); - - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& rDEvt ); - - virtual void StartScroll(); - virtual void EndScroll( long nDeltaX, long nDeltaY ); - - using OutputDevice::SetMapMode; - virtual void SetMapMode( const MapMode& rNewMapMode ); - virtual MapMode GetMapMode() const; - - void SetTotalSize( const Size& rNewSize ); - Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } - - void SetVisibleSize( const Size& rNewSize ); - BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); - Rectangle GetVisibleArea() const; - - void SetLineSize( ULONG nHorz, ULONG nVert ); - using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); - void ScrollLines( long nLinesX, long nLinesY ); - void ScrollPages( long nPagesX, ULONG nOverlapX, - long nPagesY, ULONG nOverlapY ); - -private: - SVT_DLLPRIVATE Size GetOutputSizePixel() const; - SVT_DLLPRIVATE Size GetOutputSize() const; -}; - -#endif diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/sfxecode.hxx deleted file mode 100644 index d87fff819748..000000000000 --- a/svtools/inc/sfxecode.hxx +++ /dev/null @@ -1,121 +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: sfxecode.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFXECODE_HXX -#define _SFXECODE_HXX - -#include - -#define ERRCODE_SFX_NOSTDTEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1) -#define ERRCODE_SFX_NOTATEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2) -#define ERRCODE_SFX_GENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3) -#define ERRCODE_SFX_DOLOADFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4) -#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5) -#define ERRCODE_SFX_COMMITFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6) -#define ERRCODE_SFX_HANDSOFFFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7) -#define ERRCODE_SFX_DOINITNEWFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8) -#define ERRCODE_SFX_CANTREADDOCINFO (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9) -#define ERRCODE_SFX_ALREADYOPEN (ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10) -#define ERRCODE_SFX_WRONGPASSWORD (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11) -#define ERRCODE_SFX_DOCUMENTREADONLY (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12) -#define ERRCODE_SFX_OLEGENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14) -#define ERRCODE_SFXMSG_STYLEREPLACE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13) -#define ERRCODE_SFX_TEMPLATENOTFOUND (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15) -#define ERRCODE_SFX_ISRELATIVE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16) -#define ERRCODE_SFX_FORCEDOCLOAD (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17) - -#define ERRCODE_SFX_CANTFINDORIGINAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19) -#define ERRCODE_SFX_RESTART (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20) -#define ERRCODE_SFX_CANTCREATECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21) -#define ERRCODE_SFX_CANTCREATELINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22) -#define ERRCODE_SFX_WRONGBMKFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23) -#define ERRCODE_SFX_WRONGICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24) -#define ERRCODE_SFX_CANTDELICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25) -#define ERRCODE_SFX_CANTWRITEICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26) -#define ERRCODE_SFX_CANTRENAMECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27) -#define ERRCODE_SFX_INVALIDBMKPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28) -#define ERRCODE_SFX_CANTWRITEURLCFGFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29) -#define ERRCODE_SFX_WRONGURLCFGFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30) -#define ERRCODE_SFX_NODOCUMENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31) -#define ERRCODE_SFX_INVALIDLINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32) -#define ERRCODE_SFX_INVALIDTRASHPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33) -#define ERRCODE_SFX_NOTRESTORABLE (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34) -#define ERRCODE_SFX_NOTRASH (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35) -#define ERRCODE_SFX_INVALIDSYNTAX (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36) -#define ERRCODE_SFX_CANTCREATEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37) -#define ERRCODE_SFX_CANTRENAMEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38) -#define ERRCODE_SFX_WRONG_CDF_FORMAT (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39) -#define ERRCODE_SFX_EMPTY_SERVER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40) -#define ERRCODE_SFX_NO_ABOBOX (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41) -#define ERRCODE_SFX_CANTGETPASSWD (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42) -#define ERRCODE_SFX_TARGETFILECORRUPTED (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43) -#define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 44) -#define ERRCODE_SFX_NOFILTER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45) -#define ERRCODE_SFX_FORCEQUIET (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47) -#define ERRCODE_SFX_CONSULTUSER (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48) -#define ERRCODE_SFX_NEVERCHECKCONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49) -#define ERRCODE_SFX_CANTCREATEBACKUP (ERRCODE_AREA_SFX | ERRCODE_CLASS_CREATE | 50) -#define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51) -#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52) -#define ERRCODE_SFX_BROKENSIGNATURE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53) -#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54) -#define ERRCODE_SFX_INCOMPLETE_ENCRYPTION (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55) - - - -//Dies und das -#define ERRCTX_ERROR 21 -#define ERRCTX_WARNING 22 - -//Documentkontexte -#define ERRCTX_SFX_LOADTEMPLATE 1 -#define ERRCTX_SFX_SAVEDOC 2 -#define ERRCTX_SFX_SAVEASDOC 3 -#define ERRCTX_SFX_DOCINFO 4 -#define ERRCTX_SFX_DOCTEMPLATE 5 -#define ERRCTX_SFX_MOVEORCOPYCONTENTS 6 - -//Appkontexte -#define ERRCTX_SFX_DOCMANAGER 50 -#define ERRCTX_SFX_OPENDOC 51 -#define ERRCTX_SFX_NEWDOCDIRECT 52 -#define ERRCTX_SFX_NEWDOC 53 - -//Organizerkontexte -#define ERRCTX_SFX_CREATEOBJSH 70 - -//BASIC-Kontexte -#define ERRCTX_SFX_LOADBASIC 80 - -//Addressbook contexts -#define ERRCTX_SFX_SEARCHADDRESS 90 - -#endif // #ifndef _SFXECODE_HXX - - diff --git a/svtools/inc/soerr.hxx b/svtools/inc/soerr.hxx deleted file mode 100644 index 9d8c9797a79f..000000000000 --- a/svtools/inc/soerr.hxx +++ /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: soerr.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SOERR_HXX -#define _SOERR_HXX - -#include - -// Fehler Codes -#define RID_SO_ERROR_HANDLER 32000 - -#define SO_ERR() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO) -#define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK) - -#define ERRCODE_SO_GENERALERROR (SO_ERR() | 1) -#define ERRCODE_SO_CANT_BINDTOSOURCE (SO_ERR() | 2) -#define ERRCODE_SO_NOCACHE_UPDATED (SO_ERR() | 3) -#define ERRCODE_SO_SOMECACHES_NOTUPDATED (SO_WRN() | 4) -#define ERRCODE_SO_MK_UNAVAILABLE (SO_ERR() | 5) -#define ERRCODE_SO_E_CLASSDIFF (SO_ERR() | 6) -#define ERRCODE_SO_MK_NO_OBJECT (SO_ERR() | 7) -#define ERRCODE_SO_MK_EXCEEDED_DEADLINE (SO_ERR() | 8) -#define ERRCODE_SO_MK_CONNECT_MANUALLY (SO_ERR() | 9) -#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED (SO_ERR() | 10) -#define ERRCODE_SO_NO_INTERFACE (SO_ERR() | 11) -#define ERRCODE_SO_OUT_OF_MEMORY (SO_ERR() | 12) -#define ERRCODE_SO_MK_SYNTAX (SO_ERR() | 13) -#define ERRCODE_SO_MK_REDUCED_TO_SELF (SO_WRN() | 14) -#define ERRCODE_SO_MK_NO_INVERSE (SO_ERR() | 15) -#define ERRCODE_SO_MK_NO_PREFIX (SO_ERR() | 16) -#define ERRCODE_SO_MK_HIM (SO_WRN() | 17) -#define ERRCODE_SO_MK_US (SO_WRN() | 18) -#define ERRCODE_SO_MK_ME (SO_WRN() | 19) -#define ERRCODE_SO_MK_NOT_BINDABLE (SO_ERR() | 20) -#define ERRCODE_SO_NOT_IMPLEMENTED (SO_ERR() | 21) -#define ERRCODE_SO_MK_NO_STORAGE (SO_ERR() | 22) -#define ERRCODE_SO_FALSE (SO_WRN() | 23) -#define ERRCODE_SO_MK_NEED_GENERIC (SO_ERR() | 24) -#define ERRCODE_SO_PENDING (SO_ERR() | 25) -#define ERRCODE_SO_NOT_INPLACEACTIVE (SO_ERR() | 26) -#define ERRCODE_SO_LINDEX (SO_ERR() | 27) -#define ERRCODE_SO_CANNOT_DOVERB_NOW (SO_WRN() | 28) -#define ERRCODE_SO_OLEOBJ_INVALIDHWND (SO_WRN() | 29) -#define ERRCODE_SO_NOVERBS (SO_ERR() | 30) -#define ERRCODE_SO_INVALIDVERB (SO_WRN() | 31) -#define ERRCODE_SO_MK_CONNECT (SO_ERR() | 32) -#define ERRCODE_SO_NOTIMPL (SO_ERR() | 33) -#define ERRCODE_SO_MK_CANTOPENFILE (SO_ERR() | 34) - -// Fehler Contexte -#define RID_SO_ERRCTX 32001 - -#define ERRCTX_SO_DOVERB 1 - - - -#endif - diff --git a/svtools/inc/sores.hxx b/svtools/inc/sores.hxx deleted file mode 100644 index 158810c5b171..000000000000 --- a/svtools/inc/sores.hxx +++ /dev/null @@ -1,182 +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: sores.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// Strings -#define STR_INS_OBJECT 32000 -#define STR_INS_OBJECT_ICON 32001 -#define STR_INS_FILE 32002 -#define STR_INS_FILE_ICON 32003 -#define STR_INS_FILE_LINK 32004 -#define STR_INS_FILE_ICON_LINK 32005 -#define STR_PASTE 32012 -#define STR_ERROR_DDE 32013 -#define STR_ERROR_OBJNOCREATE 32014 -#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 -#define STR_VERB_OPEN 32016 -#define STR_PLUGIN_CANT_SHOW 32017 -#define STR_ERROR_OBJNOCREATE_PLUGIN 32018 -#define STR_INS_PLUGIN 32019 -#define STR_CONVERT_TO 32010 -#define STR_ACTIVATE_AS 32021 -#define STR_QUERYUPDATELINKS 32022 -#define STR_INS_APPLET 32023 -#define STR_VERB_PROPS 32025 -#define STR_FURTHER_OBJECT 32026 -#define STR_EDIT_APPLET 32029 -#define STR_UNKNOWN_SOURCE 32027 - -#define BMP_PLUGIN 32000 -#define BMP_OLEOBJ 32001 -#define MB_PLUGIN 32000 -#define MI_PLUGIN 32000 -#define MI_PLUGIN_DEACTIVATE 1 - -// Sot Format Strings -#define STR_FORMAT_START 32100 -#define STR_FORMAT_STRING (STR_FORMAT_START + 1) -#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) -#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) - // #define STR_FORMAT_PRIVATE (STR_FORMAT_START + 4) - // #define STR_FORMAT_FILE (STR_FORMAT_START + 5) - // #define STR_FORMAT_FILE_LIST (STR_FORMAT_START + 6) -#define STR_FORMAT_RTF (STR_FORMAT_START + 7) -#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) -#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) - // #define STR_FORMAT_ID_SVIM (STR_FORMAT_START + 10) - // #define STR_FORMAT_ID_XFA (STR_FORMAT_START + 11) - // #define STR_FORMAT_ID_EDITENGINE (STR_FORMAT_START + 12) -#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) -#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) -#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) - // #define STR_FORMAT_ID_TREELISTBOX (STR_FORMAT_START + 16) - // #define STR_FORMAT_ID_NATIVE (STR_FORMAT_START + 17) - // #define STR_FORMAT_ID_OWNERLINK (STR_FORMAT_START + 18) -#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) -#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) -#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) -#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22) -#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23) -#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24) -#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25) -#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26) -#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27) -#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28) -#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29) -#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30) -#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31) -#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32) -#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33) -#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34) -#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35) -#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36) -#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37) -#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38) -#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39) -#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40) -#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41) -#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42) -#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43) -#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) -#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) -#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) - // #define STR_FORMAT_ID_FILLED_AREA (STR_FORMAT_START + 47) -#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) -#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) - // #define STR_FORMAT_ID_CHAOS (STR_FORMAT_START + 50) - // #define STR_FORMAT_ID_CNT_MSGATTACHFILE (STR_FORMAT_START + 51) -#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) -#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) -#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) - // #define STR_FORMAT_ID_SYLK_BIGCAPS (STR_FORMAT_START + 55) -#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) -#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) - // #define STR_FORMAT_ID_STARDRAW_TABBAR (STR_FORMAT_START + 58) - // #define STR_FORMAT_ID_SONLK (STR_FORMAT_START + 59) -#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) -#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) -#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) -#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) - // #define STR_FORMAT_ID_NOTES_HNOTE (STR_FORMAT_START + 64) - // #define STR_FORMAT_ID_NOTES_NATIVE (STR_FORMAT_START + 65) -#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) - // #define STR_FORMAT_ID_EVDF (STR_FORMAT_START + 67) - // #define STR_FORMAT_ID_ESDF (STR_FORMAT_START + 68) - // #define STR_FORMAT_ID_IDF (STR_FORMAT_START + 69) - // #define STR_FORMAT_ID_EFTP (STR_FORMAT_START + 70) - // #define STR_FORMAT_ID_EFD (STR_FORMAT_START + 71) - // #define STR_FORMAT_ID_SVX_FORMFIELDEXCH (STR_FORMAT_START + 72) - // #define STR_FORMAT_ID_EXTENDED_TABBAR (STR_FORMAT_START + 73) - // #define STR_FORMAT_ID_SBA_DATAEXCHANGE (STR_FORMAT_START + 74) - // #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75) - // #define STR_FORMAT_ID_SBA_PRIVATE_URL (STR_FORMAT_START + 76) - // #define STR_FORMAT_ID_SBA_TABED (STR_FORMAT_START + 77) - // #define STR_FORMAT_ID_SBA_TABID (STR_FORMAT_START + 78) - // #define STR_FORMAT_ID_SBA_JOIN (STR_FORMAT_START + 79) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR (STR_FORMAT_START + 80) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR (STR_FORMAT_START + 81) - // #define STR_FORMAT_ID_EMBED_SOURCE (STR_FORMAT_START + 82) - // #define STR_FORMAT_ID_LINK_SOURCE (STR_FORMAT_START + 83) - // #define STR_FORMAT_ID_EMBEDDED_OBJ (STR_FORMAT_START + 84) - // #define STR_FORMAT_ID_FILECONTENT (STR_FORMAT_START + 85) -#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) - // #define STR_FORMAT_ID_FILENAME (STR_FORMAT_START + 87) - // #define STR_FORMAT_ID_SD_OLE (STR_FORMAT_START + 88) - // #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE (STR_FORMAT_START + 89) - // #define STR_FORMAT_ID_EMBED_SOURCE_OLE (STR_FORMAT_START + 90) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE (STR_FORMAT_START + 91) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92) - // #define STR_FORMAT_ID_LINK_SOURCE_OLE (STR_FORMAT_START + 93) - // #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE (STR_FORMAT_START + 94) - // #define STR_FORMAT_ID_OUTPLACE_OBJ (STR_FORMAT_START + 95) - // #define STR_FORMAT_ID_CNT_OWN_CLIP (STR_FORMAT_START + 96) - // #define STR_FORMAT_ID_INET_IMAGE (STR_FORMAT_START + 97) - // #define STR_FORMAT_ID_NETSCAPE_IMAGE (STR_FORMAT_START + 98) - // #define STR_FORMAT_ID_SBA_FORMEXCHANGE (STR_FORMAT_START + 99) - // #define STR_FORMAT_ID_SBA_REPORTEXCHANGE (STR_FORMAT_START + 100) - // #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101) -#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) -#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) -#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) -#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105) -#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106) -#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107) -#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108) -#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109) -#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110) -#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111) -#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112) -#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113) -#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) -#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) -#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) - // #define STR_FORMAT_ID_EMF (STR_FORMAT_START + 117) - // #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118) -#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) -#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/statusbarcontroller.hxx deleted file mode 100644 index a5f4fc1c974c..000000000000 --- a/svtools/inc/statusbarcontroller.hxx +++ /dev/null @@ -1,161 +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: statusbarcontroller.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX -#define _SVTOOLS_STATUSBARCONTROLLER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef INCLUDED_HASH_MAP -#include -#define INCLUDED_HASH_MAP -#endif - -#include - -namespace svt -{ - -class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XStatusbarController, - public ::com::sun::star::lang::XInitialization, - public ::com::sun::star::util::XUpdatable, - public ::com::sun::star::lang::XComponent, - public ::comphelper::OBaseMutex, - public ::cppu::OWeakObject -{ - public: - StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL, - unsigned short nID ); - StatusbarController(); - virtual ~StatusbarController(); - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; - - void updateStatus( const rtl::OUString aCommandURL ); - void updateStatus(); - - ::Rectangle getControlRect() const; - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - - // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - - protected: - struct Listener - { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : - aURL( rURL ), xDispatch( rDispatch ) {} - - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - }; - - typedef ::std::hash_map< ::rtl::OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; - - // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); - void bindListener(); - void unbindListener(); - sal_Bool isBound() const; - - // execute methods - // execute bound status bar controller command/execute various commands - void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - - sal_Bool m_bInitialized : 1, - m_bDisposed : 1; - unsigned short m_nID; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; - URLToDispatchMap m_aListenerMap; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; -}; - -} - -#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx deleted file mode 100644 index fb7d69476d92..000000000000 --- a/svtools/inc/stdmenu.hxx +++ /dev/null @@ -1,244 +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: stdmenu.hxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _STDMENU_HXX -#define _STDMENU_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _MENU_HXX -#include -#endif - -class FontList; -class FontInfo; - -/************************************************************************* - -Beschreibung -============ - -class FontNameMenu - -Beschreibung - -Erlaubt die Auswahl von Fonts. Das Menu wird ueber Fill mit den FontNamen -gefuellt. Fill sortiert automatisch die FontNamen (inkl. aller Umlaute und -sprachabhaengig). Mit SetCurName()/GetCurName() kann der aktuelle Fontname -gesetzt/abgefragt werden. Wenn SetCurName() mit einem leeren String -aufgerufen wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). -Vor dem Selectaufruf wird der ausgewaehlte Name automatisch als aktueller -gesetzt und wuerde beim naechsten Aufruf auch als aktueller Name angezeigt -werden. Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit -SetCurName() der aktuelle Fontname gesetzt werden. - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl eines Namens mitzubekommen. - -In dieses Menu koennen keine weiteren Items eingefuegt werden. - -Spaeter soll auch das Menu die gleichen Bitmaps anzeigen, wie die -FontNameBox. Auf den Systemen, wo Menues nicht automatisch scrollen, -wird spaeter wohl ein A-Z Menu ziwschengeschaltet. Da ein Menu bei vielen -installierten Fonts bisher schon immer lange gebraucht hat, sollte dieses -Menu schon jetzt nur einmal erzeugt werden (da sonst das Kontextmenu bis -zu 10-Sekunden fuer die Erzeugung brauchen koennte). - -Querverweise - -FontList; FontStyleMenu; FontSizeMenu; FontNameBox - --------------------------------------------------------------------------- - -class FontStyleMenu - -Beschreibung - -Erlaubt die Auswahl eines FontStyles. Mit Fill wird das FontStyleMenu mit -den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden -immer mit eingefuegt (kann sich aber noch aendern, da vielleicht -nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts -umgehen koennen). Mit SetCurStyle()/GetCurStyle() kann der aktuelle Fontstyle -gesetzt/abgefragt werden. Der Stylename muss mit FontList::GetStyleName() -ermittelt werden. Wenn SetCurStyle() mit einem leeren String aufgerufen wird, -wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem Selectaufruf -wird der ausgewaehlte Style automatisch als aktueller gesetzt und wuerde beim -naechsten Aufruf auch als aktueller Style angezeigt werden. Deshalb sollte vor -PopupMenu::Execute() gegebenenfalls mit SetCurStyle() der aktuelle Style -gesetzt werden. Da die Styles vom ausgewaehlten Font abhaengen, sollte -nach einer Aenderung des Fontnamen das Menu mit Fill mit den Styles des -Fonts neu gefuellt werden. - -Mit GetCurStyle() kann der ausgewaehlte Style abgefragt -werden. Mit Check wird der Style gecheckt/uncheckt, welcher aktiv -ist. Der Stylename muss mit FontList::GetStyleName() ermittelt werden. Vor -dem Selectaufruf wird der ausgewaehlte Style automatisch gecheckt. Mit -UncheckAllStyles() koennen alle Fontstyles geuncheckt werden (zum Beispiel -fuer DontKnow). - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl eines Styles mitzubekommen. - -An dieses Menu kann ueber MENU_APPEND weitere Items eingefuegt werden. -Bei Fill werden nur Items entfernt, die die Id zwischen FONTSTYLEMENU_FIRSTID -und FONTSTYLEMENU_LASTID haben. - -Querverweise - -FontList; FontNameMenu; FontSizeMenu; FontStyleBox - --------------------------------------------------------------------------- - -class FontSizeMenu - -Beschreibung - -Erlaubt die Auswahl von Fontgroessen. Ueber Fill wird das FontSizeMenu -gefuellt und ueber GetCurHeight() kann die ausgewaehlte Fontgroesse -abgefragt werden. Mit SetCurHeight()/GetCurHeight() kann die aktuelle -Fontgroesse gesetzt/abgefragt werden. Wenn SetCurHeight() mit 0 aufgerufen -wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem -Selectaufruf wird die ausgewaehlte Groesse automatisch als aktuelle gesetzt -und wuerde beim naechsten Aufruf auch als aktuelle Groesse angezeigt werden. -Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit SetCurHeight() -die aktuelle Groesse gesetzt werden. Da die Groessen vom ausgewaehlten Font -abhaengen, sollte nach einer Aenderung des Fontnamen das Menu mit Fill mit -den Groessen des Fonts neu gefuellt werden. - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl einer Groesse mitzubekommen. - -Alle Groessen werden in 10tel Point angegeben. - -In dieses Menu koennen keine weiteren Items eingefuegt werden. - -Spaeter soll das Menu je nach System die Groessen anders darstelllen. Zum -Beispiel koennte der Mac spaeter vielleicht einmal die Groessen als Outline -darstellen, die als Bitmap-Fonts vorhanden sind. - -Querverweise - -FontList; FontNameMenu; FontStyleMenu; FontSizeBox - -*************************************************************************/ - -// ---------------- -// - FontNameMenu - -// ---------------- - -class SVT_DLLPUBLIC FontNameMenu : public PopupMenu -{ -private: - XubString maCurName; - Link maSelectHdl; - Link maHighlightHdl; - -public: - FontNameMenu(); - virtual ~FontNameMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const FontList* pList ); - - void SetCurName( const XubString& rName ); - const XubString& GetCurName() const { return maCurName; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -// ----------------- -// - FontStyleMenu - -// ----------------- - -#define FONTSTYLEMENU_FIRSTID 62000 -#define FONTSTYLEMENU_LASTID 62999 - -class SVT_DLLPUBLIC FontStyleMenu : public PopupMenu -{ -private: - XubString maCurStyle; - Link maSelectHdl; - Link maHighlightHdl; - - SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); - -public: - FontStyleMenu(); - virtual ~FontStyleMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const XubString& rName, const FontList* pList ); - void SetCurStyle( const XubString& rStyle ); - const XubString& GetCurStyle() const { return maCurStyle; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -// ---------------- -// - FontSizeMenu - -// ---------------- - -class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu -{ -private: - long* mpHeightAry; - long mnCurHeight; - Link maSelectHdl; - Link maHighlightHdl; - -public: - FontSizeMenu(); - ~FontSizeMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const FontInfo& rInfo, const FontList* pList ); - - void SetCurHeight( long nHeight ); - long GetCurHeight() const { return mnCurHeight; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -#endif // _STDMENU_HXX diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx new file mode 100644 index 000000000000..bbb8ab32c1a6 --- /dev/null +++ b/svtools/inc/svtools/DocumentInfoPreview.hxx @@ -0,0 +1,64 @@ +/************************************************************************* + * + * 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: DocumentInfoPreview.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX +#define SVTOOLS_DOCUMENTINFOPREVIEW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +class SvtExtendedMultiLineEdit_Impl; +class SvtDocInfoTable_Impl; + +namespace svtools +{ + class SVT_DLLPUBLIC ODocumentInfoPreview : public Window + { + SvtExtendedMultiLineEdit_Impl* m_pEditWin; + SvtDocInfoTable_Impl* m_pInfoTable; + com::sun::star::lang::Locale m_aLocale; + + public: + ODocumentInfoPreview( Window* pParent ,WinBits _nBits); + virtual ~ODocumentInfoPreview(); + + virtual void Resize(); + void Clear(); + void fill(const ::com::sun::star::uno::Reference< + ::com::sun::star::document::XDocumentProperties>& i_xDocProps + ,const String& i_rURL); + void InsertEntry( const String& rTitle, const String& rValue ); + void SetAutoScroll(BOOL _bAutoScroll); + }; +} + +#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX + diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx new file mode 100644 index 000000000000..eb092b5afc0b --- /dev/null +++ b/svtools/inc/svtools/QueryFolderName.hxx @@ -0,0 +1,69 @@ +/************************************************************************* + * + * 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: QueryFolderName.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVT_QUERYFOLDER_HXX +#define SVT_QUERYFOLDER_HXX + +#include +#ifndef _SV_BUTTON_HXX +#include +#endif +#include +#include + +//------------------------------------------------------------------------- +namespace svtools { + +//------------------------------------------------------------------------- +// QueryFolderNameDialog +//------------------------------------------------------------------------- + +class QueryFolderNameDialog : public ModalDialog +{ +private: + FixedText aNameText; + Edit aNameEdit; + FixedLine aNameLine; + OKButton aOKBtn; + CancelButton aCancelBtn; + + DECL_LINK( OKHdl, Button * ); + DECL_LINK( NameHdl, Edit * ); + +public: + QueryFolderNameDialog( Window* _pParent, + const String& rTitle, + const String& rDefaultText, + String* pGroupName = NULL ); + String GetName() const { return aNameEdit.GetText(); } +}; + +} +#endif // SVT_QUERYFOLDER_HXX + diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx new file mode 100644 index 000000000000..744bc87f31c5 --- /dev/null +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -0,0 +1,290 @@ +/************************************************************************* + * + * 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: acceleratorexecute.hxx,v $ + * $Revision: 1.13 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX +#define INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX + +//=============================================== +// includes + +#include "svtools/svtdllapi.h" + +#ifndef INCLUDED_VECTOR +#include +#define INCLUDED_VECTOR +#endif + +#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ +#include +#endif + +#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ +#include +#endif +#include + +#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ +#include +#endif +#include +#include +#include + +//=============================================== +// namespace + +#ifdef css + #error "Conflict on using css as namespace alias!" +#else + #define css ::com::sun::star +#endif + +namespace svt +{ + +//=============================================== +// definitions + +struct TMutexInit +{ + ::osl::Mutex m_aLock; +}; + +//=============================================== +/** + @descr implements a helper, which can be used to + convert vcl key codes into awt key codes ... + and reverse. + + Further such key code can be triggered. + Doing so different accelerator + configurations are merged together; a suitable + command registered for the given key code is searched + and will be dispatched. + + @attention + + Because exceution of an accelerator command can be dangerous + (in case it force an office shutdown for key "ALT+F4"!) + all internal dispatches are done asynchronous. + Menas that the trigger call doesnt wait till the dispatch + is finished. You can call very often. All requests will be + queued internal and dispatched ASAP. + + Of course this queue will be stopped if the environment + will be destructed ... + */ +class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit +{ + //------------------------------------------- + // const, types + private: + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; + + //------------------------------------------- + // member + private: + + /** TODO document me */ + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; + + /** TODO document me */ + css::uno::Reference< css::util::XURLTransformer > m_xURLParser; + + /** TODO document me */ + css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; + + /** TODO document me */ + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + TCommandQueue m_lCommandQueue; + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + ::vcl::EventPoster m_aAsyncCallback; + + //------------------------------------------- + // interface + public: + + //--------------------------------------- + /** @short factory method to create new accelerator + helper instance. + + @descr Such helper instance must be initialized at first. + So it can know its environment (global/module or + document specific). + + Afterwards it can be used to execute incoming + accelerator requests. + + The "end of life" of such helper can be reached as follow: + + - delete the object + => If it stands currently in its execute method, they will + be finished. All further queued requests will be removed + and further not executed! + + - "let it stay alone" + => All currently queued events will be finished. The + helper kills itself afterwards. A shutdown of the + environment will be recognized ... The helper stop its + work immediatly then! + */ + static AcceleratorExecute* createAcceleratorHelper(); + + //--------------------------------------- + /** @short fight against inlining ... */ + virtual ~AcceleratorExecute(); + + //--------------------------------------- + /** @short init this instance. + + @descr It must be called as first method after creation. + And further it can be called more then once ... + but at least its should be used one times only. + Otherwhise nobody can say, which asynchronous + executions will be used inside the old and which one + will be used inside the new environment. + + @param xSMGR + reference to an uno service manager. + + @param xEnv + if it points to a valid frame it will be used + to execute the dispatch there. Further the frame + is used to locate the right module configuration + and use it merged together with the document and + the global configuration. + + If this parameter is set to NULL, the global configuration + is used only. Further the global Desktop instance is + used for dispatch. + */ + virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, + const css::uno::Reference< css::frame::XFrame >& xEnv ); + + //--------------------------------------- + /** @short trigger this accelerator. + + @descr The internal configuartions are used to find + as suitable command for this key code. + This command will be queued and executed later + asynchronous. + + @param aKey + specify the accelerator for execute. + + @return [sal_Bool] + TRUE if this key is configured and match to a command. + Attention: This state does not mean the success state + of the corresponding execute. Because its done asynchronous! + */ + virtual sal_Bool execute(const KeyCode& aKey); + virtual sal_Bool execute(const css::awt::KeyEvent& aKey); + + /** search the command for the given key event. + * + * @param aKey The key event + * @return The command or an empty string if the key event could not be found. + */ + ::rtl::OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); + //--------------------------------------- + /** TODO document me */ + static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); + static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , + const css::uno::Reference< css::frame::XFrame >& xFrame); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); + + //------------------------------------------- + // internal + private: + + //--------------------------------------- + /** @short allow creation of instances of this class + by using our factory only! + */ + SVT_DLLPRIVATE AcceleratorExecute(); + + AcceleratorExecute(const AcceleratorExecute& rCopy); + void operator=(const AcceleratorExecute&) {}; + //--------------------------------------- + /** TODO document me */ + SVT_DLLPRIVATE ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); + + //--------------------------------------- + /** TODO document me */ + SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); + + //--------------------------------------- + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); +}; + +} // namespace svt + +#undef css + +#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx new file mode 100644 index 000000000000..0ece2d779056 --- /dev/null +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -0,0 +1,166 @@ +/************************************************************************* + * + * 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: addresstemplate.hxx,v $ + * $Revision: 1.9 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_ADDRESSTEMPLATE_HXX_ +#define _SVT_ADDRESSTEMPLATE_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ +#include +#endif +#include +#include +#include + +// ....................................................................... +namespace svt +{ +// ....................................................................... + + // =================================================================== + // = AddressBookSourceDialog + // =================================================================== + struct AddressBookSourceDialogData; + class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog + { + protected: + // Controls + FixedLine m_aDatasourceFrame; + FixedText m_aDatasourceLabel; + ComboBox m_aDatasource; + PushButton m_aAdministrateDatasources; + FixedText m_aTableLabel; + ComboBox m_aTable; + + FixedText m_aFieldsTitle; + Window m_aFieldsFrame; + + ScrollBar m_aFieldScroller; + OKButton m_aOK; + CancelButton m_aCancel; + HelpButton m_aHelp; + + // string to display for "no selection" + const String m_sNoFieldSelection; + + /// the DatabaseContext for selecting data sources + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + m_xDatabaseContext; + // the ORB for creating objects + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + m_xCurrentDatasourceTables; + + AddressBookSourceDialogData* + m_pImpl; + + public: + AddressBookSourceDialog( Window* _pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); + + /** if you use this ctor, the dialog +
    • will not store it's data in the configuration (nor initially retrieve it from there)
      • +
    • will not allow to change the data source name
      • +
    • will not allow to change the table name
      • +
    • will not allow to call the data source administration dialog
      • +
    + + @param _rxORB + a service factory to use for various UNO related needs + @param _rxTransientDS + the data source to obtain connections from + @param _rDataSourceName + the to-be name of _rxTransientDS. This is only for displaying this + name to the user, since the dialog completely works on _rxTransientDS, + and doesn't allow to change this. + @param _rTable + the table name to display. It must refer to a valid table, relative to a connection + obtained from _rxTransientDS + */ + AddressBookSourceDialog( Window* _pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, + const ::rtl::OUString& _rDataSourceName, + const ::rtl::OUString& _rTable, + const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping + ); + + ~AddressBookSourceDialog(); + + // to be used if the object was constructed for editing a field mapping only + void getFieldMapping( + ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const; + + protected: + void implConstruct(); + + // Window overridables + virtual long PreNotify( NotifyEvent& _rNEvt ); + + // implementations + void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); + void implSelectField(ListBox* _pBox, const String& _rText); + + void initalizeListBox(ListBox* _pList); + void resetTables(); + void resetFields(); + + // fill in the data sources listbox + void initializeDatasources(); + + // initialize the dialog from the configuration data + void loadConfiguration(); + + DECL_LINK(OnFieldScroll, ScrollBar*); + DECL_LINK(OnFieldSelect, ListBox*); + DECL_LINK(OnAdministrateDatasources, void*); + DECL_LINK(OnComboGetFocus, ComboBox*); + DECL_LINK(OnComboLoseFocus, ComboBox*); + DECL_LINK(OnComboSelect, ComboBox*); + DECL_LINK(OnOkClicked, Button*); + DECL_LINK(OnDelayedInitialize, void*); + }; + + +// ....................................................................... +} // namespace svt +// ....................................................................... + +#endif // _SVT_ADDRESSTEMPLATE_HXX_ + diff --git a/svtools/inc/svtools/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx new file mode 100644 index 000000000000..412faab3107b --- /dev/null +++ b/svtools/inc/svtools/apearcfg.hxx @@ -0,0 +1,130 @@ +/************************************************************************* + * + * 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: apearcfg.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_APEARCFG_HXX +#define _SVT_APEARCFG_HXX + +#include "svtools/svtdllapi.h" +#include "tools/solar.h" +#include + +class Application; + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ +typedef enum { + LookStardivision = 0, + LookMotif, + LookWindows, + LookOSTwo, + LookMacintosh +} SystemLook; + +typedef enum { + SnapToButton = 0, + SnapToMiddle, + NoSnap +} SnapType; + +typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg.src + DragFullWindow, + DragFrame, + DragSystemDep +} DragMode; + + +class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem +{ + short nLookNFeel ; + short nDragMode ; + short nScaleFactor ; + short nSnapMode ; + short nMiddleMouse; +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + short nAAMinPixelHeight ; +#endif + + BOOL bMenuMouseFollow ; + BOOL bSingleLineTabCtrl ; + BOOL bColoredTabCtrl ; +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + BOOL bFontAntialiasing ; +#endif + + static sal_Bool bInitialized ; + + SVT_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); + +public: + SvtTabAppearanceCfg( ); + ~SvtTabAppearanceCfg( ); + + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + + USHORT GetLookNFeel () const { return nLookNFeel; } + void SetLookNFeel ( USHORT nSet ); + + USHORT GetDragMode () const { return nDragMode; } + void SetDragMode ( USHORT nSet ); + + USHORT GetScaleFactor () const { return nScaleFactor; } + void SetScaleFactor ( USHORT nSet ); + + USHORT GetSnapMode () const { return nSnapMode; } + void SetSnapMode ( USHORT nSet ); + + USHORT GetMiddleMouseButton () const { return nMiddleMouse; } + void SetMiddleMouseButton ( USHORT nSet ); + + void SetApplicationDefaults ( Application* pApp ); + + void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} + BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} + + void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} + BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} + +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } + BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } + + USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } + void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } +#endif + + void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; + BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} + + static sal_Bool IsInitialized() { return bInitialized; } + static void SetInitialized() { bInitialized = sal_True; } +}; + +#endif // _OFA_APEARCFG_HXX diff --git a/svtools/inc/svtools/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx new file mode 100644 index 000000000000..9f6b6c1117ec --- /dev/null +++ b/svtools/inc/svtools/asynclink.hxx @@ -0,0 +1,80 @@ +/************************************************************************* + * + * 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: asynclink.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_ASYNCLINK_HXX +#define SVTOOLS_ASYNCLINK_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +class Timer; + +namespace vos +{ + class OMutex; +} + +namespace svtools { + +class SVT_DLLPUBLIC AsynchronLink +{ + Link _aLink; + ULONG _nEventId; + Timer* _pTimer; + BOOL _bInCall; + BOOL* _pDeleted; + void* _pArg; + vos::OMutex* _pMutex; + + DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* ); + SVT_DLLPRIVATE void Call_Impl( void* pArg ); + +public: + AsynchronLink( const Link& rLink ) : + _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _pDeleted( 0 ), _pMutex( 0 ){} + AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _pDeleted( 0 ), _pMutex( 0 ){} + ~AsynchronLink(); + + void CreateMutex(); + void operator=( const Link& rLink ) { _aLink = rLink; } + void Call( void* pObj, BOOL bAllowDoubles = FALSE, + BOOL bUseTimer = FALSE ); + void ForcePendingCall( ); + void ClearPendingCall( ); + BOOL IsSet() const { return _aLink.IsSet(); } + Link GetLink() const { return _aLink; } +}; + +} + +#endif diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx new file mode 100644 index 000000000000..1c81945a669c --- /dev/null +++ b/svtools/inc/svtools/calendar.hxx @@ -0,0 +1,504 @@ +/************************************************************************* + * + * 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: calendar.hxx,v $ + * $Revision: 1.9 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CALENDAR_HXX +#define _CALENDAR_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP +#include +#endif + +#ifndef _CTRL_HXX +#include +#endif +#include +#ifndef _FIELD_HXX +#include +#endif + +class Table; +class MouseEvent; +class TrackingEvent; +class KeyEvent; +class HelpEvent; +class DataChangedEvent; +class FloatingWindow; +class PushButton; +struct ImplDateInfo; +class ImplDateTable; +class ImplCFieldFloatWin; + +/************************************************************************* + +Beschreibung +============ + +class Calendar + +Diese Klasse erlaubt die Auswahl eines Datum. Der Datumsbereich der +angezeigt wird, ist der, der durch die Klasse Date vorgegeben ist. +Es werden soviele Monate angezeigt, wie die Ausgabeflaeche des +Controls vorgibt. Der Anwender kann zwischen den Monaten ueber ein +ContextMenu (Bei Click auf den Monatstitel) oder durch 2 ScrollButtons +zwischen den Monaten wechseln. + +-------------------------------------------------------------------------- + +WinBits + +WB_BORDER Um das Fenster wird ein Border gezeichnet. +WB_TABSTOP Tastatursteuerung ist moeglich. Der Focus wird + sich geholt, wenn mit der Maus in das + Control geklickt wird. +WB_QUICKHELPSHOWSDATEINFO DateInfo auch bei QuickInfo als BalloonHelp zeigen +WB_BOLDTEXT Formatiert wird nach fetten Texten und + DIB_BOLD wird bei AddDateInfo() ausgewertet +WB_FRAMEINFO Formatiert wird so, das Frame-Info angezeigt + werden kann und die FrameColor bei AddDateInfo() + ausgewertet wird +WB_RANGESELECT Es koennen mehrere Tage selektiert werden, die + jedoch alle zusammenhaengend sein muessen +WB_MULTISELECT Es koennen mehrere Tage selektiert werden +WB_WEEKNUMBER Es werden die Wochentage mit angezeigt + +-------------------------------------------------------------------------- + +Mit SetCurDate() / GetCurDate() wird das ausgewaehlte Datum gesetzt und +abgefragt. Wenn der Anwnder ein Datum selektiert hat, wird Select() +gerufen. Bei einem Doppelklick auf ein Datum wird DoubleClick() gerufen. + +-------------------------------------------------------------------------- + +Mit CalcWindowSizePixel() kann die Groesse des Fensters in Pixel fuer +die Darstellung einer bestimmte Anzahl von Monaten berechnet werden. + +-------------------------------------------------------------------------- + +Mit SetSaturdayColor() kann eine spezielle Farbe fuer Sonnabende gesetzt +werden und mit SetSundayColor() eine fuer Sonntage. Mit AddDateInfo() +koennen Tage speziell gekennzeichnet werden. Dabei kann man einem +einzelnen Datum eine andere Farbe geben (zum Beispiel fuer Feiertage) +oder diese Umranden (zum Beispiel fuer Termine). Wenn beim Datum +kein Jahr angegeben wird, wird der Tag in jedem Jahr benutzt. Mit +AddDateInfo() kann auch jedem Datum ein Text mitgegeben werden, der +dann angezeigt wird, wenn Balloon-Hilfe an ist. Um nicht alle Jahre +mit entsprechenden Daten zu versorgen, wird der RequestDateInfo()- +Handler gerufen, wenn ein neues Jahr angezeigt wird. Es kann dann +im Handler mit GetRequestYear() das Jahr abgefragt werden. + +-------------------------------------------------------------------------- + +Um ein ContextMenu zu einem Datum anzuzeigen, muss man den Command-Handler +ueberlagern. Mit GetDate() kann zur Mouse-Position das Datum ermittelt +werden. Bei Tastaturausloesung sollte das aktuelle Datum genommen werden. +Wenn ein ContextMenu angezeigt wird, darf der Handler der Basisklasse nicht +gerufen werden. + +-------------------------------------------------------------------------- + +Bei Mehrfachselektion WB_RANGESELECT oder WB_MULTISELECT kann mit +SelectDate()/SelectDateRange() Datumsbereiche selektiert/deselektiert +werden. SelectDateRange() gilt inkl. EndDatum. Mit SetNoSelection() kann +alles deselektiert werden. SetCurDate() selektiert bei Mehrfachselektion +jedoch nicht das Datum mit, sondern gibt nur das Focus-Rechteck vor. + +Den selektierten Bereich kann man mit GetSelectDateCount()/GetSelectDate() +abgefragt werden oder der Status von einem Datum kann mit IsDateSelected() +abgefragt werden. + +Waehrend der Anwender am selektieren ist, wird der SelectionChanging()- +Handler gerufen. In diesem kann der selektierte Bereich angepasst werden, +wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der +Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit +GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, +in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() +abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, +FALSE eine Selektion nach rechts oder unten. + +-------------------------------------------------------------------------- + +Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion +uebernehmen will, sollte dies nur gemacht werden, wenn +IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert +TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons +ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen +oder durch Beendigung einer Selektion ausgeloest. + +*************************************************************************/ + +// ------------------ +// - Calendar-Types - +// ------------------ + +#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) +#define WB_BOLDTEXT ((WinBits)0x00008000) +#define WB_FRAMEINFO ((WinBits)0x00010000) +#define WB_WEEKNUMBER ((WinBits)0x00020000) +// Muss mit den WinBits beim TabBar uebereinstimmen oder mal +// nach \vcl\inc\wintypes.hxx verlagert werden +#ifndef WB_RANGESELECT +#define WB_RANGESELECT ((WinBits)0x00200000) +#endif +#ifndef WB_MULTISELECT +#define WB_MULTISELECT ((WinBits)0x00400000) +#endif + +#define DIB_BOLD ((USHORT)0x0001) + +// ------------ +// - Calendar - +// ------------ + +class SVT_DLLPUBLIC Calendar : public Control +{ +private: + ImplDateTable* mpDateTable; + Table* mpSelectTable; + Table* mpOldSelectTable; + Table* mpRestoreSelectTable; + XubString* mpDayText[31]; + XubString maDayText; + XubString maWeekText; + CalendarWrapper maCalendarWrapper; + Rectangle maPrevRect; + Rectangle maNextRect; + String maDayOfWeekText; + sal_Int32 mnDayOfWeekAry[7]; + Date maOldFormatFirstDate; + Date maOldFormatLastDate; + Date maFirstDate; + Date maOldFirstDate; + Date maCurDate; + Date maOldCurDate; + Date maAnchorDate; + Date maDropDate; + Color maSelColor; + Color maOtherColor; + Color* mpStandardColor; + Color* mpSaturdayColor; + Color* mpSundayColor; + ULONG mnDayCount; + long mnDaysOffX; + long mnWeekDayOffY; + long mnDaysOffY; + long mnMonthHeight; + long mnMonthWidth; + long mnMonthPerLine; + long mnLines; + long mnDayWidth; + long mnDayHeight; + long mnWeekWidth; + long mnDummy2; + long mnDummy3; + long mnDummy4; + WinBits mnWinStyle; + USHORT mnFirstYear; + USHORT mnLastYear; + USHORT mnRequestYear; + BOOL mbCalc:1, + mbFormat:1, + mbDrag:1, + mbSelection:1, + mbMultiSelection:1, + mbWeekSel:1, + mbUnSel:1, + mbMenuDown:1, + mbSpinDown:1, + mbPrevIn:1, + mbNextIn:1, + mbDirect:1, + mbInSelChange:1, + mbTravelSelect:1, + mbScrollDateRange:1, + mbSelLeft:1, + mbAllSel:1, + mbDropPos:1; + Link maSelectionChangingHdl; + Link maDateRangeChangedHdl; + Link maRequestDateInfoHdl; + Link maDoubleClickHdl; + Link maSelectHdl; + Timer maDragScrollTimer; + USHORT mnDragScrollHitTest; + +#ifdef _SV_CALENDAR_CXX + using Control::ImplInitSettings; + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); + SVT_DLLPRIVATE void ImplInitSettings(); + SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; + SVT_DLLPRIVATE void ImplFormat(); + using Window::ImplHitTest; + SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; + SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); + SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, + USHORT nDay, USHORT nMonth, USHORT nYear, + DayOfWeek eDayOfWeek, + BOOL bBack = TRUE, BOOL bOther = FALSE, + ULONG nToday = 0 ); + SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); + SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); + SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); + SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, + BOOL bMove, BOOL bExpand, BOOL bExtended ); + SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); + using Window::ImplScroll; + SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); + SVT_DLLPRIVATE void ImplInvertDropPos(); + SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); + SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; +#endif + +protected: + BOOL ShowDropPos( const Point& rPos, Date& rDate ); + void HideDropPos(); + + DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); + +public: + Calendar( Window* pParent, WinBits nWinStyle = 0 ); + Calendar( Window* pParent, const ResId& rResId ); + ~Calendar(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void SelectionChanging(); + virtual void DateRangeChanged(); + virtual void RequestDateInfo(); + virtual void DoubleClick(); + virtual void Select(); + + const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } + + /// Set one of ::com::sun::star::i18n::Weekdays. + void SetWeekStart( sal_Int16 nDay ); + + /// Set how many days of a week must reside in the first week of a year. + void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); + + void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); + void SelectDateRange( const Date& rStartDate, const Date& rEndDate, + BOOL bSelect = TRUE ); + void SetNoSelection(); + BOOL IsDateSelected( const Date& rDate ) const; + ULONG GetSelectDateCount() const; + Date GetSelectDate( ULONG nIndex = 0 ) const; + void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } + BOOL IsCallEverySelectEnabled() const { return mbAllSel; } + + USHORT GetRequestYear() const { return mnRequestYear; } + void SetCurDate( const Date& rNewDate ); + Date GetCurDate() const { return maCurDate; } + void SetFirstDate( const Date& rNewFirstDate ); + Date GetFirstDate() const { return maFirstDate; } + Date GetLastDate() const { return GetFirstDate() + mnDayCount; } + ULONG GetDayCount() const { return mnDayCount; } + Date GetFirstMonth() const; + Date GetLastMonth() const; + USHORT GetMonthCount() const; + BOOL GetDate( const Point& rPos, Date& rDate ) const; + Rectangle GetDateRect( const Date& rDate ) const; + BOOL GetDropDate( Date& rDate ) const; + + long GetCurMonthPerLine() const { return mnMonthPerLine; } + long GetCurLines() const { return mnLines; } + + void SetStandardColor( const Color& rColor ); + const Color& GetStandardColor() const; + void SetSaturdayColor( const Color& rColor ); + const Color& GetSaturdayColor() const; + void SetSundayColor( const Color& rColor ); + const Color& GetSundayColor() const; + + void AddDateInfo( const Date& rDate, const XubString& rText, + const Color* pTextColor = NULL, + const Color* pFrameColor = NULL, + USHORT nFlags = 0 ); + void RemoveDateInfo( const Date& rDate ); + void ClearDateInfo(); + XubString GetDateInfoText( const Date& rDate ); + + void StartSelection(); + void EndSelection(); + + BOOL IsTravelSelect() const { return mbTravelSelect; } + BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } + BOOL IsSelectLeft() const { return mbSelLeft; } + + Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, + long nCalcLines = 1 ) const; + + void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; } + const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } + void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; } + const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } + void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; } + const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } +}; + +inline const Color& Calendar::GetStandardColor() const +{ + if ( mpStandardColor ) + return *mpStandardColor; + else + return GetFont().GetColor(); +} + +inline const Color& Calendar::GetSaturdayColor() const +{ + if ( mpSaturdayColor ) + return *mpSaturdayColor; + else + return GetFont().GetColor(); +} + +inline const Color& Calendar::GetSundayColor() const +{ + if ( mpSundayColor ) + return *mpSundayColor; + else + return GetFont().GetColor(); +} + +/************************************************************************* + +Beschreibung +============ + +class CalendarField + +Bei dieser Klasse handelt es sich um ein DateField, wo ueber einen +DropDown-Button ueber das Calendar-Control ein Datum ausgewaehlt werden +kann. + +-------------------------------------------------------------------------- + +WinBits + +Siehe DateField + +Die Vorgaben fuer das CalendarControl koennen ueber SetCalendarStyle() +gesetzt werden. + +-------------------------------------------------------------------------- + +Mit EnableToday()/EnableNone() kann ein Today-Button und ein None-Button +enabled werden. + +-------------------------------------------------------------------------- + +Wenn mit SetCalendarStyle() WB_RANGESELECT gesetzt wird, koennen im +Calendar auch mehrere Tage selektiert werden. Da immer nur das Start-Datum +in das Feld uebernommen wird, sollte dann im Select-Handler mit +GetCalendar() der Calendar abgefragt werden und an dem mit +GetSelectDateCount()/GetSelectDate() der selektierte Bereich abgefragt +werden, um beispielsweise diese dann in ein weiteres Feld zu uebernehmen. + +-------------------------------------------------------------------------- + +Wenn ein abgeleiteter Calendar verwendet werden soll, kann am +CalendarField die Methode CreateCalendar() ueberlagert werden und +dort ein eigener Calendar erzeugt werden. + +*************************************************************************/ + +// ----------------- +// - CalendarField - +// ----------------- + +class SVT_DLLPUBLIC CalendarField : public DateField +{ +private: + ImplCFieldFloatWin* mpFloatWin; + Calendar* mpCalendar; + WinBits mnCalendarStyle; + PushButton* mpTodayBtn; + PushButton* mpNoneBtn; + Date maDefaultDate; + BOOL mbToday; + BOOL mbNone; + Link maSelectHdl; + +#ifdef _SV_CALENDAR_CXX + DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow* ); +#endif + +public: + CalendarField( Window* pParent, WinBits nWinStyle ); + CalendarField( Window* pParent, const ResId& rResId ); + ~CalendarField(); + + virtual void Select(); + + virtual BOOL ShowDropDown( BOOL bShow ); + virtual Calendar* CreateCalendar( Window* pParent ); + Calendar* GetCalendar(); + + void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } + Date GetDefaultDate() const { return maDefaultDate; } + + void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } + BOOL IsTodayEnabled() const { return mbToday; } + void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } + BOOL IsNoneEnabled() const { return mbNone; } + + void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } + WinBits GetCalendarStyle() const { return mnCalendarStyle; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + +protected: + virtual void StateChanged( StateChangedType nStateChange ); +}; + +#endif // _CALENDAR_HXX diff --git a/svtools/inc/svtools/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx new file mode 100644 index 000000000000..566b5d98e4b1 --- /dev/null +++ b/svtools/inc/svtools/cliplistener.hxx @@ -0,0 +1,64 @@ +/************************************************************************* + * + * 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: cliplistener.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CLIPLISTENER_HXX +#define _CLIPLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +class Window; + + +class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< + ::com::sun::star::datatransfer::clipboard::XClipboardListener > +{ + Link aLink; + +public: + // Link is called with a TransferableDataHelper pointer + TransferableClipboardListener( const Link& rCallback ); + ~TransferableClipboardListener(); + + void AddRemoveListener( Window* pWin, BOOL bAdd ); + void ClearCallbackLink(); + + // XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + throw(::com::sun::star::uno::RuntimeException); + // XClipboardListener + virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) + throw(::com::sun::star::uno::RuntimeException); +}; + +#endif + diff --git a/svtools/inc/svtools/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx new file mode 100644 index 000000000000..63b4e7ef64f3 --- /dev/null +++ b/svtools/inc/svtools/collatorres.hxx @@ -0,0 +1,24 @@ + +#ifndef SVTOOLS_COLLATORRESSOURCE_HXX +#define SVTOOLS_COLLATORRESSOURCE_HXX + +#include "svtools/svtdllapi.h" +#include + +class CollatorRessourceData; + +class SVT_DLLPUBLIC CollatorRessource +{ + private: + + CollatorRessourceData *mp_Data; + + public: + CollatorRessource (); + ~CollatorRessource (); + const String& GetTranslation (const String& r_Algorithm); +}; + +#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */ + + diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx new file mode 100644 index 000000000000..59aa064b6b87 --- /dev/null +++ b/svtools/inc/svtools/contextmenuhelper.hxx @@ -0,0 +1,133 @@ +/************************************************************************* + * + * 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: contextmenuhelper.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX +#define INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX + +#include +#include +#include +#include +#include + +#include +#include +#include +#include "svtools/svtdllapi.h" + +namespace svt +{ + +/** + Context menu helper class. + + Fills images and labels for a provided popup menu or + com.sun.star.awt.XPopupMenu. + + PRECONDITION: + All commands must be set via SetItemCommand and are part + of the configuration files + (see org.openoffice.Office.UI.[Module]Commands.xcu) +*/ +struct ExecuteInfo; +class SVT_DLLPUBLIC ContextMenuHelper +{ + public: + // create context menu helper + // ARGS: xFrame = frame defines the context of the context menu + // bAutoRefresh = specifies that the context will be constant or not + ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true ); + ~ContextMenuHelper(); + + // methods to complete a popup menu (set images, labels, enable/disable states) + // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!) + void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu ); + void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu ); + + // methods to create a popup menu referenced by resource URL + // NOT IMPLEMENTED YET! + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > create( const ::rtl::OUString& aPopupMenuResourceURL ); + + // method to create and execute a popup menu referenced by a resource URL + // NOT IMPLEMENTED YET! + bool createAndExecute( const Point& aPos, const ::rtl::OUString& aPopupMenuResourceURL ); + + private: + // asynchronous link to prevent destruction while on stack + DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); + + // no copy-ctor and operator= + ContextMenuHelper( const ContextMenuHelper& ); + const ContextMenuHelper& operator=( const ContextMenuHelper& ); + + // show context menu and dispatch command automatically + void executePopupMenu( const Point& aPos, PopupMenu* pMenu ); + + // fill image and label for every menu item on the provided menu + void completeMenuProperties( Menu* pMenu ); + + // dispatch provided command + bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL ); + + + // methods to retrieve a single command URL dependent value from a + // ui configuratin manager + Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const; + rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; + + // creates an association between current module/controller bound to the + // provided frame and their ui configuration managers. + bool associateUIConfigurationManagers(); + + // resets associations to create associations again on-demand. + // Usefull for implementations which recycle frames. Normal + // implementations can profit from caching and should set + // auto refresh on ctor to false (default). + void resetAssociations() + { + if ( m_bAutoRefresh ) + m_bUICfgMgrAssociated = false; + } + + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; + ::rtl::OUString m_aModuleIdentifier; + ::rtl::OUString m_aSelf; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; + bool m_bAutoRefresh; + bool m_bUICfgMgrAssociated; +}; + +} // namespace svt + +#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX diff --git a/svtools/inc/svtools/controldims.hrc b/svtools/inc/svtools/controldims.hrc new file mode 100644 index 000000000000..805e91e06486 --- /dev/null +++ b/svtools/inc/svtools/controldims.hrc @@ -0,0 +1,105 @@ +/************************************************************************* + * + * 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: controldims.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_CONTROLDIMS_HRC_ +#define _SVT_CONTROLDIMS_HRC_ + +// +// From: Dialogue Specification and Guidelines - Visual Design V1.3 +// by Christian Jansen +// + +// +// Usage: +// ====== +// +// all values have to be mapped by MAP_APPFONT +// + +// Base +#define RSC_BS_CHARHEIGHT 8 +#define RSC_BS_CHARWIDTH 4 + +// control dimensions +#define RSC_CD_PUSHBUTTON_WIDTH 50 +#define RSC_CD_PUSHBUTTON_HEIGHT 14 + +#define RSC_CD_FIXEDTEXT_HEIGHT RSC_BS_CHARHEIGHT +#define RSC_CD_FIXEDLINE_HEIGHT RSC_BS_CHARHEIGHT +#define RSC_CD_FIXEDLINE_WIDTH RSC_BS_CHARWIDTH // for vertical FixedLines + +#define RSC_CD_DROPDOWN_HEIGHT 12 // also combobox and dropdown list +#define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc. + +#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate +#define RSC_CD_RADIOBUTTON_HEIGHT 10 + +// spacings +#define RSC_SP_CTRL_X 6 // controls that are unrelated +#define RSC_SP_CTRL_Y 7 +#define RSC_SP_CTRL_GROUP_X 3 // related controls, or controls in a groupbox +#define RSC_SP_CTRL_GROUP_Y 4 +#define RSC_SP_CTRL_DESC_X 3 // between description text and related control +#define RSC_SP_CTRL_DESC_Y 3 + +// overruled spacings between certain controls +#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine +#define RSC_SP_FLGR_SPACE_Y 4 +#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox +#define RSC_SP_GRP_SPACE_Y 6 +#define RSC_SP_TXT_SPACE_X 5 // spacing between text paragraphs +#define RSC_SP_TXT_SPACE_Y 7 +#define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title + +// dialog inner border +#define RSC_SP_DLG_INNERBORDER_LEFT 6 +#define RSC_SP_DLG_INNERBORDER_TOP 6 +#define RSC_SP_DLG_INNERBORDER_RIGHT 6 +#define RSC_SP_DLG_INNERBORDER_BOTTOM 6 + +// tab page inner border +#define RSC_SP_TBPG_INNERBORDER_LEFT 6 // for tabpage groupings +#define RSC_SP_TBPG_INNERBORDER_TOP 3 +#define RSC_SP_TBPG_INNERBORDER_RIGHT 6 +#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6 + +// FixedLine group inner border +#define RSC_SP_FLGR_INNERBORDER_LEFT 6 // for FixedLine groupings +#define RSC_SP_FLGR_INNERBORDER_TOP 3 +#define RSC_SP_FLGR_INNERBORDER_RIGHT 0 +#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0 + +// GroupBox inner border +#define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings +#define RSC_SP_GRP_INNERBORDER_TOP 6 +#define RSC_SP_GRP_INNERBORDER_RIGHT 6 +#define RSC_SP_GRP_INNERBORDER_BOTTOM 6 + +#endif // _SVT_CONTROLDIMS_HRC_ diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx new file mode 100644 index 000000000000..a72fd6f2c25c --- /dev/null +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -0,0 +1,507 @@ +/************************************************************************* + * + * 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: ctrlbox.hxx,v $ + * $Revision: 1.15 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CTRLBOX_HXX +#define _CTRLBOX_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _LSTBOX_HXX +#include +#endif +#ifndef _COMBOBOX_HXX +#include +#endif +#ifndef _IMAGE_HXX +#include +#endif +#ifndef _VIRDEV_HXX +#include +#endif +#ifndef _METRIC_HXX +#include +#endif +#ifndef _FIELD_HXX +#include +#endif + +class ImplFontList; +class ImpColorList; +class ImpLineList; +class FontList; + +/************************************************************************* + +Beschreibung +============ + +class ColorListBox + +Beschreibung + +Erlaubt die Auswahl von Farben. + +-------------------------------------------------------------------------- + +class LineListBox + +Beschreibung + +Erlaubt die Auswahl von Linien-Styles und Groessen. Es ist darauf zu achten, +das vor dem ersten Insert die Units und die Fesntergroesse gesetzt sein +muessen. An Unit wird Point und mm unterstuetzt und als SourceUnit Point, +mm und Twips. Alle Angaben muessen in 100teln der jeweiligen Einheit +vorliegen. + +Line1 ist aeussere, Line2 die innere und Distance die Distanz zwischen +den beiden Linien. Wenn Line2 = 0 ist, wird nur Line1 angezeigt. Als +Default sind sowohl Source als auch Ziel-Unit FUNIT_POINT. + +Mit SetColor() kann die Linienfarbe eingestellt werden. + +Anmerkungen und Ausnahmen + +Gegenueber einer normalen ListBox, koennen keine User-Daten gesetzt +werden. Ausserdem sollte wenn der UpdateMode ausgeschaltet ist, keine +Daten abgefragt oder die Selektion gesetzt werden, da in diesem Zustand +die Daten nicht definiert sind. Wenn der UpdateMode ausgeschaltet ist, +sollte der Rueckgabewert bei Insert nicht ausgewertet werden, da er keine +Bedeutung hat. Ausserdem darf nicht das WinBit WB_SORT gesetzt sein. + +-------------------------------------------------------------------------- + +class FontNameBox + +Beschreibung + +Erlaubt die Auswahl von Fonts. Die ListBox wird mit Fill gefuellt, wo +ein Pointer auf eine FontList uebergeben werden muss. + +Mit EnableWYSIWYG() kann man einstellen, das die Fontnamen in Ihrer Schrift +angezeigt werden und mit EnableSymbols() kann eingestellt werden, das +vor dem Namen ueber ein Symbol angezeigt wird, ob es sich um eine +Drucker oder Bildschirmschrift handelt. + +Querverweise + +FontList; FontStyleBox; FontSizeBox; FontNameMenu + +-------------------------------------------------------------------------- + +class FontStyleBox + +Beschreibung + +Erlaubt die Auswahl eines FontStyles. Mit Fill wird die ListBox mit +den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden +immer mit eingefuegt (kann sich aber noch aendern, da vielleicht +nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts +umgehen koennen). Bei Fill bleibt vorherige Name soweit wie moeglich +erhalten. + +Fuer DontKnow sollte die FontStyleBox mit String() gefuellt werden. +Dann enthaellt die Liste die Standardattribute. Der Style, der gerade +angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. + +Querverweise + +FontList; FontNameBox; FontSizeBox; FontStyleMenu + +-------------------------------------------------------------------------- + +class FontSizeBox + +Beschreibung + +Erlaubt die Auswahl von Fontgroessen. Werte werden ueber GetValue() +abgefragt und ueber SetValue() gesetzt. Fill fuellt die ListBox mit den +Groessen zum uebergebenen Font. Alle Groessen werden in 10tel Point +angegeben. Die FontListe, die bei Fill uebergeben wird, muss bis zum +naechsten Fill-Aufruf erhalten bleiben. + +Zusaetzlich erlaubt die FontSizeBox noch einen Relative-Mode. Dieser +dient dazu, Prozent-Werte eingeben zu koennen. Dies kann zum Beispiel +nuetzlich sein, wenn man die Box in einem Vorlagen-Dialog anbietet. +Dieser Modus ist nur anschaltbar, jedoch nicht wieder abschaltbar. + +Fuer DontKnow sollte die FontSizeBox mit FontInfo() gefuellt werden. +Dann enthaellt die Liste die Standardgroessen. Die Groesse, die gerade +angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. + +Querverweise + +FontList; FontNameBox; FontStyleBox; FontSizeMenu + +*************************************************************************/ + +// ---------------- +// - ColorListBox - +// ---------------- + +class SVT_DLLPUBLIC ColorListBox : public ListBox +{ + ImpColorList* pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden. + Size aImageSize; + +#ifdef _CTRLBOX_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplDestroyColorEntries(); +#endif +public: + ColorListBox( Window* pParent, + WinBits nWinStyle = WB_BORDER ); + ColorListBox( Window* pParent, const ResId& rResId ); + virtual ~ColorListBox(); + + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + using ListBox::InsertEntry; + virtual USHORT InsertEntry( const XubString& rStr, + USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, + USHORT nPos = LISTBOX_APPEND ); + void InsertAutomaticEntry(); + using ListBox::RemoveEntry; + virtual void RemoveEntry( USHORT nPos ); + virtual void Clear(); + void CopyEntries( const ColorListBox& rBox ); + + using ListBox::GetEntryPos; + virtual USHORT GetEntryPos( const Color& rColor ) const; + virtual Color GetEntryColor( USHORT nPos ) const; + Size GetImageSize() const { return aImageSize; } + + void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) + { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); + XubString GetSelectEntry( USHORT nSelIndex = 0 ) const + { return ListBox::GetSelectEntry( nSelIndex ); } + Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; + BOOL IsEntrySelected( const XubString& rStr ) const + { return ListBox::IsEntrySelected( rStr ); } + + BOOL IsEntrySelected( const Color& rColor ) const; + +private: + // declared as private because some compilers would generate the default functions + ColorListBox( const ColorListBox& ); + ColorListBox& operator =( const ColorListBox& ); + + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; +}; + +inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) +{ + USHORT nPos = GetEntryPos( rColor ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + ListBox::SelectEntryPos( nPos, bSelect ); +} + +inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const +{ + USHORT nPos = GetEntryPos( rColor ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return IsEntryPosSelected( nPos ); + else + return FALSE; +} + +inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + Color aColor; + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + aColor = GetEntryColor( nPos ); + return aColor; +} + +// --------------- +// - LineListBox - +// --------------- + +class SVT_DLLPUBLIC LineListBox : public ListBox +{ + ImpLineList* pLineList; + VirtualDevice aVirDev; + Size aTxtSize; + Color aColor; + Color maPaintCol; + FieldUnit eUnit; + FieldUnit eSourceUnit; + + SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr ); + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + void UpdateLineColors( void ); + BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed + inline const Color& GetPaintColor( void ) const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + +public: + LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); + LineListBox( Window* pParent, const ResId& rResId ); + virtual ~LineListBox(); + + using ListBox::InsertEntry; + virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND ); + using ListBox::RemoveEntry; + virtual void RemoveEntry( USHORT nPos ); + virtual void Clear(); + + using ListBox::GetEntryPos; + USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + long GetEntryLine1( USHORT nPos ) const; + long GetEntryLine2( USHORT nPos ) const; + long GetEntryDistance( USHORT nPos ) const; + + inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE ); + long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; + long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; + long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; + inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } + BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + + inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } + inline FieldUnit GetUnit() const { return eUnit; } + inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } + inline FieldUnit GetSourceUnit() const { return eSourceUnit; } + + void SetColor( const Color& rColor ); + inline Color GetColor( void ) const; + +private: + // declared as private because some compilers would generate the default methods + LineListBox( const LineListBox& ); + LineListBox& operator =( const LineListBox& ); + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; +}; + +inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect ) +{ + USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + ListBox::SelectEntryPos( nPos, bSelect ); +} + +inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryLine1( nPos ); + else + return 0; +} + +inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryLine2( nPos ); + else + return 0; +} + +inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryDistance( nPos ); + else + return 0; +} + +inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const +{ + USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return IsEntryPosSelected( nPos ); + else + return FALSE; +} + +inline void LineListBox::SetColor( const Color& rColor ) +{ + aColor = rColor; + + UpdateLineColors(); +} + +inline Color LineListBox::GetColor( void ) const +{ + return aColor; +} + + +// --------------- +// - FontNameBox - +// --------------- + +class SVT_DLLPUBLIC FontNameBox : public ComboBox +{ +private: + ImplFontList* mpFontList; + Image maImagePrinterFont; + Image maImageBitmapFont; + Image maImageScalableFont; + BOOL mbWYSIWYG; + BOOL mbSymbols; + +#ifdef _CTRLBOX_CXX + SVT_DLLPRIVATE void ImplCalcUserItemSize(); + SVT_DLLPRIVATE void ImplDestroyFontList(); +#endif + + void InitBitmaps( void ); +protected: + virtual void DataChanged( const DataChangedEvent& rDCEvt ); +public: + FontNameBox( Window* pParent, + WinBits nWinStyle = WB_SORT ); + FontNameBox( Window* pParent, const ResId& rResId ); + virtual ~FontNameBox(); + + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + void Fill( const FontList* pList ); + + void EnableWYSIWYG( BOOL bEnable = TRUE ); + BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } + + void EnableSymbols( BOOL bEnable = TRUE ); + BOOL IsSymbolsEnabled() const { return mbSymbols; } + +private: + // declared as private because some compilers would generate the default functions + FontNameBox( const FontNameBox& ); + FontNameBox& operator =( const FontNameBox& ); +}; + +// ---------------- +// - FontStyleBox - +// ---------------- + +class SVT_DLLPUBLIC FontStyleBox : public ComboBox +{ + XubString aLastStyle; + +private: + using ComboBox::SetText; +public: + FontStyleBox( Window* pParent, WinBits nWinStyle = 0 ); + FontStyleBox( Window* pParent, const ResId& rResId ); + virtual ~FontStyleBox(); + + virtual void Select(); + virtual void LoseFocus(); + virtual void Modify(); + + void SetText( const XubString& rText ); + void Fill( const XubString& rName, const FontList* pList ); + +private: + // declared as private because some compilers would generate the default functions + FontStyleBox( const FontStyleBox& ); + FontStyleBox& operator =( const FontStyleBox& ); +}; + +inline void FontStyleBox::SetText( const XubString& rText ) +{ + aLastStyle = rText; + ComboBox::SetText( rText ); +} + +// --------------- +// - FontSizeBox - +// --------------- + +class SVT_DLLPUBLIC FontSizeBox : public MetricBox +{ + FontInfo aFontInfo; + const FontList* pFontList; + USHORT nRelMin; + USHORT nRelMax; + USHORT nRelStep; + short nPtRelMin; + short nPtRelMax; + short nPtRelStep; + BOOL bRelativeMode:1, + bRelative:1, + bPtRelative:1, + bStdSize:1; + +#ifdef _CTRLBOX_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); +#endif + +protected: + virtual XubString CreateFieldText( sal_Int64 nValue ) const; + +public: + FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); + FontSizeBox( Window* pParent, const ResId& rResId ); + virtual ~FontSizeBox(); + + void Reformat(); + void Modify(); + + void Fill( const FontInfo* pInfo, const FontList* pList ); + + void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, + USHORT nStep = 5 ); + void EnablePtRelativeMode( short nMin = -200, short nMax = 200, + short nStep = 10 ); + BOOL IsRelativeMode() const { return bRelativeMode; } + void SetRelative( BOOL bRelative = FALSE ); + BOOL IsRelative() const { return bRelative; } + void SetPtRelative( BOOL bPtRel = TRUE ) + { bPtRelative = bPtRel; SetRelative( TRUE ); } + BOOL IsPtRelative() const { return bPtRelative; } + + virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); + virtual void SetValue( sal_Int64 nNewValue ); + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; + virtual sal_Int64 GetValue() const; + sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; + void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); + void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } + +private: + // declared as private because some compilers would generate the default functions + FontSizeBox( const FontSizeBox& ); + FontSizeBox& operator =( const FontSizeBox& ); +}; + +#endif // _CTRLBOX_HXX diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx new file mode 100644 index 000000000000..21a1fcab76d7 --- /dev/null +++ b/svtools/inc/svtools/ctrltool.hxx @@ -0,0 +1,254 @@ +/************************************************************************* + * + * 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: ctrltool.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CTRLTOOL_HXX +#define _CTRLTOOL_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _SAL_TYPES_H +#include +#endif +#include +#ifndef _METRIC_HXX +#include +#endif + +class ImplFontListNameInfo; +class OutputDevice; + +/************************************************************************* + +Beschreibung +============ + +class FontList + +Diese Klasse verwaltet alle Fonts, die auf einem oder zwei Ausgabegeraeten +dargestellt werden koennen. Zusaetzlich bietet die Klasse Methoden an, um +aus Fett und Kursiv den StyleName zu generieren oder aus einem Stylename +die fehlenden Attribute. Zusaetzlich kann diese Klasse syntetisch nachgebildete +Fonts verarbeiten. Diese Klasse kann mit verschiedenen Standard-Controls und +Standard-Menus zusammenarbeiten. + +Querverweise + +class FontNameBox, class FontStyleBox, class FontSizeBox, +class FontNameMenu, class FontStyleMenu, class FontSizeMenu + +-------------------------------------------------------------------------- + +FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, + BOOL bAll = TRUE ); + +Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die +entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, +wie auch die Klasse FontList existiert. Optional kann noch ein 2tes +Ausgabedevice uebergeben werden, damit man zum Beispiel die Fonts von +einem Drucker und dem Bildschirm zusammen in einer FontListe verwalten kann +und somit auch den FontListen und FontMenus die Fonts von beiden OutputDevices +zu uebergeben. Auch das pDevice2 muss solange existieren, wie die Klasse +FontList existiert. + +Das OutputDevice, welches als erstes uebergeben wird, sollte das bevorzugte +sein. Dies sollte im normalfall der Drucker sein. Denn wenn 2 verschiede +Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden +sind, wird die vom uebergebenen Device "pDevice" bevorzugt. + +Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften +abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch +Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und +scalierbare Schriften abgefragt. + +-------------------------------------------------------------------------- + +String FontList::GetStyleName( const FontInfo& rInfo ) const; + +Diese Methode gibt den StyleName von einer FontInfo zurueck. Falls kein +StyleName gesetzt ist, wird aus den gesetzten Attributen ein entsprechender +Name generiert, der dem Anwender praesentiert werden kann. + +-------------------------------------------------------------------------- + +XubString FontList::GetFontMapText( const FontInfo& rInfo ) const; + +Diese Methode gibt einen Matchstring zurueck, der dem Anwender +anzeigen soll, welche Probleme es mit diesem Font geben kann. + +-------------------------------------------------------------------------- + +FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; + +Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName +die entsprechende FontInfo-Struktur raus. Der Stylename kann in dieser +Methode auch ein syntetischer sein. In diesem Fall werden die entsprechenden +Werte in der FontInfo-Struktur entsprechend gesetzt. Wenn ein StyleName +uebergeben wird, kann jedoch eine FontInfo-Struktur ohne Stylename +zurueckgegeben werden. Um den StyleName dem Anwender zu repraesentieren, +muss GetStyleName() mit dieser FontInfo-Struktur aufgerufen werden. + +Querverweise + +FontList::GetStyleName() + +-------------------------------------------------------------------------- + +FontInfo FontList::Get( const String& rName, FontWeight eWeight, + FontItalic eItalic ) const; + +Diese Methode sucht aus dem uebergebenen Namen und den uebergebenen Styles +die entsprechende FontInfo-Struktur raus. Diese Methode kann auch eine +FontInfo-Struktur ohne Stylename zurueckgegeben. Um den StyleName dem +Anwender zu repraesentieren, muss GetStyleName() mit dieser FontInfo-Struktur +aufgerufen werden. + +Querverweise + +FontList::GetStyleName() + +-------------------------------------------------------------------------- + +const long* FontList::GetSizeAry( const FontInfo& rInfo ) const; + +Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen. +Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- +Groessen zurueckgegeben. Das Array enthaelt die Hoehen des Fonts in 10tel +Point. Der letzte Wert des Array ist 0. Das Array, was zurueckgegeben wird, +wird von der FontList wieder zerstoert. Nach dem Aufruf der naechsten Methode +von der FontList, sollte deshalb das Array nicht mehr referenziert werden. + +*************************************************************************/ + +// ------------ +// - FontList - +// ------------ + +#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) + +#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) +#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) +#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) + +class SVT_DLLPUBLIC FontList : private List +{ +private: + XubString maMapBoth; + XubString maMapPrinterOnly; + XubString maMapScreenOnly; + XubString maMapSizeNotAvailable; + XubString maMapStyleNotAvailable; + XubString maMapNotAvailable; + XubString maLight; + XubString maLightItalic; + XubString maNormal; + XubString maNormalItalic; + XubString maBold; + XubString maBoldItalic; + XubString maBlack; + XubString maBlackItalic; + long* mpSizeAry; + OutputDevice* mpDev; + OutputDevice* mpDev2; + +#ifdef CTRLTOOL_CXX + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; + SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, + BOOL bInsertData ); +#endif + +public: + FontList( OutputDevice* pDevice, + OutputDevice* pDevice2 = NULL, + BOOL bAll = TRUE ); + ~FontList(); + + FontList* Clone() const; + + OutputDevice* GetDevice() const { return mpDev; } + OutputDevice* GetDevice2() const { return mpDev2; } + XubString GetFontMapText( const FontInfo& rInfo ) const; + USHORT GetFontNameType( const XubString& rFontName ) const; + + const XubString& GetNormalStr() const { return maNormal; } + const XubString& GetItalicStr() const { return maNormalItalic; } + const XubString& GetBoldStr() const { return maBold; } + const XubString& GetBoldItalicStr() const { return maBoldItalic; } + const XubString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const; + XubString GetStyleName( const FontInfo& rInfo ) const; + + FontInfo Get( const XubString& rName, + const XubString& rStyleName ) const; + FontInfo Get( const XubString& rName, + FontWeight eWeight, + FontItalic eItalic ) const; + + BOOL IsAvailable( const XubString& rName ) const; + USHORT GetFontNameCount() const + { return (USHORT)List::Count(); } + const FontInfo& GetFontName( USHORT nFont ) const; + USHORT GetFontNameType( USHORT nFont ) const; + sal_Handle GetFirstFontInfo( const XubString& rName ) const; + sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; + const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; + + const long* GetSizeAry( const FontInfo& rInfo ) const; + static const long* GetStdSizeAry(); + +private: + FontList( const FontList& ); + FontList& operator =( const FontList& ); +}; + + +// ----------------- +// - FontSizeNames - +// ----------------- + +class SVT_DLLPUBLIC FontSizeNames +{ +private: + struct ImplFSNameItem* mpArray; + ULONG mnElem; + +public: + FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); + + ULONG Count() const { return mnElem; } + BOOL IsEmpty() const { return !mnElem; } + + long Name2Size( const String& ) const; + String Size2Name( long ) const; + + String GetIndexName( ULONG nIndex ) const; + long GetIndexSize( ULONG nIndex ) const; +}; + +#endif // _CTRLTOOL_HXX diff --git a/svtools/inc/svtools/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx new file mode 100644 index 000000000000..b2d0f68bf59d --- /dev/null +++ b/svtools/inc/svtools/dialogclosedlistener.hxx @@ -0,0 +1,80 @@ +/************************************************************************* + * + * 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: dialogclosedlistener.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX +#define _SVTOOLS_DIALOGCLOSEDLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //===================================================================== + //= ODialogClosedListener + //===================================================================== + /** + C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener + */ + class SVT_DLLPUBLIC DialogClosedListener : + public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener > + { + private: + /** + This link will be called when the dialog was closed. + + The link must have the type: + DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); + */ + Link m_aDialogClosedLink; + + public: + DialogClosedListener(); + DialogClosedListener( const Link& rLink ); + + inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } + + // XDialogClosedListener methods + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener methods + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX + diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx new file mode 100644 index 000000000000..edb425f78b00 --- /dev/null +++ b/svtools/inc/svtools/dialogcontrolling.hxx @@ -0,0 +1,309 @@ +/************************************************************************* + * + * 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: dialogcontrolling.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_DIALOGCONTROLLING_HXX +#define SVTOOLS_DIALOGCONTROLLING_HXX + +#include + +#include +#include + +#include +#include + +//........................................................................ +namespace svt +{ +//........................................................................ + + //===================================================================== + //= IWindowOperator + //===================================================================== + /** an abstract interface for operating on a ->Window + */ + class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator + { + public: + /** called when an event happened which should be reacted to + + @param _rTrigger + the event which triggered the call. If the Id of the event is 0, then this is the initial + call which is made when ->_rOperateOn is added to the responsibility of the DialogController. + @param _rOperateOn + the window on which to operate + */ + virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; + + virtual ~IWindowOperator(); + }; + typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; + + //===================================================================== + //= IWindowEventFilter + //===================================================================== + /** an abstract interface for deciding whether a ->VclWindowEvent + is worth paying attention to + */ + class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowEventFilter + { + public: + virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const = 0; + + virtual ~IWindowEventFilter(); + }; + typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; + + //===================================================================== + //= DialogController + //===================================================================== + struct DialogController_Data; + /** a class controlling interactions between dialog controls + + An instance of this class listens to all events fired by a certain + ->Control (more precise, a ->Window), the so-called instigator. + + Additionally, the ->DialogController maintains a list of windows which + are affected by changes in the instigator window. Let's call those the + dependent windows. + + Now, by help of an owner-provided ->IWindowEventFilter, the ->DialogController + decides which events are worth attention. By help of an owner-provided + ->IWindowOperator, it handles those events for all dependent windows. + */ + class SVT_DLLPUBLIC DialogController + { + private: + ::std::auto_ptr< DialogController_Data > m_pImpl; + + public: + DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); + virtual ~DialogController(); + + /** adds a window to the list of dependent windows + + @param _rWindow + The window to add to the list of dependent windows. + + The caller is responsible for life-time control: The given window + must live at least as long as the ->DialogController instance does. + */ + void addDependentWindow( Window& _rWindow ); + + /** resets the controller so that no actions happend anymore. + + The instances is disfunctional after this method has been called. + */ + void reset(); + + private: + void impl_Init(); + void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); + void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); + + DECL_LINK( OnWindowEvent, const VclWindowEvent* ); + + private: + DialogController( const DialogController& ); // never implemented + DialogController& operator=( const DialogController& ); // never implemented + }; + typedef ::boost::shared_ptr< DialogController > PDialogController; + + //===================================================================== + //= ControlDependencyManager + //===================================================================== + struct ControlDependencyManager_Data; + /** helper class for managing control dependencies + + Instances of this class are intended to be held as members of a dialog/tabpage/whatever + class, with easy administration of inter-control dependencies (such as "Enable + control X if and only if checkbox Y is checked). + */ + class SVT_DLLPUBLIC ControlDependencyManager + { + private: + ::std::auto_ptr< ControlDependencyManager_Data > m_pImpl; + + public: + ControlDependencyManager(); + ~ControlDependencyManager(); + + /** clears all dialog controllers previously added to the manager + */ + void clear(); + + /** ensures that a given window is enabled or disabled, according to the check state + of a given radio button + @param _rRadio + denotes the radio button whose check state is to observe + @param _rDependentWindow + denotes the window which should be enabled when ->_rRadio is checked, and + disabled when it's unchecked + */ + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); + + /** ensures that a given window is enabled or disabled, according to the mark state + of a given check box + @param _rBox + denotes the check box whose mark state is to observe + @param _rDependentWindow + denotes the window which should be enabled when ->_rBox is marked, and + disabled when it's unmarked + */ + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); + + /** adds a non-standard controller whose functionality is not covered by the other methods + + @param _pController + the controller to add to the manager. Must not be . + */ + void addController( const PDialogController& _pController ); + + private: + ControlDependencyManager( const ControlDependencyManager& ); // never implemented + ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented + }; + + //===================================================================== + //= EnableOnCheck + //===================================================================== + /** a helper class implementing the ->IWindowOperator interface, + which enables a dependent window depending on the check state of + an instigator window. + + @see DialogController + */ + template< class CHECKABLE > + class SVT_DLLPUBLIC EnableOnCheck : public IWindowOperator + { + public: + typedef CHECKABLE SourceType; + + private: + SourceType& m_rCheckable; + + public: + /** constructs the instance + + @param _rCheckable + a ->Window instance which supports a boolean method IsChecked. Usually + a ->RadioButton or ->CheckBox + */ + EnableOnCheck( SourceType& _rCheckable ) + :m_rCheckable( _rCheckable ) + { + } + + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const + { + _rOperateOn.Enable( m_rCheckable.IsChecked() ); + } + }; + + //===================================================================== + //= FilterForRadioOrCheckToggle + //===================================================================== + /** a helper class implementing the ->IWindowEventFilter interface, + which filters for radio buttons or check boxes being toggled. + + Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE + and the ->VCLEVENT_CHECKBOX_TOGGLE event. + */ + class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter + { + const Window& m_rWindow; + public: + FilterForRadioOrCheckToggle( const Window& _rWindow ) + :m_rWindow( _rWindow ) + { + } + + bool payAttentionTo( const VclWindowEvent& _rEvent ) const + { + if ( ( _rEvent.GetWindow() == &m_rWindow ) + && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) + || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE ) + ) + ) + return true; + return false; + } + }; + + //===================================================================== + //= RadioDependentEnabler + //===================================================================== + /** a ->DialogController derivee which enables or disables its dependent windows, + depending on the check state of a radio button. + + The usage of this class is as simple as + + pController = new RadioDependentEnabler( m_aOptionSelectSomething ); + pController->addDependentWindow( m_aLabelSelection ); + pController->addDependentWindow( m_aListSelection ); + + + With this, both m_aLabelSelection and m_aListSelection will + be disabled if and only m_aOptionSelectSomething is checked. + */ + class SVT_DLLPUBLIC RadioDependentEnabler : public DialogController + { + public: + RadioDependentEnabler( RadioButton& _rButton ) + :DialogController( _rButton, + PWindowEventFilter( new FilterForRadioOrCheckToggle( _rButton ) ), + PWindowOperator( new EnableOnCheck< RadioButton >( _rButton ) ) ) + { + } + + RadioDependentEnabler( CheckBox& _rBox ) + :DialogController( _rBox, + PWindowEventFilter( new FilterForRadioOrCheckToggle( _rBox ) ), + PWindowOperator( new EnableOnCheck< CheckBox >( _rBox ) ) ) + { + } + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // SVTOOLS_DIALOGCONTROLLING_HXX + diff --git a/svtools/inc/svtools/expander.hxx b/svtools/inc/svtools/expander.hxx new file mode 100644 index 000000000000..06a527195780 --- /dev/null +++ b/svtools/inc/svtools/expander.hxx @@ -0,0 +1,95 @@ +/************************************************************************* + * + * 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: expander.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_EXPANDER_HXX +#define _SV_EXPANDER_HXX + +#include +#include + +enum SvExpanderStateType +{ + EST_MIN=1, + EST_PLUS=2, + EST_MIN_DOWN=3, + EST_PLUS_DOWN=4, + EST_NONE=5, + EST_MIN_DIS=6, + EST_PLUS_DIS=7, + EST_MIN_DOWN_DIS=8, + EST_PLUS_DOWN_DIS=9 +}; + +class SvExpander: public Control +{ +private: + Point aImagePos; + Point aTextPos; + Image aActiveImage; + Rectangle maFocusRect; + ImageList maExpanderImages; + BOOL mbIsExpanded; + BOOL mbHasFocusRect; + BOOL mbIsInMouseDown; + Link maToggleHdl; + SvExpanderStateType eType; + +protected: + + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyUp( const KeyEvent& rKEvt ); + + virtual void Click(); + virtual void Resize(); + +public: + SvExpander( Window* pParent, WinBits nStyle = 0 ); + SvExpander( Window* pParent, const ResId& rResId ); + + BOOL IsExpanded() {return mbIsExpanded;} + + void SetToExpanded(BOOL bFlag=TRUE); + + void SetExpanderImage( SvExpanderStateType eType); + Image GetExpanderImage(SvExpanderStateType eType); + Size GetMinSize() const; + + void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } + const Link& GetToggleHdl() const { return maToggleHdl; } +}; + + + +#endif diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx new file mode 100644 index 000000000000..228ef9823fd2 --- /dev/null +++ b/svtools/inc/svtools/extcolorcfg.hxx @@ -0,0 +1,131 @@ +/************************************************************************* + * + * 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: extcolorcfg.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef INCLUDED_SVTOOLS_EXTCOLORCFG_HXX +#define INCLUDED_SVTOOLS_EXTCOLORCFG_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include + +//----------------------------------------------------------------------------- +namespace svtools{ +/* -----------------------------22.03.2002 15:36------------------------------ + + ---------------------------------------------------------------------------*/ +class ExtendedColorConfig_Impl; +class ExtendedColorConfigValue +{ + ::rtl::OUString m_sName; + ::rtl::OUString m_sDisplayName; + sal_Int32 m_nColor; + sal_Int32 m_nDefaultColor; +public: + ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){} + ExtendedColorConfigValue(const ::rtl::OUString& _sName + ,const ::rtl::OUString& _sDisplayName + ,sal_Int32 _nColor + ,sal_Int32 _nDefaultColor) + : m_sName(_sName) + ,m_sDisplayName(_sDisplayName) + ,m_nColor(_nColor) + ,m_nDefaultColor(_nDefaultColor) + {} + + inline ::rtl::OUString getName() const { return m_sName; } + inline ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + inline sal_Int32 getColor() const { return m_nColor; } + inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } + + inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } + + sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const + { return m_nColor != rCmp.m_nColor;} +}; +/* -----------------------------22.03.2002 15:36------------------------------ + + ---------------------------------------------------------------------------*/ +class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener +{ + friend class ExtendedColorConfig_Impl; +private: + static ExtendedColorConfig_Impl* m_pImpl; +public: + ExtendedColorConfig(); + ~ExtendedColorConfig(); + + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + + // get the configured value + ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const; + sal_Int32 GetComponentCount() const; + ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; + ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const; +}; +/* -----------------------------22.03.2002 15:31------------------------------ + + ---------------------------------------------------------------------------*/ +class SVT_DLLPUBLIC EditableExtendedColorConfig +{ + ExtendedColorConfig_Impl* m_pImpl; + sal_Bool m_bModified; +public: + EditableExtendedColorConfig(); + ~EditableExtendedColorConfig(); + + ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSchemeNames() const; + void DeleteScheme(const ::rtl::OUString& rScheme ); + void AddScheme(const ::rtl::OUString& rScheme ); + sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); + const ::rtl::OUString& GetCurrentSchemeName()const; + void SetCurrentSchemeName(const ::rtl::OUString& rScheme); + + ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const; + sal_Int32 GetComponentCount() const; + ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; + ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; + void SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue); + void SetModified(); + void ClearModified(){m_bModified = sal_False;} + sal_Bool IsModified()const{return m_bModified;} + void Commit(); + + void DisableBroadcast(); + void EnableBroadcast(); +}; +}//namespace svtools +#endif + diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx new file mode 100644 index 000000000000..a4ad0ad05dce --- /dev/null +++ b/svtools/inc/svtools/filectrl.hxx @@ -0,0 +1,114 @@ +/************************************************************************* + * + * 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: filectrl.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_FILECTRL_HXX +#define _SV_FILECTRL_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#ifndef _SV_BUTTON_HXX +#include +#endif + + +#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! + +// Flags for FileControl +typedef USHORT FileControlMode; +#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely + + +// Flags for internal use of FileControl +typedef USHORT FileControlMode_Internal; +#define FILECTRL_INRESIZE ((USHORT)0x0001) +#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) + + +class SVT_DLLPUBLIC FileControl : public Window +{ +private: + Edit maEdit; + PushButton maButton; + + String maButtonText; + BOOL mbOpenDlg; + + Link maDialogCreatedHdl; + + FileControlMode mnFlags; + FileControlMode_Internal mnInternalFlags; + +private: + SVT_DLLPRIVATE void ImplBrowseFile( ); + +protected: + SVT_DLLPRIVATE void Resize(); + SVT_DLLPRIVATE void GetFocus(); + SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); + SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* ); + +public: + FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); + ~FileControl(); + + Edit& GetEdit() { return maEdit; } + PushButton& GetButton() { return maButton; } + + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + + void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } + BOOL IsOpenDialog() const { return mbOpenDlg; } + + void SetText( const XubString& rStr ); + XubString GetText() const; + UniString GetSelectedText() const { return maEdit.GetSelected(); } + + void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } + Selection GetSelection() const { return maEdit.GetSelection(); } + + void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } + BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } + + //------ + //manipulate the Button-Text: + XubString GetButtonText() const { return maButtonText; } + void SetButtonText( const XubString& rStr ); + void ResetButtonText(); + + //------ + //use this to manipulate the dialog bevore executing it: + void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } + const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } +}; + +#endif + diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx new file mode 100644 index 000000000000..04cf41130bce --- /dev/null +++ b/svtools/inc/svtools/filedlg.hxx @@ -0,0 +1,111 @@ +/************************************************************************* + * + * 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: filedlg.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_FILEDLG_HXX +#define _SVT_FILEDLG_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _DIALOG_HXX +#include +#endif + +class Edit; +class ImpSvFileDlg; + +// -------------- +// - SvPathDialog - +// -------------- + +class SVT_DLLPUBLIC PathDialog : public ModalDialog +{ +private: + friend class FileDialog; // Imp... + + ImpSvFileDlg* pImpFileDlg; // Implementation + Link aOKHdlLink; // Link zum OK-Handler + +protected: + UniString aDfltExt; // Default - Extension + +public: + PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); + ~PathDialog(); + + virtual long OK(); + + void SetPath( const UniString& rNewPath ); + void SetPath( const Edit& rEdit ); + UniString GetPath() const; + + void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; } + const Link& GetOKHdl() const { return aOKHdlLink; } + + virtual short Execute(); +}; + +// -------------- +// - SvFileDialog - +// -------------- + +class SVT_DLLPUBLIC FileDialog : public PathDialog +{ +private: + Link aFileHdlLink; // Link zum FileSelect-Handler + Link aFilterHdlLink; // Link zum FilterSelect-Handler + +public: + FileDialog( Window* pParent, WinBits nWinStyle ); + ~FileDialog(); + + virtual void FileSelect(); + virtual void FilterSelect(); + + void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; } + const UniString& GetDefaultExt() const { return aDfltExt; } + void AddFilter( const UniString& rFilter, const UniString& rType ); + void RemoveFilter( const UniString& rFilter ); + void RemoveAllFilter(); + void SetCurFilter( const UniString& rFilter ); + UniString GetCurFilter() const; + USHORT GetFilterCount() const; + UniString GetFilterName( USHORT nPos ) const; + UniString GetFilterType( USHORT nPos ) const; + + void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } + const Link& GetFileSelectHdl() const { return aFileHdlLink; } + void SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; } + const Link& GetFilterSelectHdl() const { return aFilterHdlLink; } + + void SetOkButtonText( const UniString& rText ); + void SetCancelButtonText( const UniString& rText ); +}; + +#endif // _FILEDLG_HXX diff --git a/svtools/inc/svtools/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc new file mode 100644 index 000000000000..a75e9047eafb --- /dev/null +++ b/svtools/inc/svtools/filedlg2.hrc @@ -0,0 +1,44 @@ +/************************************************************************* + * + * 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: filedlg2.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#define STR_FILEDLG_SELECT 1000 +#define STR_FILEDLG_CANTCHDIR 1001 +#define STR_FILEDLG_OPEN 1002 +#define STR_FILEDLG_FILE 1003 +#define STR_FILEDLG_DIR 1004 +#define STR_FILEDLG_TYPE 1005 +#define STR_FILEDLG_CANTOPENFILE 1006 +#define STR_FILEDLG_CANTOPENDIR 1007 +#define STR_FILEDLG_OVERWRITE 1008 +#define STR_FILEDLG_GOUP 1009 +#define STR_FILEDLG_SAVE 1010 +#define STR_FILEDLG_DRIVES 1011 +#define STR_FILEDLG_HOME 1012 +#define STR_FILEDLG_NEWDIR 1013 +#define STR_FILEDLG_ASKNEWDIR 1014 diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx new file mode 100644 index 000000000000..7527436e0f38 --- /dev/null +++ b/svtools/inc/svtools/fileview.hxx @@ -0,0 +1,274 @@ +/************************************************************************* + * + * 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: fileview.hxx,v $ + * $Revision: 1.21 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_FILEVIEW_HXX +#define _SVT_FILEVIEW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#ifndef _SV_BUTTON_HXX +#include +#endif +#include +#include + +// class SvtFileView ----------------------------------------------------- + +#define FILEVIEW_ONLYFOLDER 0x0001 +#define FILEVIEW_MULTISELECTION 0x0002 + +#define FILEVIEW_SHOW_TITLE 0x0010 +#define FILEVIEW_SHOW_SIZE 0x0020 +#define FILEVIEW_SHOW_DATE 0x0040 +#define FILEVIEW_SHOW_ALL 0x0070 + +class ViewTabListBox_Impl; +class SvtFileView_Impl; +class SvLBoxEntry; +class HeaderBar; +class IUrlFilter; + +/// the result of an action in the FileView +enum FileViewResult +{ + eSuccess, + eFailure, + eTimeout, + eStillRunning +}; + +/// describes parameters for doing an action on the FileView asynchronously +struct FileViewAsyncAction +{ + sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds + sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned + Link aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result + + FileViewAsyncAction() + { + nMinTimeout = nMaxTimeout = 0; + } +}; + +class SVT_DLLPUBLIC SvtFileView : public Control +{ +private: + SvtFileView_Impl* mpImp; + + ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; + + SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); + + DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); + DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); + +protected: + virtual void GetFocus(); + +public: + SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection ); + SvtFileView( Window* pParent, const ResId& rResId, sal_Int8 nFlags ); + ~SvtFileView(); + + const String& GetViewURL() const; + String GetURL( SvLBoxEntry* pEntry ) const; + String GetCurrentURL() const; + + sal_Bool GetParentURL( String& _rParentURL ) const; + sal_Bool CreateNewFolder( const String& rNewFolder ); + + void SetHelpId( sal_uInt32 nHelpId ); + sal_uInt32 GetHelpId( ) const; + void SetSizePixel( const Size& rNewSize ); + using Window::SetPosSizePixel; + virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + + /** initialize the view with the content of a folder given by URL, and aply an immediate filter + + @param rFolderURL + the URL of the folder whose content is to be read + @param rFilter + the initial filter to be applied + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult Initialize( + const String& rFolderURL, + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor, + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + ); + + FileViewResult Initialize( + const String& rFolderURL, + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor ); + /** initialze the view with a sequence of contents, which have already been obtained elsewhere + + This method will never return eStillRunning, since it will fill the + view synchronously + */ + sal_Bool Initialize( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); + + /** initializes the view with the content of a folder given by an UCB content + */ + sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, + const String& rFilter ); + + /** reads the current content of the current folder again, and applies the given filter to it + + Note 1: The folder is really read a second time. This implies that any new elements (which were + not present when you called Initialize the last time) are now displayed. + + Note 2: This method must not be called when you previously initialized the view from a sequence + of strings, or a UNO content object. + + @param rFilter + the filter to be applied + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult ExecuteFilter( + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor + ); + + /** cancels a running async action (if any) + + @seealso Initialize + @seealso ExecuteFilter + @seealso FileViewAsyncAction + */ + void CancelRunningAsyncAction(); + + /** initializes the view with the parent folder of the current folder + + @param rNewURL + the URL of the folder which we just navigated to + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult PreviousLevel( + const FileViewAsyncAction* pAsyncDescriptor + ); + + void SetNoSelection(); + void ResetCursor(); + + void SetSelectHdl( const Link& rHdl ); + void SetDoubleClickHdl( const Link& rHdl ); + void SetOpenDoneHdl( const Link& rHdl ); + + ULONG GetSelectionCount() const; + SvLBoxEntry* FirstSelected() const; + SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; + void EnableAutoResize(); + void SetFocus(); + + void EnableContextMenu( sal_Bool bEnable ); + void EnableDelete( sal_Bool bEnable ); + void EnableNameReplacing( sal_Bool bEnable = sal_True ); + // translate folder names or display doc-title instead of file name + // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! + + // save and load column size and sort order + String GetConfigString() const; + void SetConfigString( const String& rCfgStr ); + + void SetUrlFilter( const IUrlFilter* _pFilter ); + const IUrlFilter* GetUrlFilter( ) const; + + void EndInplaceEditing( bool _bCancel ); + +protected: + virtual void StateChanged( StateChangedType nStateChange ); +}; + +// struct SvtContentEntry ------------------------------------------------ + +struct SvtContentEntry +{ + sal_Bool mbIsFolder; + UniString maURL; + + SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) : + mbIsFolder( bIsFolder ), maURL( rURL ) {} +}; + +namespace svtools { + +// ----------------------------------------------------------------------- +// QueryDeleteDlg_Impl +// ----------------------------------------------------------------------- + +enum QueryDeleteResult_Impl +{ + QUERYDELETE_YES = 0, + QUERYDELETE_NO, + QUERYDELETE_ALL, + QUERYDELETE_CANCEL +}; + +class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog +{ + FixedText _aEntryLabel; + FixedText _aEntry; + FixedText _aQueryMsg; + + PushButton _aYesButton; + PushButton _aAllButton; + PushButton _aNoButton; + CancelButton _aCancelButton; + + QueryDeleteResult_Impl _eResult; + +private: + + DECL_DLLPRIVATE_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton* ); + +public: + + QueryDeleteDlg_Impl( Window* pParent, + const String& rName ); + + void EnableAllButton() { _aAllButton.Enable( sal_True ); } + QueryDeleteResult_Impl GetResult() const { return _eResult; } +}; + +} + +#endif // _SVT_FILEVIEW_HXX + diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx new file mode 100644 index 000000000000..d323dada3396 --- /dev/null +++ b/svtools/inc/svtools/fltdefs.hxx @@ -0,0 +1,155 @@ +/************************************************************************* + * + * 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: fltdefs.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include +#include + +#include + +#ifndef _FLTDEFS_HXX +#define _FLTDEFS_HXX + + +#if defined ( WIN ) || defined ( WNT ) + +#define RGBQUAD RGBQUADWIN + +typedef struct RGBQUAD +{ + BYTE rgbBlue; + BYTE rgbGreen; + BYTE rgbRed; + BYTE rgbReserved; + + RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + rgbBlue ( cBlue ), + rgbGreen ( cGreen ), + rgbRed ( cRed ), + rgbReserved ( 0 ) {}; +} RGBQUAD; + + +#ifdef WIN +typedef BYTE huge* PDIBBYTE; +#define MEMCPY hmemcpy +#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) +#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) +#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) +#define MEMSET( pDst, cByte, nCount ) \ +{ \ + PDIBBYTE pTmp = (PDIBBYTE) pDst; \ + for ( ULONG i = 0; i < nCount; i++ )\ + *pTmp++ = cByte; \ +} + +#else + +typedef BYTE* PDIBBYTE; +#define MEMCPY memcpy +#define MEMSET memset +#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) +#define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) +#define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) + +#endif +#else + +typedef BYTE* PDIBBYTE; +#define MEMCPY memcpy +#define MEMSET memset +#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) +#define GLOBALFREE(pPointer) (delete[] (pPointer)) + +#endif + + +#if defined ( OS2 ) || defined ( UNX ) +void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); +void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); + +#ifdef OS2 +#define RGBQUAD RGBQUADOS2 +#define BITMAPFILEHEADER BITMAPFILEHEADEROS2 +#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2 +#define BITMAPINFOHEADER BITMAPINFOHEADEROS2 +#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2 +#define BITMAPINFO BITMAPINFOOS2 +#define PBITMAPINFO PBITMAPINFOOS2 +#endif + +typedef struct RGBQUAD +{ + BYTE rgbBlue; + BYTE rgbGreen; + BYTE rgbRed; + BYTE rgbReserved; + + RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + rgbBlue ( cBlue ), + rgbGreen ( cGreen ), + rgbRed ( cRed ), + rgbReserved ( 0 ) {}; +} RGBQUAD; + +typedef struct BITMAPFILEHEADER +{ + UINT16 bfType; + UINT32 bfSize; + UINT16 bfReserved1; + UINT16 bfReserved2; + UINT32 bfOffBits; +} BITMAPFILEHEADER; +typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; + +typedef struct BITMAPINFOHEADER +{ + UINT32 biSize; + UINT32 biWidth; + UINT32 biHeight; + UINT16 biPlanes; + UINT16 biBitCount; + UINT32 biCompression; + UINT32 biSizeImage; + UINT32 biXPelsPerMeter; + UINT32 biYPelsPerMeter; + UINT32 biClrUsed; + UINT32 biClrImportant; +} BITMAPINFOHEADER; +typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; + +typedef struct BITMAPINFO +{ + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[1]; +} BITMAPINFO; +typedef BITMAPINFO* PBITMAPINFO; + +#endif +#endif diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx new file mode 100644 index 000000000000..7ce7e64362b5 --- /dev/null +++ b/svtools/inc/svtools/fontsubstconfig.hxx @@ -0,0 +1,71 @@ +/************************************************************************* + * + * 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: fontsubstconfig.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_FONTSUBSTCONFIG_HXX +#define _SVT_FONTSUBSTCONFIG_HXX + +#include "svtools/svtdllapi.h" +#include + +struct SvtFontSubstConfig_Impl; + +//----------------------------------------------------------------------------- +struct SubstitutionStruct +{ + rtl::OUString sFont; + rtl::OUString sReplaceBy; + sal_Bool bReplaceAlways; + sal_Bool bReplaceOnScreenOnly; +}; +//----------------------------------------------------------------------------- +class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem +{ + sal_Bool bIsEnabled; + SvtFontSubstConfig_Impl* pImpl; +public: + SvtFontSubstConfig(); + virtual ~SvtFontSubstConfig(); + + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + + sal_Bool IsEnabled() const {return bIsEnabled;} + void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();} + + sal_Int32 SubstitutionCount() const; + void ClearSubstitutions(); + const SubstitutionStruct* GetSubstitution(sal_Int32 nPos); + void AddSubstitution(const SubstitutionStruct& rToAdd); + void Apply(); +}; + +#endif + + + diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx new file mode 100644 index 000000000000..63a2f296c753 --- /dev/null +++ b/svtools/inc/svtools/framestatuslistener.hxx @@ -0,0 +1,119 @@ +/************************************************************************* + * + * 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: framestatuslistener.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_FRAMESTATUSLISTENER_HXX +#define _SVTOOLS_FRAMESTATUSLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef INCLUDED_HASH_MAP +#include +#define INCLUDED_HASH_MAP +#endif + +namespace svt +{ + +class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener, + public ::com::sun::star::frame::XFrameActionListener, + public ::com::sun::star::lang::XComponent, + public ::comphelper::OBaseMutex, + public ::cppu::OWeakObject +{ + public: + FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); + virtual ~FrameStatusListener(); + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; + + void updateStatus( const rtl::OUString aCommandURL ); + + // methods to support status forwarder, known by the old sfx2 toolbox controller implementation + void addStatusListener( const rtl::OUString& aCommandURL ); + void removeStatusListener( const rtl::OUString& aCommandURL ); + void bindListener(); + void unbindListener(); + sal_Bool isBound() const; + + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); + + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0; + + // XFrameActionListener + virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); + + protected: + struct Listener + { + Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + aURL( rURL ), xDispatch( rDispatch ) {} + + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + }; + + typedef ::std::hash_map< ::rtl::OUString, + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, + ::rtl::OUStringHash, + ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + + sal_Bool m_bInitialized : 1, + m_bDisposed : 1; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + URLToDispatchMap m_aListenerMap; +}; + +} + +#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX diff --git a/svtools/inc/svtools/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx new file mode 100644 index 000000000000..b46f3a253f16 --- /dev/null +++ b/svtools/inc/svtools/helpagentwindow.hxx @@ -0,0 +1,91 @@ +/************************************************************************* + * + * 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: helpagentwindow.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_HELPAGENTWIDNOW_HXX_ +#define _SVTOOLS_HELPAGENTWIDNOW_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include + +//........................................................................ +namespace svt +{ +//........................................................................ + + //==================================================================== + //= IHelpAgentCallback + //==================================================================== + class IHelpAgentCallback + { + public: + virtual void helpRequested() = 0; + virtual void closeAgent() = 0; + }; + + //==================================================================== + //= HelpAgentWindow + //==================================================================== + class SVT_DLLPUBLIC HelpAgentWindow : public FloatingWindow + { + protected: + Window* m_pCloser; + IHelpAgentCallback* m_pCallback; + Size m_aPreferredSize; + Image m_aPicture; + + public: + HelpAgentWindow( Window* _pParent ); + ~HelpAgentWindow(); + + /// returns the preferred size of the window + const Size& getPreferredSizePixel() const { return m_aPreferredSize; } + + // callback handler maintainance + void setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; } + IHelpAgentCallback* getCallback() const { return m_pCallback; } + + protected: + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + + DECL_LINK( OnButtonClicked, Window* ); + + private: + SVT_DLLPRIVATE Size implOptimalButtonSize( const Image& _rButtonImage ); + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // _SVTOOLS_HELPAGENTWIDNOW_HXX_ + diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx new file mode 100644 index 000000000000..ce7cb4dd3e0f --- /dev/null +++ b/svtools/inc/svtools/htmlkywd.hxx @@ -0,0 +1,804 @@ +/************************************************************************* + * + * 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: htmlkywd.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _HTMLKYWD_HXX +#define _HTMLKYWD_HXX + +#include "sal/config.h" + +#define OOO_STRING_SVTOOLS_HTML_doctype32 \ + "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" +#define OOO_STRING_SVTOOLS_HTML_doctype40 \ + "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" + +// diese werden nur eingeschaltet +#define OOO_STRING_SVTOOLS_HTML_area "AREA" +#define OOO_STRING_SVTOOLS_HTML_base "BASE" +#define OOO_STRING_SVTOOLS_HTML_comment "!--" +#define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE" +#define OOO_STRING_SVTOOLS_HTML_embed "EMBED" +#define OOO_STRING_SVTOOLS_HTML_figureoverlay "OVERLAY" +#define OOO_STRING_SVTOOLS_HTML_horzrule "HR" +#define OOO_STRING_SVTOOLS_HTML_horztab "TAB" +#define OOO_STRING_SVTOOLS_HTML_image "IMG" +#define OOO_STRING_SVTOOLS_HTML_image2 "IMAGE" +#define OOO_STRING_SVTOOLS_HTML_input "INPUT" +#define OOO_STRING_SVTOOLS_HTML_isindex "ISINDEX" +#define OOO_STRING_SVTOOLS_HTML_linebreak "BR" +#define OOO_STRING_SVTOOLS_HTML_li "LI" +#define OOO_STRING_SVTOOLS_HTML_link "LINK" +#define OOO_STRING_SVTOOLS_HTML_meta "META" +#define OOO_STRING_SVTOOLS_HTML_nextid "NEXTID" +#define OOO_STRING_SVTOOLS_HTML_nobr "NOBR" +#define OOO_STRING_SVTOOLS_HTML_of "OF" +#define OOO_STRING_SVTOOLS_HTML_option "OPTION" +#define OOO_STRING_SVTOOLS_HTML_param "PARAM" +#define OOO_STRING_SVTOOLS_HTML_range "RANGE" +#define OOO_STRING_SVTOOLS_HTML_spacer "SPACER" +#define OOO_STRING_SVTOOLS_HTML_wbr "WBR" + +// diese werden wieder abgeschaltet +#define OOO_STRING_SVTOOLS_HTML_abbreviation "ABBREV" +#define OOO_STRING_SVTOOLS_HTML_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_acronym "ACRONYM" +#define OOO_STRING_SVTOOLS_HTML_address "ADDRESS" +#define OOO_STRING_SVTOOLS_HTML_anchor "A" +#define OOO_STRING_SVTOOLS_HTML_applet "APPLET" +#define OOO_STRING_SVTOOLS_HTML_array "ARRAY" +#define OOO_STRING_SVTOOLS_HTML_author "AU" +#define OOO_STRING_SVTOOLS_HTML_banner "BANNER" +#define OOO_STRING_SVTOOLS_HTML_bar "BAR" +#define OOO_STRING_SVTOOLS_HTML_basefont "BASEFONT" +#define OOO_STRING_SVTOOLS_HTML_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_bigprint "BIG" +#define OOO_STRING_SVTOOLS_HTML_blink "BLINK" +#define OOO_STRING_SVTOOLS_HTML_blockquote "BLOCKQUOTE" +#define OOO_STRING_SVTOOLS_HTML_blockquote30 "BQ" +#define OOO_STRING_SVTOOLS_HTML_body "BODY" +#define OOO_STRING_SVTOOLS_HTML_bold "B" +#define OOO_STRING_SVTOOLS_HTML_boldtext "BT" +#define OOO_STRING_SVTOOLS_HTML_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_caption "CAPTION" +#define OOO_STRING_SVTOOLS_HTML_center "CENTER" +#define OOO_STRING_SVTOOLS_HTML_citiation "CITE" +#define OOO_STRING_SVTOOLS_HTML_code "CODE" +#define OOO_STRING_SVTOOLS_HTML_col "COL" +#define OOO_STRING_SVTOOLS_HTML_colgroup "COLGROUP" +#define OOO_STRING_SVTOOLS_HTML_credit "CREDIT" +#define OOO_STRING_SVTOOLS_HTML_dd "DD" +#define OOO_STRING_SVTOOLS_HTML_deflist "DL" +#define OOO_STRING_SVTOOLS_HTML_deletedtext "DEL" +#define OOO_STRING_SVTOOLS_HTML_dirlist "DIR" +#define OOO_STRING_SVTOOLS_HTML_division "DIV" +#define OOO_STRING_SVTOOLS_HTML_dot "DOT" +#define OOO_STRING_SVTOOLS_HTML_doubledot "DDOT" +#define OOO_STRING_SVTOOLS_HTML_dt "DT" +#define OOO_STRING_SVTOOLS_HTML_emphasis "EM" +#define OOO_STRING_SVTOOLS_HTML_figure "FIG" +#define OOO_STRING_SVTOOLS_HTML_font "FONT" +#define OOO_STRING_SVTOOLS_HTML_footnote "FN" +#define OOO_STRING_SVTOOLS_HTML_form "FORM" +#define OOO_STRING_SVTOOLS_HTML_frame "FRAME" +#define OOO_STRING_SVTOOLS_HTML_frameset "FRAMESET" +#define OOO_STRING_SVTOOLS_HTML_hat "HAT" +#define OOO_STRING_SVTOOLS_HTML_head1 "H1" +#define OOO_STRING_SVTOOLS_HTML_head2 "H2" +#define OOO_STRING_SVTOOLS_HTML_head3 "H3" +#define OOO_STRING_SVTOOLS_HTML_head4 "H4" +#define OOO_STRING_SVTOOLS_HTML_head5 "H5" +#define OOO_STRING_SVTOOLS_HTML_head6 "H6" +#define OOO_STRING_SVTOOLS_HTML_head "HEAD" +#define OOO_STRING_SVTOOLS_HTML_html "HTML" +#define OOO_STRING_SVTOOLS_HTML_iframe "IFRAME" +#define OOO_STRING_SVTOOLS_HTML_ilayer "ILAYER" +#define OOO_STRING_SVTOOLS_HTML_insertedtext "INS" +#define OOO_STRING_SVTOOLS_HTML_italic "I" +#define OOO_STRING_SVTOOLS_HTML_item "ITEM" +#define OOO_STRING_SVTOOLS_HTML_keyboard "KBD" +#define OOO_STRING_SVTOOLS_HTML_language "LANG" +#define OOO_STRING_SVTOOLS_HTML_layer "LAYER" +#define OOO_STRING_SVTOOLS_HTML_listheader "LH" +#define OOO_STRING_SVTOOLS_HTML_map "MAP" +#define OOO_STRING_SVTOOLS_HTML_math "MATH" +#define OOO_STRING_SVTOOLS_HTML_menulist "MENU" +#define OOO_STRING_SVTOOLS_HTML_multicol "MULTICOL" +#define OOO_STRING_SVTOOLS_HTML_noembed "NOEMBED" +#define OOO_STRING_SVTOOLS_HTML_noframe "NOFRAME" +#define OOO_STRING_SVTOOLS_HTML_noframes "NOFRAMES" +#define OOO_STRING_SVTOOLS_HTML_noscript "NOSCRIPT" +#define OOO_STRING_SVTOOLS_HTML_note "NOTE" +#define OOO_STRING_SVTOOLS_HTML_object "OBJECT" +#define OOO_STRING_SVTOOLS_HTML_orderlist "OL" +#define OOO_STRING_SVTOOLS_HTML_parabreak "P" +#define OOO_STRING_SVTOOLS_HTML_person "PERSON" +#define OOO_STRING_SVTOOLS_HTML_plaintext "T" +#define OOO_STRING_SVTOOLS_HTML_preformtxt "PRE" +#define OOO_STRING_SVTOOLS_HTML_root "ROOT" +#define OOO_STRING_SVTOOLS_HTML_row "ROW" +#define OOO_STRING_SVTOOLS_HTML_sample "SAMP" +#define OOO_STRING_SVTOOLS_HTML_script "SCRIPT" +#define OOO_STRING_SVTOOLS_HTML_select "SELECT" +#define OOO_STRING_SVTOOLS_HTML_shortquote "Q" +#define OOO_STRING_SVTOOLS_HTML_smallprint "SMALL" +#define OOO_STRING_SVTOOLS_HTML_span "SPAN" +#define OOO_STRING_SVTOOLS_HTML_squareroot "AQRT" +#define OOO_STRING_SVTOOLS_HTML_strikethrough "S" +#define OOO_STRING_SVTOOLS_HTML_strong "STRONG" +#define OOO_STRING_SVTOOLS_HTML_style "STYLE" +#define OOO_STRING_SVTOOLS_HTML_subscript "SUB" +#define OOO_STRING_SVTOOLS_HTML_superscript "SUP" +#define OOO_STRING_SVTOOLS_HTML_table "TABLE" +#define OOO_STRING_SVTOOLS_HTML_tablerow "TR" +#define OOO_STRING_SVTOOLS_HTML_tabledata "TD" +#define OOO_STRING_SVTOOLS_HTML_tableheader "TH" +#define OOO_STRING_SVTOOLS_HTML_tbody "TBODY" +#define OOO_STRING_SVTOOLS_HTML_teletype "TT" +#define OOO_STRING_SVTOOLS_HTML_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_textarea "TEXTAREA" +#define OOO_STRING_SVTOOLS_HTML_textflow "TEXTFLOW" +#define OOO_STRING_SVTOOLS_HTML_tfoot "TFOOT" +#define OOO_STRING_SVTOOLS_HTML_thead "THEAD" +#define OOO_STRING_SVTOOLS_HTML_tilde "TILDE" +#define OOO_STRING_SVTOOLS_HTML_title "TITLE" +#define OOO_STRING_SVTOOLS_HTML_underline "U" +#define OOO_STRING_SVTOOLS_HTML_unorderlist "UL" +#define OOO_STRING_SVTOOLS_HTML_variable "VAR" +#define OOO_STRING_SVTOOLS_HTML_vector "VEC" + +// obsolete features +#define OOO_STRING_SVTOOLS_HTML_xmp "XMP" +#define OOO_STRING_SVTOOLS_HTML_listing "LISTING" + +// proposed features +#define OOO_STRING_SVTOOLS_HTML_definstance "DFN" +#define OOO_STRING_SVTOOLS_HTML_strike "STRIKE" +#define OOO_STRING_SVTOOLS_HTML_bgsound "BGSOUND" +#define OOO_STRING_SVTOOLS_HTML_comment2 "COMMENT" +#define OOO_STRING_SVTOOLS_HTML_marquee "MARQUEE" +#define OOO_STRING_SVTOOLS_HTML_plaintext2 "PLAINTEXT" +#define OOO_STRING_SVTOOLS_HTML_sdfield "SDFIELD" + +// die Namen fuer alle Zeichen +#define OOO_STRING_SVTOOLS_HTML_C_lt "lt" +#define OOO_STRING_SVTOOLS_HTML_C_gt "gt" +#define OOO_STRING_SVTOOLS_HTML_C_amp "amp" +#define OOO_STRING_SVTOOLS_HTML_C_quot "quot" +#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute" +#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave" +#define OOO_STRING_SVTOOLS_HTML_C_Acirc "Acirc" +#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde" +#define OOO_STRING_SVTOOLS_HTML_C_Aring "Aring" +#define OOO_STRING_SVTOOLS_HTML_C_Auml "Auml" +#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig" +#define OOO_STRING_SVTOOLS_HTML_C_Ccedil "Ccedil" +#define OOO_STRING_SVTOOLS_HTML_C_Eacute "Eacute" +#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave" +#define OOO_STRING_SVTOOLS_HTML_C_Ecirc "Ecirc" +#define OOO_STRING_SVTOOLS_HTML_C_Euml "Euml" +#define OOO_STRING_SVTOOLS_HTML_C_Iacute "Iacute" +#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave" +#define OOO_STRING_SVTOOLS_HTML_C_Icirc "Icirc" +#define OOO_STRING_SVTOOLS_HTML_C_Iuml "Iuml" +#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH" +#define OOO_STRING_SVTOOLS_HTML_C_Ntilde "Ntilde" +#define OOO_STRING_SVTOOLS_HTML_C_Oacute "Oacute" +#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve" +#define OOO_STRING_SVTOOLS_HTML_C_Ocirc "Ocirc" +#define OOO_STRING_SVTOOLS_HTML_C_Otilde "Otilde" +#define OOO_STRING_SVTOOLS_HTML_C_Ouml "Ouml" +#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash" +#define OOO_STRING_SVTOOLS_HTML_C_Uacute "Uacute" +#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave" +#define OOO_STRING_SVTOOLS_HTML_C_Ucirc "Ucirc" +#define OOO_STRING_SVTOOLS_HTML_C_Uuml "Uuml" +#define OOO_STRING_SVTOOLS_HTML_C_Yacute "Yacute" +#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN" +#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig" +#define OOO_STRING_SVTOOLS_HTML_S_aacute "aacute" +#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave" +#define OOO_STRING_SVTOOLS_HTML_S_acirc "acirc" +#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde" +#define OOO_STRING_SVTOOLS_HTML_S_aring "aring" +#define OOO_STRING_SVTOOLS_HTML_S_auml "auml" +#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig" +#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil" +#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute" +#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave" +#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc" +#define OOO_STRING_SVTOOLS_HTML_S_euml "euml" +#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute" +#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave" +#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc" +#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml" +#define OOO_STRING_SVTOOLS_HTML_S_eth "eth" +#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde" +#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute" +#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve" +#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc" +#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde" +#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml" +#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash" +#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute" +#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave" +#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc" +#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml" +#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute" +#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn" +#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml" +#define OOO_STRING_SVTOOLS_HTML_S_acute "acute" +#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar" +#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil" +#define OOO_STRING_SVTOOLS_HTML_S_cent "cent" +#define OOO_STRING_SVTOOLS_HTML_S_copy "copy" +#define OOO_STRING_SVTOOLS_HTML_S_curren "curren" +#define OOO_STRING_SVTOOLS_HTML_S_deg "deg" +#define OOO_STRING_SVTOOLS_HTML_S_divide "divide" +#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12" +#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14" +#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34" +#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl" +#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest" +#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo" +#define OOO_STRING_SVTOOLS_HTML_S_macr "macr" +#define OOO_STRING_SVTOOLS_HTML_S_micro "micro" +#define OOO_STRING_SVTOOLS_HTML_S_middot "middot" +#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp" +#define OOO_STRING_SVTOOLS_HTML_S_not "not" +#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf" +#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm" +#define OOO_STRING_SVTOOLS_HTML_S_para "para" +#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn" +#define OOO_STRING_SVTOOLS_HTML_S_pound "pound" +#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo" +#define OOO_STRING_SVTOOLS_HTML_S_reg "reg" +#define OOO_STRING_SVTOOLS_HTML_S_sect "sect" +#define OOO_STRING_SVTOOLS_HTML_S_shy "shy" +#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1" +#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2" +#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3" +#define OOO_STRING_SVTOOLS_HTML_S_times "times" +#define OOO_STRING_SVTOOLS_HTML_S_uml "uml" +#define OOO_STRING_SVTOOLS_HTML_S_yen "yen" + +// Netscape kennt noch ein paar in Grossbuchstaben ... +#define OOO_STRING_SVTOOLS_HTML_C_LT "LT" +#define OOO_STRING_SVTOOLS_HTML_C_GT "GT" +#define OOO_STRING_SVTOOLS_HTML_C_AMP "AMP" +#define OOO_STRING_SVTOOLS_HTML_C_QUOT "QUOT" +#define OOO_STRING_SVTOOLS_HTML_S_COPY "COPY" +#define OOO_STRING_SVTOOLS_HTML_S_REG "REG" + +// HTML4 +#define OOO_STRING_SVTOOLS_HTML_S_alefsym "alefsym" +#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha" +#define OOO_STRING_SVTOOLS_HTML_S_alpha "alpha" +#define OOO_STRING_SVTOOLS_HTML_S_and "and" +#define OOO_STRING_SVTOOLS_HTML_S_ang "ang" +#define OOO_STRING_SVTOOLS_HTML_S_asymp "asymp" +#define OOO_STRING_SVTOOLS_HTML_S_bdquo "bdquo" +#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta" +#define OOO_STRING_SVTOOLS_HTML_S_beta "beta" +#define OOO_STRING_SVTOOLS_HTML_S_bull "bull" +#define OOO_STRING_SVTOOLS_HTML_S_cap "cap" +#define OOO_STRING_SVTOOLS_HTML_S_chi "chi" +#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi" +#define OOO_STRING_SVTOOLS_HTML_S_circ "circ" +#define OOO_STRING_SVTOOLS_HTML_S_clubs "clubs" +#define OOO_STRING_SVTOOLS_HTML_S_cong "cong" +#define OOO_STRING_SVTOOLS_HTML_S_crarr "crarr" +#define OOO_STRING_SVTOOLS_HTML_S_cup "cup" +#define OOO_STRING_SVTOOLS_HTML_S_dagger "dagger" +#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger" +#define OOO_STRING_SVTOOLS_HTML_S_darr "darr" +#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr" +#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta" +#define OOO_STRING_SVTOOLS_HTML_S_delta "delta" +#define OOO_STRING_SVTOOLS_HTML_S_diams "diams" +#define OOO_STRING_SVTOOLS_HTML_S_empty "empty" +#define OOO_STRING_SVTOOLS_HTML_S_emsp "emsp" +#define OOO_STRING_SVTOOLS_HTML_S_ensp "ensp" +#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon" +#define OOO_STRING_SVTOOLS_HTML_S_epsilon "epsilon" +#define OOO_STRING_SVTOOLS_HTML_S_equiv "equiv" +#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta" +#define OOO_STRING_SVTOOLS_HTML_S_eta "eta" +#define OOO_STRING_SVTOOLS_HTML_S_euro "euro" +#define OOO_STRING_SVTOOLS_HTML_S_exist "exist" +#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof" +#define OOO_STRING_SVTOOLS_HTML_S_forall "forall" +#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl" +#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma" +#define OOO_STRING_SVTOOLS_HTML_S_gamma "gamma" +#define OOO_STRING_SVTOOLS_HTML_S_ge "ge" +#define OOO_STRING_SVTOOLS_HTML_S_harr "harr" +#define OOO_STRING_SVTOOLS_HTML_S_hArr "hArr" +#define OOO_STRING_SVTOOLS_HTML_S_hearts "hearts" +#define OOO_STRING_SVTOOLS_HTML_S_hellip "hellip" +#define OOO_STRING_SVTOOLS_HTML_S_image "image" +#define OOO_STRING_SVTOOLS_HTML_S_infin "infin" +#define OOO_STRING_SVTOOLS_HTML_S_int "int" +#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota" +#define OOO_STRING_SVTOOLS_HTML_S_iota "iota" +#define OOO_STRING_SVTOOLS_HTML_S_isin "isin" +#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa" +#define OOO_STRING_SVTOOLS_HTML_S_kappa "kappa" +#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda" +#define OOO_STRING_SVTOOLS_HTML_S_lambda "lambda" +#define OOO_STRING_SVTOOLS_HTML_S_lang "lang" +#define OOO_STRING_SVTOOLS_HTML_S_larr "larr" +#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr" +#define OOO_STRING_SVTOOLS_HTML_S_lceil "lceil" +#define OOO_STRING_SVTOOLS_HTML_S_ldquo "ldquo" +#define OOO_STRING_SVTOOLS_HTML_S_le "le" +#define OOO_STRING_SVTOOLS_HTML_S_lfloor "lfloor" +#define OOO_STRING_SVTOOLS_HTML_S_lowast "lowast" +#define OOO_STRING_SVTOOLS_HTML_S_loz "loz" +#define OOO_STRING_SVTOOLS_HTML_S_lrm "lrm" +#define OOO_STRING_SVTOOLS_HTML_S_lsaquo "lsaquo" +#define OOO_STRING_SVTOOLS_HTML_S_lsquo "lsquo" +#define OOO_STRING_SVTOOLS_HTML_S_mdash "mdash" +#define OOO_STRING_SVTOOLS_HTML_S_minus "minus" +#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu" +#define OOO_STRING_SVTOOLS_HTML_S_mu "mu" +#define OOO_STRING_SVTOOLS_HTML_S_nabla "nabla" +#define OOO_STRING_SVTOOLS_HTML_S_ndash "ndash" +#define OOO_STRING_SVTOOLS_HTML_S_ne "ne" +#define OOO_STRING_SVTOOLS_HTML_S_ni "ni" +#define OOO_STRING_SVTOOLS_HTML_S_notin "notin" +#define OOO_STRING_SVTOOLS_HTML_S_nsub "nsub" +#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu" +#define OOO_STRING_SVTOOLS_HTML_S_nu "nu" +#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig" +#define OOO_STRING_SVTOOLS_HTML_S_oelig "oelig" +#define OOO_STRING_SVTOOLS_HTML_S_oline "oline" +#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega" +#define OOO_STRING_SVTOOLS_HTML_S_omega "omega" +#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron" +#define OOO_STRING_SVTOOLS_HTML_S_omicron "omicron" +#define OOO_STRING_SVTOOLS_HTML_S_oplus "oplus" +#define OOO_STRING_SVTOOLS_HTML_S_or "or" +#define OOO_STRING_SVTOOLS_HTML_S_otimes "otimes" +#define OOO_STRING_SVTOOLS_HTML_S_part "part" +#define OOO_STRING_SVTOOLS_HTML_S_permil "permil" +#define OOO_STRING_SVTOOLS_HTML_S_perp "perp" +#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi" +#define OOO_STRING_SVTOOLS_HTML_S_phi "phi" +#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi" +#define OOO_STRING_SVTOOLS_HTML_S_pi "pi" +#define OOO_STRING_SVTOOLS_HTML_S_piv "piv" +#define OOO_STRING_SVTOOLS_HTML_S_prime "prime" +#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime" +#define OOO_STRING_SVTOOLS_HTML_S_prod "prod" +#define OOO_STRING_SVTOOLS_HTML_S_prop "prop" +#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi" +#define OOO_STRING_SVTOOLS_HTML_S_psi "psi" +#define OOO_STRING_SVTOOLS_HTML_S_radic "radic" +#define OOO_STRING_SVTOOLS_HTML_S_rang "rang" +#define OOO_STRING_SVTOOLS_HTML_S_rarr "rarr" +#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr" +#define OOO_STRING_SVTOOLS_HTML_S_rceil "rceil" +#define OOO_STRING_SVTOOLS_HTML_S_rdquo "rdquo" +#define OOO_STRING_SVTOOLS_HTML_S_real "real" +#define OOO_STRING_SVTOOLS_HTML_S_rfloor "rfloor" +#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho" +#define OOO_STRING_SVTOOLS_HTML_S_rho "rho" +#define OOO_STRING_SVTOOLS_HTML_S_rlm "rlm" +#define OOO_STRING_SVTOOLS_HTML_S_rsaquo "rsaquo" +#define OOO_STRING_SVTOOLS_HTML_S_rsquo "rsquo" +#define OOO_STRING_SVTOOLS_HTML_S_sbquo "sbquo" +#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron" +#define OOO_STRING_SVTOOLS_HTML_S_scaron "scaron" +#define OOO_STRING_SVTOOLS_HTML_S_sdot "sdot" +#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma" +#define OOO_STRING_SVTOOLS_HTML_S_sigma "sigma" +#define OOO_STRING_SVTOOLS_HTML_S_sigmaf "sigmaf" +#define OOO_STRING_SVTOOLS_HTML_S_sim "sim" +#define OOO_STRING_SVTOOLS_HTML_S_spades "spades" +#define OOO_STRING_SVTOOLS_HTML_S_sub "sub" +#define OOO_STRING_SVTOOLS_HTML_S_sube "sube" +#define OOO_STRING_SVTOOLS_HTML_S_sum "sum" +#define OOO_STRING_SVTOOLS_HTML_S_sup "sup" +#define OOO_STRING_SVTOOLS_HTML_S_supe "supe" +#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau" +#define OOO_STRING_SVTOOLS_HTML_S_tau "tau" +#define OOO_STRING_SVTOOLS_HTML_S_there4 "there4" +#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta" +#define OOO_STRING_SVTOOLS_HTML_S_theta "theta" +#define OOO_STRING_SVTOOLS_HTML_S_thetasym "thetasym" +#define OOO_STRING_SVTOOLS_HTML_S_thinsp "thinsp" +#define OOO_STRING_SVTOOLS_HTML_S_tilde "tilde" +#define OOO_STRING_SVTOOLS_HTML_S_trade "trade" +#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr" +#define OOO_STRING_SVTOOLS_HTML_S_uArr "uArr" +#define OOO_STRING_SVTOOLS_HTML_S_upsih "upsih" +#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon" +#define OOO_STRING_SVTOOLS_HTML_S_upsilon "upsilon" +#define OOO_STRING_SVTOOLS_HTML_S_weierp "weierp" +#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi" +#define OOO_STRING_SVTOOLS_HTML_S_xi "xi" +#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml" +#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta" +#define OOO_STRING_SVTOOLS_HTML_S_zeta "zeta" +#define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj" +#define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj" + +// HTML Attribut-Token (=Optionen) + +// Attribute ohne Wert +#define OOO_STRING_SVTOOLS_HTML_O_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_O_checked "CHECKED" +#define OOO_STRING_SVTOOLS_HTML_O_compact "COMPACT" +#define OOO_STRING_SVTOOLS_HTML_O_continue "CONTINUE" +#define OOO_STRING_SVTOOLS_HTML_O_controls "CONTROLS" +#define OOO_STRING_SVTOOLS_HTML_O_declare "DECLARE" +#define OOO_STRING_SVTOOLS_HTML_O_disabled "DISABLED" +#define OOO_STRING_SVTOOLS_HTML_O_folded "FOLDED" +#define OOO_STRING_SVTOOLS_HTML_O_ismap "ISMAP" +#define OOO_STRING_SVTOOLS_HTML_O_mayscript "MAYSCRIPT" +#define OOO_STRING_SVTOOLS_HTML_O_multiple "MULTIPLE" +#define OOO_STRING_SVTOOLS_HTML_O_noflow "NOFLOW" +#define OOO_STRING_SVTOOLS_HTML_O_nohref "NOHREF" +#define OOO_STRING_SVTOOLS_HTML_O_noresize "NORESIZE" +#define OOO_STRING_SVTOOLS_HTML_O_noshade "NOSHADE" +#define OOO_STRING_SVTOOLS_HTML_O_nowrap "NOWRAP" +#define OOO_STRING_SVTOOLS_HTML_O_plain "PLAIN" +#define OOO_STRING_SVTOOLS_HTML_O_sdfixed "SDFIXED" +#define OOO_STRING_SVTOOLS_HTML_O_selected "SELECTED" +#define OOO_STRING_SVTOOLS_HTML_O_shapes "SHAPES" + +// Attribute mit einem String als Wert +#define OOO_STRING_SVTOOLS_HTML_O_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_O_accesskey "ACCESSKEY" +#define OOO_STRING_SVTOOLS_HTML_O_accept "ACCEPT" +#define OOO_STRING_SVTOOLS_HTML_O_add_date "ADD_DATE" +#define OOO_STRING_SVTOOLS_HTML_O_alt "ALT" +#define OOO_STRING_SVTOOLS_HTML_O_axes "AXES" +#define OOO_STRING_SVTOOLS_HTML_O_axis "AXIS" +#define OOO_STRING_SVTOOLS_HTML_O_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_O_char "CHAR" +#define OOO_STRING_SVTOOLS_HTML_O_class "CLASS" +#define OOO_STRING_SVTOOLS_HTML_O_clip "CLIP" +#define OOO_STRING_SVTOOLS_HTML_O_code "CODE" +#define OOO_STRING_SVTOOLS_HTML_O_codetype "CODETYPE" +#define OOO_STRING_SVTOOLS_HTML_O_colspec "COLSPEC" +#define OOO_STRING_SVTOOLS_HTML_O_content "CONTENT" +#define OOO_STRING_SVTOOLS_HTML_O_coords "COORDS" +#define OOO_STRING_SVTOOLS_HTML_O_dp "DP" +#define OOO_STRING_SVTOOLS_HTML_O_enctype "ENCTYPE" +#define OOO_STRING_SVTOOLS_HTML_O_error "ERROR" +#define OOO_STRING_SVTOOLS_HTML_O_face "FACE" +#define OOO_STRING_SVTOOLS_HTML_O_frameborder "FRAMEBORDER" +#define OOO_STRING_SVTOOLS_HTML_O_httpequiv "HTTP-EQUIV" +#define OOO_STRING_SVTOOLS_HTML_O_language "LANGUAGE" +#define OOO_STRING_SVTOOLS_HTML_O_last_modified "LAST_MODIFIED" +#define OOO_STRING_SVTOOLS_HTML_O_last_visit "LAST_VISIT" +#define OOO_STRING_SVTOOLS_HTML_O_md "MD" +#define OOO_STRING_SVTOOLS_HTML_O_n "N" +#define OOO_STRING_SVTOOLS_HTML_O_name "NAME" +#define OOO_STRING_SVTOOLS_HTML_O_notation "NOTATION" +#define OOO_STRING_SVTOOLS_HTML_O_prompt "PROMPT" +#define OOO_STRING_SVTOOLS_HTML_O_shape "SHAPE" +#define OOO_STRING_SVTOOLS_HTML_O_standby "STANDBY" +#define OOO_STRING_SVTOOLS_HTML_O_style "STYLE" +#define OOO_STRING_SVTOOLS_HTML_O_title "TITLE" +#define OOO_STRING_SVTOOLS_HTML_O_value "VALUE" +#define OOO_STRING_SVTOOLS_HTML_O_SDval "SDVAL" +#define OOO_STRING_SVTOOLS_HTML_O_SDnum "SDNUM" +#define OOO_STRING_SVTOOLS_HTML_O_sdlibrary "SDLIBRARY" +#define OOO_STRING_SVTOOLS_HTML_O_sdmodule "SDMODULE" +#define OOO_STRING_SVTOOLS_HTML_O_sdevent "SDEVENT-" +#define OOO_STRING_SVTOOLS_HTML_O_sdaddparam "SDADDPARAM-" + +// Attribute mit einem SGML-Identifier als Wert +#define OOO_STRING_SVTOOLS_HTML_O_from "FROM" +#define OOO_STRING_SVTOOLS_HTML_O_id "ID" +#define OOO_STRING_SVTOOLS_HTML_O_target "TARGET" +#define OOO_STRING_SVTOOLS_HTML_O_to "TO" +#define OOO_STRING_SVTOOLS_HTML_O_until "UNTIL" + +// Attribute mit einem URI als Wert +#define OOO_STRING_SVTOOLS_HTML_O_action "ACTION" +#define OOO_STRING_SVTOOLS_HTML_O_archive "ARCHIVE" +#define OOO_STRING_SVTOOLS_HTML_O_background "BACKGROUND" +#define OOO_STRING_SVTOOLS_HTML_O_classid "CLASSID" +#define OOO_STRING_SVTOOLS_HTML_O_codebase "CODEBASE" +#define OOO_STRING_SVTOOLS_HTML_O_data "DATA" +#define OOO_STRING_SVTOOLS_HTML_O_dynsrc "DYNSRC" +#define OOO_STRING_SVTOOLS_HTML_O_dynsync "DYNSYNC" +#define OOO_STRING_SVTOOLS_HTML_O_imagemap "IMAGEMAP" +#define OOO_STRING_SVTOOLS_HTML_O_href "HREF" +#define OOO_STRING_SVTOOLS_HTML_O_lowsrc "LOWSRC" +#define OOO_STRING_SVTOOLS_HTML_O_script "SCRIPT" +#define OOO_STRING_SVTOOLS_HTML_O_src "SRC" +#define OOO_STRING_SVTOOLS_HTML_O_usemap "USEMAP" + +// Attribute mit Entity-Namen als Wert +#define OOO_STRING_SVTOOLS_HTML_O_dingbat "DINGBAT" +#define OOO_STRING_SVTOOLS_HTML_O_sym "SYM" + +// Attribute mit einer Farbe als Wert (alle Netscape) +#define OOO_STRING_SVTOOLS_HTML_O_alink "ALINK" +#define OOO_STRING_SVTOOLS_HTML_O_bgcolor "BGCOLOR" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolor "BORDERCOLOR" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolorlight "BORDERCOLORLIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolordark "BORDERCOLORDARK" +#define OOO_STRING_SVTOOLS_HTML_O_color "COLOR" +#define OOO_STRING_SVTOOLS_HTML_O_link "LINK" +#define OOO_STRING_SVTOOLS_HTML_O_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_O_vlink "VLINK" + +// Attribute mit einem numerischen Wert +#define OOO_STRING_SVTOOLS_HTML_O_border "BORDER" +#define OOO_STRING_SVTOOLS_HTML_O_cellspacing "CELLSPACING" +#define OOO_STRING_SVTOOLS_HTML_O_cellpadding "CELLPADDING" +#define OOO_STRING_SVTOOLS_HTML_O_charoff "CHAROFF" +#define OOO_STRING_SVTOOLS_HTML_O_colspan "COLSPAN" +#define OOO_STRING_SVTOOLS_HTML_O_framespacing "FRAMESPACING" +#define OOO_STRING_SVTOOLS_HTML_O_gutter "GUTTER" +#define OOO_STRING_SVTOOLS_HTML_O_indent "INDENT" +#define OOO_STRING_SVTOOLS_HTML_O_height "HEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_hspace "HSPACE" +#define OOO_STRING_SVTOOLS_HTML_O_left "LEFT" +#define OOO_STRING_SVTOOLS_HTML_O_leftmargin "LEFTMARGIN" +#define OOO_STRING_SVTOOLS_HTML_O_loop "LOOP" +#define OOO_STRING_SVTOOLS_HTML_O_marginheight "MARGINHEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_marginwidth "MARGINWIDTH" +#define OOO_STRING_SVTOOLS_HTML_O_max "MAX" +#define OOO_STRING_SVTOOLS_HTML_O_maxlength "MAXLENGTH" +#define OOO_STRING_SVTOOLS_HTML_O_min "MIN" +#define OOO_STRING_SVTOOLS_HTML_O_pagex "PAGEX" +#define OOO_STRING_SVTOOLS_HTML_O_pagey "PAGEY" +#define OOO_STRING_SVTOOLS_HTML_O_pointsize "POINT-SIZE" +#define OOO_STRING_SVTOOLS_HTML_O_rowspan "ROWSPAN" +#define OOO_STRING_SVTOOLS_HTML_O_scrollamount "SCROLLAMOUNT" +#define OOO_STRING_SVTOOLS_HTML_O_scrolldelay "SCROLLDELAY" +#define OOO_STRING_SVTOOLS_HTML_O_seqnum "SEQNUM" +#define OOO_STRING_SVTOOLS_HTML_O_skip "SKIP" +#define OOO_STRING_SVTOOLS_HTML_O_span "SPAN" +#define OOO_STRING_SVTOOLS_HTML_O_tabindex "TABINDEX" +#define OOO_STRING_SVTOOLS_HTML_O_top "TOP" +#define OOO_STRING_SVTOOLS_HTML_O_topmargin "TOPMARGIN" +#define OOO_STRING_SVTOOLS_HTML_O_vspace "VSPACE" +#define OOO_STRING_SVTOOLS_HTML_O_weight "WEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_width "WIDTH" +#define OOO_STRING_SVTOOLS_HTML_O_x "X" +#define OOO_STRING_SVTOOLS_HTML_O_y "Y" +#define OOO_STRING_SVTOOLS_HTML_O_zindex "Z-INDEX" + +// Attribute mit Enum-Werten +#define OOO_STRING_SVTOOLS_HTML_O_behavior "BEHAVIOR" +#define OOO_STRING_SVTOOLS_HTML_O_bgproperties "BGPROPERTIES" +#define OOO_STRING_SVTOOLS_HTML_O_clear "CLEAR" +#define OOO_STRING_SVTOOLS_HTML_O_dir "DIR" +#define OOO_STRING_SVTOOLS_HTML_O_direction "DIRECTION" +#define OOO_STRING_SVTOOLS_HTML_O_format "FORMAT" +#define OOO_STRING_SVTOOLS_HTML_O_frame "FRAME" +#define OOO_STRING_SVTOOLS_HTML_O_lang "LANG" +#define OOO_STRING_SVTOOLS_HTML_O_method "METHOD" +#define OOO_STRING_SVTOOLS_HTML_O_palette "PALETTE" +#define OOO_STRING_SVTOOLS_HTML_O_rel "REL" +#define OOO_STRING_SVTOOLS_HTML_O_rev "REV" +#define OOO_STRING_SVTOOLS_HTML_O_rules "RULES" +#define OOO_STRING_SVTOOLS_HTML_O_scrolling "SCROLLING" +#define OOO_STRING_SVTOOLS_HTML_O_sdreadonly "READONLY" +#define OOO_STRING_SVTOOLS_HTML_O_subtype "SUBTYPE" +#define OOO_STRING_SVTOOLS_HTML_O_type "TYPE" +#define OOO_STRING_SVTOOLS_HTML_O_valign "VALIGN" +#define OOO_STRING_SVTOOLS_HTML_O_valuetype "VALUETYPE" +#define OOO_STRING_SVTOOLS_HTML_O_visibility "VISIBILITY" +#define OOO_STRING_SVTOOLS_HTML_O_wrap "WRAP" + +// Attribute mit Script-Code als Wert +#define OOO_STRING_SVTOOLS_HTML_O_onblur "ONBLUR" +#define OOO_STRING_SVTOOLS_HTML_O_onchange "ONCHANGE" +#define OOO_STRING_SVTOOLS_HTML_O_onclick "ONCLICK" +#define OOO_STRING_SVTOOLS_HTML_O_onfocus "ONFOCUS" +#define OOO_STRING_SVTOOLS_HTML_O_onload "ONLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_onmouseover "ONMOUSEOVER" +#define OOO_STRING_SVTOOLS_HTML_O_onreset "ONRESET" +#define OOO_STRING_SVTOOLS_HTML_O_onselect "ONSELECT" +#define OOO_STRING_SVTOOLS_HTML_O_onsubmit "ONSUBMIT" +#define OOO_STRING_SVTOOLS_HTML_O_onunload "ONUNLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_onabort "ONABORT" +#define OOO_STRING_SVTOOLS_HTML_O_onerror "ONERROR" +#define OOO_STRING_SVTOOLS_HTML_O_onmouseout "ONMOUSEOUT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonblur "SDONBLUR" +#define OOO_STRING_SVTOOLS_HTML_O_SDonchange "SDONCHANGE" +#define OOO_STRING_SVTOOLS_HTML_O_SDonclick "SDONCLICK" +#define OOO_STRING_SVTOOLS_HTML_O_SDonfocus "SDONFOCUS" +#define OOO_STRING_SVTOOLS_HTML_O_SDonload "SDONLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseover "SDONMOUSEOVER" +#define OOO_STRING_SVTOOLS_HTML_O_SDonreset "SDONRESET" +#define OOO_STRING_SVTOOLS_HTML_O_SDonselect "SDONSELECT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonsubmit "SDONSUBMIT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonunload "SDONUNLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_SDonabort "SDONABORT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonerror "SDONERROR" +#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseout "SDONMOUSEOUT" + +// Attribute mit Kontext-abhaengigen Werten +#define OOO_STRING_SVTOOLS_HTML_O_align "ALIGN" +#define OOO_STRING_SVTOOLS_HTML_O_cols "COLS" +#define OOO_STRING_SVTOOLS_HTML_O_rows "ROWS" +#define OOO_STRING_SVTOOLS_HTML_O_start "START" +#define OOO_STRING_SVTOOLS_HTML_O_size "SIZE" +#define OOO_STRING_SVTOOLS_HTML_O_units "UNITS" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_IT_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_IT_password "PASSWORD" +#define OOO_STRING_SVTOOLS_HTML_IT_checkbox "CHECKBOX" +#define OOO_STRING_SVTOOLS_HTML_IT_radio "RADIO" +#define OOO_STRING_SVTOOLS_HTML_IT_range "RANGE" +#define OOO_STRING_SVTOOLS_HTML_IT_scribble "SCRIBBLE" +#define OOO_STRING_SVTOOLS_HTML_IT_file "FILE" +#define OOO_STRING_SVTOOLS_HTML_IT_hidden "HIDDEN" +#define OOO_STRING_SVTOOLS_HTML_IT_submit "SUBMIT" +#define OOO_STRING_SVTOOLS_HTML_IT_image "IMAGE" +#define OOO_STRING_SVTOOLS_HTML_IT_reset "RESET" +#define OOO_STRING_SVTOOLS_HTML_IT_button "BUTTON" + +// Werte von
+#define OOO_STRING_SVTOOLS_HTML_TF_void "VOID" +#define OOO_STRING_SVTOOLS_HTML_TF_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_TF_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_TF_hsides "HSIDES" +#define OOO_STRING_SVTOOLS_HTML_TF_lhs "LHS" +#define OOO_STRING_SVTOOLS_HTML_TF_rhs "RHS" +#define OOO_STRING_SVTOOLS_HTML_TF_vsides "VSIDES" +#define OOO_STRING_SVTOOLS_HTML_TF_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_TF_border "BORDER" + +// Werte von
+#define OOO_STRING_SVTOOLS_HTML_TR_none "NONE" +#define OOO_STRING_SVTOOLS_HTML_TR_groups "GROUPS" +#define OOO_STRING_SVTOOLS_HTML_TR_rows "ROWS" +#define OOO_STRING_SVTOOLS_HTML_TR_cols "COLS" +#define OOO_STRING_SVTOOLS_HTML_TR_all "ALL" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_AL_left "LEFT" +#define OOO_STRING_SVTOOLS_HTML_AL_center "CENTER" +#define OOO_STRING_SVTOOLS_HTML_AL_middle "MIDDLE" +#define OOO_STRING_SVTOOLS_HTML_AL_right "RIGHT" +#define OOO_STRING_SVTOOLS_HTML_AL_justify "JUSTIFY" +#define OOO_STRING_SVTOOLS_HTML_AL_char "CHAR" +#define OOO_STRING_SVTOOLS_HTML_AL_all "ALL" +#define OOO_STRING_SVTOOLS_HTML_AL_none "NONE" + +// Werte von , +#define OOO_STRING_SVTOOLS_HTML_VA_top "TOP" +#define OOO_STRING_SVTOOLS_HTML_VA_middle "MIDDLE" +#define OOO_STRING_SVTOOLS_HTML_VA_bottom "BOTTOM" +#define OOO_STRING_SVTOOLS_HTML_VA_baseline "BASELINE" +#define OOO_STRING_SVTOOLS_HTML_VA_texttop "TEXTTOP" +#define OOO_STRING_SVTOOLS_HTML_VA_absmiddle "ABSMIDDLE" +#define OOO_STRING_SVTOOLS_HTML_VA_absbottom "ABSBOTTOM" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_SH_rect "RECT" +#define OOO_STRING_SVTOOLS_HTML_SH_rectangle "RECTANGLE" +#define OOO_STRING_SVTOOLS_HTML_SH_circ "CIRC" +#define OOO_STRING_SVTOOLS_HTML_SH_circle "CIRCLE" +#define OOO_STRING_SVTOOLS_HTML_SH_poly "POLY" +#define OOO_STRING_SVTOOLS_HTML_SH_polygon "POLYGON" +#define OOO_STRING_SVTOOLS_HTML_SH_default "DEFAULT" + +#define OOO_STRING_SVTOOLS_HTML_LG_starbasic "STARBASIC" +#define OOO_STRING_SVTOOLS_HTML_LG_javascript "JAVASCRIPT" +#define OOO_STRING_SVTOOLS_HTML_LG_javascript11 "JAVASCRIPT1.1" +#define OOO_STRING_SVTOOLS_HTML_LG_livescript "LIVESCRIPT" + +// ein par Werte fuer unser StarBASIC-Support +#define OOO_STRING_SVTOOLS_HTML_SB_library "$LIBRARY:" +#define OOO_STRING_SVTOOLS_HTML_SB_module "$MODULE:" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_METHOD_get "GET" +#define OOO_STRING_SVTOOLS_HTML_METHOD_post "POST" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_META_refresh "REFRESH" +#define OOO_STRING_SVTOOLS_HTML_META_generator "GENERATOR" +#define OOO_STRING_SVTOOLS_HTML_META_author "AUTHOR" +#define OOO_STRING_SVTOOLS_HTML_META_classification "CLASSIFICATION" +#define OOO_STRING_SVTOOLS_HTML_META_description "DESCRIPTION" +#define OOO_STRING_SVTOOLS_HTML_META_keywords "KEYWORDS" +#define OOO_STRING_SVTOOLS_HTML_META_changed "CHANGED" +#define OOO_STRING_SVTOOLS_HTML_META_changedby "CHANGEDBY" +#define OOO_STRING_SVTOOLS_HTML_META_created "CREATED" +#define OOO_STRING_SVTOOLS_HTML_META_content_type "CONTENT-TYPE" +#define OOO_STRING_SVTOOLS_HTML_META_content_script_type "CONTENT-SCRIPT-TYPE" +#define OOO_STRING_SVTOOLS_HTML_META_sdendnote "SDENDNOTE" +#define OOO_STRING_SVTOOLS_HTML_META_sdfootnote "SDFOOTNOTE" + +// Werte von
    +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_disc "DISC" +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "SQUARE" +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "CIRCLE" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "YES" +#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "NO" +#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "AUTO" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "HORIZONTAL" +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "VERTICAL" +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "BOX" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "SCROLL" +#define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "SLIDE" +#define OOO_STRING_SVTOOLS_HTML_BEHAV_alternate "ALTERNATE" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_LOOP_infinite "INFINITE" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_block "BLOCK" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal "HORIZONTAL" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical "VERTICAL" + +// interne Grafik-Namen +#define OOO_STRING_SVTOOLS_HTML_private_image "private:image/" +#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-" +#define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary "binary" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image "image" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index "index" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu "menu" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie "movie" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound "sound" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet "telnet" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text "text" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown "unknown" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata "baddata" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed "delayed" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_embed "embed" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure "insecure" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound "notfound" +#define OOO_STRING_SVTOOLS_HTML_sdendnote "sdendnote" +#define OOO_STRING_SVTOOLS_HTML_sdendnote_anc "sdendnoteanc" +#define OOO_STRING_SVTOOLS_HTML_sdendnote_sym "sdendnotesym" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote "sdfootnote" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote_anc "sdfootnoteanc" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote_sym "sdfootnotesym" +#define OOO_STRING_SVTOOLS_HTML_FTN_anchor "anc" +#define OOO_STRING_SVTOOLS_HTML_FTN_symbol "sym" +#define OOO_STRING_SVTOOLS_HTML_WW_off "OFF" +#define OOO_STRING_SVTOOLS_HTML_WW_hard "HARD" +#define OOO_STRING_SVTOOLS_HTML_WW_soft "SOFT" +#define OOO_STRING_SVTOOLS_HTML_WW_virtual "VIRTUAL" +#define OOO_STRING_SVTOOLS_HTML_WW_physical "PHYSICAL" +#define OOO_STRING_SVTOOLS_HTML_on "on" +#define OOO_STRING_SVTOOLS_HTML_ET_url "application/x-www-form-urlencoded" +#define OOO_STRING_SVTOOLS_HTML_ET_multipart "multipart/form-data" +#define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain" + +#endif diff --git a/svtools/inc/svtools/htmltokn.h b/svtools/inc/svtools/htmltokn.h new file mode 100644 index 000000000000..0719f34cd893 --- /dev/null +++ b/svtools/inc/svtools/htmltokn.h @@ -0,0 +1,572 @@ +/************************************************************************* + * + * 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: htmltokn.h,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _HTMLTOKN_H +#define _HTMLTOKN_H + +#include "svtools/svtdllapi.h" +#include +#ifndef _SOLAR_h +#include +#endif + +class String; + +// suche das Char zu dem CharNamen +sal_Unicode GetHTMLCharName( const String& rName ); + +// suche die TokenID zu dem Token +SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); + +// suche die TokenId zu einemm Attribut-Token +int GetHTMLOption( const String& rName ); + +// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) +SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); + +// beginnen immer ab 256, groesser als ein char +const int HTML_TOKEN_START = 0x100; +const int HTML_TOKEN_ONOFF = 0x200; +const int HTML_TOKEN_MICROSOFT = 0x1000; + +enum HTML_TOKEN_IDS +{ + HTML_TEXTTOKEN = HTML_TOKEN_START, + HTML_SINGLECHAR, + HTML_NEWPARA, + HTML_TABCHAR, + HTML_RAWDATA, + HTML_LINEFEEDCHAR, + + // diese werden nur eingeschaltet + HTML_AREA, // Netscape 2.0 + HTML_BASE, // HTML 3.0 + HTML_COMMENT, + HTML_DOCTYPE, + HTML_EMBED, // Netscape 2.0 ignorieren + HTML_FIGUREOVERLAY, // HTML 3.0 + HTML_HORZRULE, // ignorieren + HTML_HORZTAB, // HTML 3.0 + HTML_IMAGE, // ignorieren + HTML_INPUT, // ignorieren + HTML_ISINDEX, // HTML 3.0 + HTML_LINEBREAK, //
    ->
    + HTML_LINK, // HTML 3.0 + HTML_META, // HTML 3.0 ignorieren + HTML_NEXTID, // HTML 3.0 + HTML_OF, // HTML 3.0 + HTML_OPTION, // ignorieren + HTML_PARAM, // HotJava + HTML_RANGE, // HTML 3.0 + HTML_SPACER, // Netscape 3.0b5 // ignorieren + HTML_WBR, // Netscape + + // Tokens, die ueber HTML-Charakter erkannt werden + HTML_NONBREAKSPACE, + HTML_SOFTHYPH, + + // diese werden wieder abgeschaltet, + // der off-Wert liegt immer dahinter (+1) !! + HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0 + HTML_ABBREVIATION_OFF, // HTML 3.0 + HTML_ABOVE_ON, // HTML 3.0 + HTML_ABOVE_OFF, // HTML 3.0 + HTML_ACRONYM_ON, // HTML 3.0 + HTML_ACRONYM_OFF, // HTML 3.0 + HTML_ADDRESS_ON, + HTML_ADDRESS_OFF, + HTML_ANCHOR_ON, + HTML_ANCHOR_OFF, + HTML_APPLET_ON, // HotJava + HTML_APPLET_OFF, // HotJava + HTML_ARRAY_ON, // HTML 3.0 + HTML_ARRAY_OFF, // HTML 3.0 + HTML_AUTHOR_ON, // HTML 3.0 + HTML_AUTHOR_OFF, // HTML 3.0 + HTML_BANNER_ON, // HTML 3.0 + HTML_BANNER_OFF, // HTML 3.0 + HTML_BAR_ON, // HTML 3.0 + HTML_BAR_OFF, // HTML 3.0 + HTML_BASEFONT_ON, // Netscape + HTML_BASEFONT_OFF, // Netscape + HTML_BELOW_ON, // HTML 3.0 + HTML_BELOW_OFF, // HTML 3.0 + HTML_BIGPRINT_ON, // HTML 3.0 + HTML_BIGPRINT_OFF, // HTML 3.0 + HTML_BLINK_ON, // Netscape + HTML_BLINK_OFF, // Netscape + HTML_BLOCKQUOTE30_ON, // HTML 3.0 + HTML_BLOCKQUOTE30_OFF, // HTML 3.0 + HTML_BLOCKQUOTE_ON, + HTML_BLOCKQUOTE_OFF, + HTML_BODY_ON, + HTML_BODY_OFF, + HTML_BOLDTEXT_ON, // HTML 3.0 + HTML_BOLDTEXT_OFF, // HTML 3.0 + HTML_BOLD_ON, + HTML_BOLD_OFF, + HTML_BOX_ON, // HTML 3.0 + HTML_BOX_OFF, // HTML 3.0 + HTML_CAPTION_ON, // HTML 3.0 + HTML_CAPTION_OFF, // HTML 3.0 + HTML_CENTER_ON, // Netscape + HTML_CENTER_OFF, // Netscape + HTML_CITIATION_ON, + HTML_CITIATION_OFF, + HTML_CODE_ON, + HTML_CODE_OFF, + HTML_COL_ON, // HTML3 Table Model Draft + HTML_COL_OFF, // HTML3 Table Model Draft + HTML_COLGROUP_ON, // HTML3 Table Model Draft + HTML_COLGROUP_OFF, // HTML3 Table Model Draft + HTML_CREDIT_ON, // HTML 3.0 + HTML_CREDIT_OFF, // HTML 3.0 + HTML_DD_ON, + HTML_DD_OFF, + HTML_DEFLIST_ON, + HTML_DEFLIST_OFF, + HTML_DELETEDTEXT_ON, // HTML 3.0 + HTML_DELETEDTEXT_OFF, // HTML 3.0 + HTML_DIRLIST_ON, + HTML_DIRLIST_OFF, + HTML_DIVISION_ON, // HTML 3.0 + HTML_DIVISION_OFF, // HTML 3.0 + HTML_DOT_ON, // HTML 3.0 + HTML_DOT_OFF, // HTML 3.0 + HTML_DOUBLEDOT_ON, // HTML 3.0 + HTML_DOUBLEDOT_OFF, // HTML 3.0 + HTML_DT_ON, + HTML_DT_OFF, + HTML_EMPHASIS_ON, + HTML_EMPHASIS_OFF, + HTML_FIGURE_ON, // HTML 3.0 + HTML_FIGURE_OFF, // HTML 3.0 + HTML_FONT_ON, // Netscape + HTML_FONT_OFF, // Netscape + HTML_FOOTNOTE_ON, // HTML 3.0 + HTML_FOOTNOTE_OFF, // HTML 3.0 + HTML_FORM_ON, + HTML_FORM_OFF, + HTML_FRAME_ON, // Netscape 2.0 + HTML_FRAME_OFF, // Netscape 2.0 + HTML_FRAMESET_ON, // Netscape 2.0 + HTML_FRAMESET_OFF, // Netscape 2.0 + HTML_HAT_ON, // HTML 3.0 + HTML_HAT_OFF, // HTML 3.0 + HTML_HEAD1_ON, + HTML_HEAD1_OFF, + HTML_HEAD2_ON, + HTML_HEAD2_OFF, + HTML_HEAD3_ON, + HTML_HEAD3_OFF, + HTML_HEAD4_ON, + HTML_HEAD4_OFF, + HTML_HEAD5_ON, + HTML_HEAD5_OFF, + HTML_HEAD6_ON, + HTML_HEAD6_OFF, + HTML_HEAD_ON, + HTML_HEAD_OFF, + HTML_HTML_ON, + HTML_HTML_OFF, + HTML_IFRAME_ON, // IE 3.0b2 + HTML_IFRAME_OFF, // IE 3.0b2 + HTML_ILAYER_ON, + HTML_ILAYER_OFF, + HTML_INSERTEDTEXT_ON, // HTML 3.0 + HTML_INSERTEDTEXT_OFF, // HTML 3.0 + HTML_ITALIC_ON, + HTML_ITALIC_OFF, + HTML_ITEM_ON, // HTML 3.0 + HTML_ITEM_OFF, // HTML 3.0 + HTML_KEYBOARD_ON, + HTML_KEYBOARD_OFF, + HTML_LAYER_ON, + HTML_LAYER_OFF, + HTML_LANGUAGE_ON, // HTML 3.0 + HTML_LANGUAGE_OFF, // HTML 3.0 + HTML_LISTHEADER_ON, // HTML 3.0 + HTML_LISTHEADER_OFF, // HTML 3.0 + HTML_LI_ON, + HTML_LI_OFF, + HTML_MAP_ON, // Netscape 2.0 + HTML_MAP_OFF, // Netscape 2.0 + HTML_MATH_ON, // HTML 3.0 + HTML_MATH_OFF, // HTML 3.0 + HTML_MENULIST_ON, + HTML_MENULIST_OFF, + HTML_MULTICOL_ON, // Netscape 3.0b5 + HTML_MULTICOL_OFF, // Netscape 3.0b5 + HTML_NOBR_ON, // Netscape + HTML_NOBR_OFF, // Netscape + HTML_NOEMBED_ON, // Netscape 2.0 + HTML_NOEMBED_OFF, // Netscape 2.0 + HTML_NOFRAMES_ON, // Netscape 2.0 + HTML_NOFRAMES_OFF, // Netscape 2.0 + HTML_NOSCRIPT_ON, // Netscape 2.0 + HTML_NOSCRIPT_OFF, // Netscape 3.0 + HTML_NOTE_ON, // HTML 3.0 + HTML_NOTE_OFF, // HTML 3.0 + HTML_OBJECT_ON, // HotJava + HTML_OBJECT_OFF, // HotJava + HTML_ORDERLIST_ON, + HTML_ORDERLIST_OFF, + HTML_PARABREAK_ON, + HTML_PARABREAK_OFF, + HTML_PERSON_ON, // HTML 3.0 + HTML_PERSON_OFF, // HTML 3.0 + HTML_PLAINTEXT_ON, // HTML 3.0 + HTML_PLAINTEXT_OFF, // HTML 3.0 + HTML_PREFORMTXT_ON, + HTML_PREFORMTXT_OFF, + HTML_ROOT_ON, // HTML 3.0 + HTML_ROOT_OFF, // HTML 3.0 + HTML_ROW_ON, // HTML 3.0 + HTML_ROW_OFF, // HTML 3.0 + HTML_SAMPLE_ON, + HTML_SAMPLE_OFF, + HTML_SCRIPT_ON, // HTML 3.2 + HTML_SCRIPT_OFF, // HTML 3.2 + HTML_SELECT_ON, + HTML_SELECT_OFF, + HTML_SHORTQUOTE_ON, // HTML 3.0 + HTML_SHORTQUOTE_OFF, // HTML 3.0 + HTML_SMALLPRINT_ON, // HTML 3.0 + HTML_SMALLPRINT_OFF, // HTML 3.0 + HTML_SPAN_ON, // Style Sheets + HTML_SPAN_OFF, // Style Sheets + HTML_SQUAREROOT_ON, // HTML 3.0 + HTML_SQUAREROOT_OFF, // HTML 3.0 + HTML_STRIKETHROUGH_ON, // HTML 3.0 + HTML_STRIKETHROUGH_OFF, // HTML 3.0 + HTML_STRONG_ON, + HTML_STRONG_OFF, + HTML_STYLE_ON, // HTML 3.0 + HTML_STYLE_OFF, // HTML 3.0 + HTML_SUBSCRIPT_ON, // HTML 3.0 + HTML_SUBSCRIPT_OFF, // HTML 3.0 + HTML_SUPERSCRIPT_ON, // HTML 3.0 + HTML_SUPERSCRIPT_OFF, // HTML 3.0 + HTML_TABLE_ON, // HTML 3.0 + HTML_TABLE_OFF, // HTML 3.0 + HTML_TABLEDATA_ON, // HTML 3.0 + HTML_TABLEDATA_OFF, // HTML 3.0 + HTML_TABLEHEADER_ON, // HTML 3.0 + HTML_TABLEHEADER_OFF, // HTML 3.0 + HTML_TABLEROW_ON, // HTML 3.0 + HTML_TABLEROW_OFF, // HTML 3.0 + HTML_TBODY_ON, // HTML3 Table Model Draft + HTML_TBODY_OFF, // HTML3 Table Model Draft + HTML_TELETYPE_ON, + HTML_TELETYPE_OFF, + HTML_TEXTAREA_ON, + HTML_TEXTAREA_OFF, + HTML_TEXTFLOW_ON, // HTML 3.2 + HTML_TEXTFLOW_OFF, // HTML 3.2 + HTML_TEXT_ON, // HTML 3.0 + HTML_TEXT_OFF, // HTML 3.0 + HTML_TFOOT_ON, // HTML3 Table Model Draft + HTML_TFOOT_OFF, // HTML3 Table Model Draft + HTML_THEAD_ON, // HTML3 Table Model Draft + HTML_THEAD_OFF, // HTML3 Table Model Draft + HTML_TILDE_ON, // HTML 3.0 + HTML_TILDE_OFF, // HTML 3.0 + HTML_TITLE_ON, + HTML_TITLE_OFF, + HTML_UNDERLINE_ON, + HTML_UNDERLINE_OFF, + HTML_UNORDERLIST_ON, + HTML_UNORDERLIST_OFF, + HTML_VARIABLE_ON, + HTML_VARIABLE_OFF, + HTML_VECTOR_ON, // HTML 3.0 + HTML_VECTOR_OFF, // HTML 3.0 + + // obsolete features + HTML_XMP_ON, + HTML_XMP_OFF, + HTML_LISTING_ON, + HTML_LISTING_OFF, + + // proposed features + HTML_DEFINSTANCE_ON, + HTML_DEFINSTANCE_OFF, + HTML_STRIKE_ON, + HTML_STRIKE_OFF, + + HTML_UNKNOWNCONTROL_ON, + HTML_UNKNOWNCONTROL_OFF, + + HTML_BGSOUND = HTML_TOKEN_MICROSOFT|HTML_TOKEN_START, + + HTML_COMMENT2_ON = HTML_TOKEN_MICROSOFT|HTML_TOKEN_ONOFF, // HTML 2.0 ? + HTML_COMMENT2_OFF, // HTML 2.0 ? + HTML_MARQUEE_ON, + HTML_MARQUEE_OFF, + HTML_PLAINTEXT2_ON, // HTML 2.0 ? + HTML_PLAINTEXT2_OFF, // HTML 2.0 ? + + HTML_SDFIELD_ON, + HTML_SDFIELD_OFF +}; + +// HTML Attribut-Token (=Optionen) + +// beginnen immer ab 256, groesser als ein char +const int HTML_OPTION_START = 0x100; + +enum HTML_OPTION_IDS +{ +HTML_OPTION_BOOL_START = HTML_OPTION_START, + +// Attribute ohne Wert + HTML_O_BOX = HTML_OPTION_BOOL_START, + HTML_O_CHECKED, + HTML_O_COMPACT, + HTML_O_CONTINUE, + HTML_O_CONTROLS, // IExplorer 2.0 + HTML_O_DECLARE, // IExplorer 3.0b5 + HTML_O_DISABLED, + HTML_O_FOLDED, // Netscape internal + HTML_O_ISMAP, + HTML_O_MAYSCRIPT, // Netcape 3.0 + HTML_O_MULTIPLE, + HTML_O_NOFLOW, + HTML_O_NOHREF, // Netscape + HTML_O_NORESIZE, // Netscape 2.0 + HTML_O_NOSHADE, // Netscape + HTML_O_NOWRAP, + HTML_O_PLAIN, + HTML_O_SDFIXED, + HTML_O_SELECTED, + HTML_O_SHAPES, // IExplorer 3.0b5 +HTML_OPTION_BOOL_END, + +// Attribute mit einem String als Wert +HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END, + HTML_O_ABOVE = HTML_OPTION_STRING_START, + HTML_O_ACCEPT, + HTML_O_ACCESSKEY, + HTML_O_ADD_DATE, // Netscape internal + HTML_O_ALT, + HTML_O_AXES, + HTML_O_AXIS, + HTML_O_BELOW, + HTML_O_CHAR, // HTML3 Table Model Draft + HTML_O_CLASS, + HTML_O_CLIP, + HTML_O_CODE, // HotJava + HTML_O_CODETYPE, + HTML_O_COLSPEC, + HTML_O_CONTENT, + HTML_O_COORDS, // Netscape 2.0 + HTML_O_DP, + HTML_O_ENCTYPE, + HTML_O_ERROR, + HTML_O_FACE, // IExplorer 2.0 + HTML_O_FRAMEBORDER, // IExplorer 3.0 + HTML_O_HTTPEQUIV, + HTML_O_LANGUAGE, // JavaScript + HTML_O_LAST_MODIFIED, // Netscape internal + HTML_O_LAST_VISIT, // Netscape internal + HTML_O_MD, + HTML_O_N, + HTML_O_NAME, + HTML_O_NOTATION, + HTML_O_PROMPT, + HTML_O_SHAPE, + HTML_O_STANDBY, + HTML_O_STYLE, // Style Sheets + HTML_O_TITLE, + HTML_O_VALUE, + HTML_O_SDVAL, // StarDiv NumberValue + HTML_O_SDNUM, // StarDiv NumberFormat + HTML_O_SDLIBRARY, + HTML_O_SDMODULE, +HTML_OPTION_STRING_END, + +// Attribute mit einem SGML-Identifier als Wert +HTML_OPTION_SGMLID_START = HTML_OPTION_STRING_END, + HTML_O_FROM = HTML_OPTION_SGMLID_START, + HTML_O_ID, + HTML_O_TARGET, // Netscape 2.0 + HTML_O_TO, + HTML_O_UNTIL, +HTML_OPTION_SGMLID_END, + +// Attribute mit einem URI als Wert +HTML_OPTION_URI_START = HTML_OPTION_SGMLID_END, + HTML_O_ACTION = HTML_OPTION_URI_START, + HTML_O_ARCHIVE, + HTML_O_BACKGROUND, + HTML_O_CLASSID, + HTML_O_CODEBASE, // HotJava + HTML_O_DATA, + HTML_O_DYNSRC, // IExplorer 3.0 + HTML_O_DYNSYNC, // IExplorer 2.0 + HTML_O_IMAGEMAP, + HTML_O_HREF, + HTML_O_LOWSRC, // Netscape 3.0 + HTML_O_SCRIPT, + HTML_O_SRC, + HTML_O_USEMAP, // Netscape 2.0 +HTML_OPTION_URI_END, + +// Attribute mit Entity-Namen als Wert +HTML_OPTION_ENTITY_START = HTML_OPTION_URI_END, + HTML_O_DINGBAT = HTML_OPTION_ENTITY_START, + HTML_O_SYM, +HTML_OPTION_ENTITY_END, + +// Attribute mit einer Farbe als Wert (alle Netscape) +HTML_OPTION_COLOR_START = HTML_OPTION_ENTITY_END, + HTML_O_ALINK = HTML_OPTION_COLOR_START, + HTML_O_BGCOLOR, + HTML_O_BORDERCOLOR, // IExplorer 2.0 + HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0 + HTML_O_BORDERCOLORDARK, // IExplorer 2.0 + HTML_O_COLOR, + HTML_O_LINK, + HTML_O_TEXT, + HTML_O_VLINK, +HTML_OPTION_COLOR_END, + +// Attribute mit einem numerischen Wert +HTML_OPTION_NUMBER_START = HTML_OPTION_COLOR_END, + HTML_O_BORDER = HTML_OPTION_NUMBER_START, + HTML_O_CELLSPACING, // HTML3 Table Model Draft + HTML_O_CELLPADDING, // HTML3 Table Model Draft + HTML_O_CHAROFF, // HTML3 Table Model Draft + HTML_O_COLSPAN, + HTML_O_FRAMESPACING, // IExplorer 3.0 + HTML_O_GUTTER, // Netscape 3.0b5 + HTML_O_INDENT, + HTML_O_HEIGHT, + HTML_O_HSPACE, // Netscape + HTML_O_LEFT, + HTML_O_LEFTMARGIN, // IExplorer 2.0 + HTML_O_LOOP, // IExplorer 2.0 + HTML_O_MARGINWIDTH, // Netscape 2.0 + HTML_O_MARGINHEIGHT, // Netscape 2.0 + HTML_O_MAX, + HTML_O_MAXLENGTH, + HTML_O_MIN, + HTML_O_PAGEX, + HTML_O_PAGEY, + HTML_O_POINTSIZE, + HTML_O_ROWSPAN, + HTML_O_SCROLLAMOUNT, // IExplorer 2.0 + HTML_O_SCROLLDELAY, // IExplorer 2.0 + HTML_O_SEQNUM, + HTML_O_SKIP, + HTML_O_SPAN, // HTML3 Table Model Draft + HTML_O_TABINDEX, + HTML_O_TOP, + HTML_O_TOPMARGIN, // IExplorer 2.0 + HTML_O_VSPACE, // Netscape + HTML_O_WEIGHT, + HTML_O_WIDTH, + HTML_O_X, + HTML_O_Y, + HTML_O_ZINDEX, +HTML_OPTION_NUMBER_END, + +// Attribute mit Enum-Werten +HTML_OPTION_ENUM_START = HTML_OPTION_NUMBER_END, + HTML_O_BEHAVIOR = HTML_OPTION_ENUM_START, // IExplorer 2.0 + HTML_O_BGPROPERTIES, // IExplorer 2.0 + HTML_O_CLEAR, + HTML_O_DIR, + HTML_O_DIRECTION, // IExplorer 2.0 + HTML_O_FORMAT, + HTML_O_FRAME, // HTML3 Table Model Draft + HTML_O_LANG, + HTML_O_METHOD, + HTML_O_PALETTE, + HTML_O_REL, + HTML_O_REV, + HTML_O_RULES, // HTML3 Table Model Draft + HTML_O_SCROLLING, // Netscape 2.0 + HTML_O_SDREADONLY, + HTML_O_SUBTYPE, + HTML_O_TYPE, + HTML_O_VALIGN, + HTML_O_VALUETYPE, + HTML_O_VISIBILITY, + HTML_O_WRAP, +HTML_OPTION_ENUM_END, + +// Attribute mit Script-Code als Wert +HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END, + HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScaript + HTML_O_ONBLUR, // JavaScript + HTML_O_ONCHANGE, // JavaScript + HTML_O_ONCLICK, // JavaScript + HTML_O_ONERROR, // JavaScript + HTML_O_ONFOCUS, // JavaScript + HTML_O_ONLOAD, // JavaScript + HTML_O_ONMOUSEOUT, // JavaScript + HTML_O_ONMOUSEOVER, // JavaScript + HTML_O_ONRESET, // JavaScript + HTML_O_ONSELECT, // JavaScript + HTML_O_ONSUBMIT, // JavaScript + HTML_O_ONUNLOAD, // JavaScript + + HTML_O_SDONABORT, // StarBasic + HTML_O_SDONBLUR, // StarBasic + HTML_O_SDONCHANGE, // StarBasic + HTML_O_SDONCLICK, // StarBasic + HTML_O_SDONERROR, // StarBasic + HTML_O_SDONFOCUS, // StarBasic + HTML_O_SDONLOAD, // StarBasic + HTML_O_SDONMOUSEOUT, // StarBasic + HTML_O_SDONMOUSEOVER, // StarBasic + HTML_O_SDONRESET, // StarBasic + HTML_O_SDONSELECT, // StarBasic + HTML_O_SDONSUBMIT, // StarBasic + HTML_O_SDONUNLOAD, // StarBasic +HTML_OPTION_SCRIPT_END, + +// Attribute mit Kontext-abhaengigen Werten +HTML_OPTION_CONTEXT_START = HTML_OPTION_SCRIPT_END, + HTML_O_ALIGN = HTML_OPTION_CONTEXT_START, + HTML_O_COLS, // Netscape 2.0 vs HTML 2.0 + HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0 + HTML_O_SIZE, + HTML_O_START, + HTML_O_UNITS, +HTML_OPTION_CONTEXT_END, + +// eine unbekannte Option +HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END, +HTML_OPTION_END +}; + +#endif // _HTMLTOKN_H diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc new file mode 100644 index 000000000000..a30660bba3b2 --- /dev/null +++ b/svtools/inc/svtools/imagemgr.hrc @@ -0,0 +1,193 @@ +/************************************************************************* + * + * 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: imagemgr.hrc,v $ + * $Revision: 1.15 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMAGEMGR_HRC +#define _SVTOOLS_IMAGEMGR_HRC + +// includes ****************************************************************** + +#define IMAGELIST_START 3076 // must match to old Id's in SFX! + +#define IMG_IMPRESS (IMAGELIST_START + 47) +#define IMG_WORKPLACE (IMAGELIST_START + 48) +#define IMG_BITMAP (IMAGELIST_START + 49) +#define IMG_CALC (IMAGELIST_START + 50) +#define IMG_CALCTEMPLATE (IMAGELIST_START + 51) +#define IMG_CHART (IMAGELIST_START + 52) +#define IMG_DATABASE (IMAGELIST_START + 53) +#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) +#define IMG_EXCEL (IMAGELIST_START + 55) +#define IMG_EXCELTEMPLATE (IMAGELIST_START + 56) +#define IMG_FTPSERVER (IMAGELIST_START + 58) +#define IMG_GALLERY (IMAGELIST_START + 59) +#define IMG_GALLERYTHEME (IMAGELIST_START + 60) +#define IMG_GIF (IMAGELIST_START + 61) +#define IMG_HELP (IMAGELIST_START + 62) +#define IMG_HTML (IMAGELIST_START + 63) +#define IMG_JPG (IMAGELIST_START + 64) +#define IMG_LINK (IMAGELIST_START + 65) +#define IMG_LOTUS (IMAGELIST_START + 66) +#define IMG_MATH (IMAGELIST_START + 68) +#define IMG_MATHTEMPLATE (IMAGELIST_START + 69) +#define IMG_FILE (IMAGELIST_START + 74) +#define IMG_APP (IMAGELIST_START + 75) +#define IMG_PCD (IMAGELIST_START + 76) +#define IMG_PCT (IMAGELIST_START + 77) +#define IMG_PCX (IMAGELIST_START + 78) +#define IMG_SIM (IMAGELIST_START + 79) +#define IMG_TEXTFILE (IMAGELIST_START + 80) +#define IMG_SVHELP (IMAGELIST_START + 81) +#define IMG_TIFF (IMAGELIST_START + 82) +#define IMG_URL (IMAGELIST_START + 83) +#define IMG_WMF (IMAGELIST_START + 84) +#define IMG_WORD (IMAGELIST_START + 85) +#define IMG_WRITER (IMAGELIST_START + 86) +#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) +#define IMG_FIXEDDEV (IMAGELIST_START + 88) +#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89) +#define IMG_CDROMDEV (IMAGELIST_START + 90) +#define IMG_NETWORKDEV (IMAGELIST_START + 91) +#define IMG_RAMDEV (IMAGELIST_START + 92) +#define IMG_TABLEFOLDER (IMAGELIST_START + 111) +#define IMG_TABLE (IMAGELIST_START + 112) +#define IMG_FOLDER (IMAGELIST_START + 113) +#define IMG_EXPANDEDFOLDER (IMAGELIST_START + 114) +#define IMG_XXX (IMAGELIST_START + 117) +#define IMG_GALLERYIMPORT (IMAGELIST_START + 122) +#define IMG_QUERYFOLDER (IMAGELIST_START + 125) +#define IMG_QUERY (IMAGELIST_START + 126) +#define IMG_FORM (IMAGELIST_START + 127) +#define IMG_FORMFOLDER (IMAGELIST_START + 128) +#define IMG_REPORT (IMAGELIST_START + 129) +#define IMG_REPORTFOLDER (IMAGELIST_START + 130) +#define IMG_OTHERS (IMAGELIST_START + 138) +#define IMG_MACROLIB (IMAGELIST_START + 140) +#define IMG_DXF (IMAGELIST_START + 141) +#define IMG_MET (IMAGELIST_START + 142) +#define IMG_PNG (IMAGELIST_START + 143) +#define IMG_SGF (IMAGELIST_START + 144) +#define IMG_SGV (IMAGELIST_START + 145) +#define IMG_SVM (IMAGELIST_START + 146) +#define IMG_GLOBAL_DOC (IMAGELIST_START + 150) +#define IMG_DRAW (IMAGELIST_START + 151) +#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) +#define IMG_TASK (IMAGELIST_START + 160) +#define IMG_APPOINTMENT (IMAGELIST_START + 161) +#define IMG_RELATION (IMAGELIST_START + 163) +#define IMG_IMPRESSPACKED (IMAGELIST_START + 165) +#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166) +#define IMG_POWERPOINT (IMAGELIST_START + 167) +#define IMG_POWERPOINTTEMPLATE (IMAGELIST_START + 168) +#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) +#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) +#define IMG_OO_MATH_DOC (IMAGELIST_START + 171) +#define IMG_OO_GLOBAL_DOC (IMAGELIST_START + 172) +#define IMG_OO_IMPRESS_DOC (IMAGELIST_START + 173) +#define IMG_OO_CALC_DOC (IMAGELIST_START + 174) +#define IMG_OO_WRITER_DOC (IMAGELIST_START + 175) +#define IMG_OO_DRAW_TEMPLATE (IMAGELIST_START + 176) +#define IMG_OO_IMPRESS_TEMPLATE (IMAGELIST_START + 177) +#define IMG_OO_CALC_TEMPLATE (IMAGELIST_START + 178) +#define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) +#define IMG_EXTENSION (IMAGELIST_START + 180) + +#define RID_DESCRIPTION_START 256 + +#define STR_DESCRIPTION_SOURCEFILE (RID_DESCRIPTION_START + 0) +#define STR_DESCRIPTION_BOOKMARKFILE (RID_DESCRIPTION_START + 1) +#define STR_DESCRIPTION_GRAPHIC_DOC (RID_DESCRIPTION_START + 2) +#define STR_DESCRIPTION_CFGFILE (RID_DESCRIPTION_START + 3) +#define STR_DESCRIPTION_APPLICATION (RID_DESCRIPTION_START + 4) +#define STR_DESCRIPTION_DATABASE_TABLE (RID_DESCRIPTION_START + 5) +#define STR_DESCRIPTION_SYSFILE (RID_DESCRIPTION_START + 6) +#define STR_DESCRIPTION_WORD_DOC (RID_DESCRIPTION_START + 7) +#define STR_DESCRIPTION_HELP_DOC (RID_DESCRIPTION_START + 8) +#define STR_DESCRIPTION_HTMLFILE (RID_DESCRIPTION_START + 9) +#define STR_DESCRIPTION_ARCHIVFILE (RID_DESCRIPTION_START + 10) +#define STR_DESCRIPTION_LOGFILE (RID_DESCRIPTION_START + 11) +#define STR_DESCRIPTION_SMATH_DOC (RID_DESCRIPTION_START + 12) +#define STR_DESCRIPTION_SCHART_DOC (RID_DESCRIPTION_START + 13) +#define STR_DESCRIPTION_SDRAW_DOC (RID_DESCRIPTION_START + 14) +#define STR_DESCRIPTION_SCALC_DOC (RID_DESCRIPTION_START + 15) +#define STR_DESCRIPTION_SIMPRESS_DOC (RID_DESCRIPTION_START + 16) +#define STR_DESCRIPTION_SWRITER_DOC (RID_DESCRIPTION_START + 17) +#define STR_DESCRIPTION_GLOBALDOC (RID_DESCRIPTION_START + 18) +#define STR_DESCRIPTION_SIMAGE_DOC (RID_DESCRIPTION_START + 19) +#define STR_DESCRIPTION_TEXTFILE (RID_DESCRIPTION_START + 20) +#define STR_DESCRIPTION_LINK (RID_DESCRIPTION_START + 21) +#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC (RID_DESCRIPTION_START + 22) +#define STR_DESCRIPTION_EXCEL_DOC (RID_DESCRIPTION_START + 23) +#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC (RID_DESCRIPTION_START + 24) +#define STR_DESCRIPTION_BATCHFILE (RID_DESCRIPTION_START + 25) +#define STR_DESCRIPTION_FILE (RID_DESCRIPTION_START + 26) +#define STR_DESCRIPTION_FOLDER (RID_DESCRIPTION_START + 27) +#define STR_DESCRIPTION_FACTORY_WRITER (RID_DESCRIPTION_START + 28) +#define STR_DESCRIPTION_FACTORY_CALC (RID_DESCRIPTION_START + 29) +#define STR_DESCRIPTION_FACTORY_IMPRESS (RID_DESCRIPTION_START + 30) +#define STR_DESCRIPTION_FACTORY_DRAW (RID_DESCRIPTION_START + 31) +#define STR_DESCRIPTION_FACTORY_WRITERWEB (RID_DESCRIPTION_START + 32) +#define STR_DESCRIPTION_FACTORY_GLOBALDOC (RID_DESCRIPTION_START + 33) +#define STR_DESCRIPTION_FACTORY_MATH (RID_DESCRIPTION_START + 34) +#define STR_DESCRIPTION_CALC_TEMPLATE (RID_DESCRIPTION_START + 35) +#define STR_DESCRIPTION_DRAW_TEMPLATE (RID_DESCRIPTION_START + 36) +#define STR_DESCRIPTION_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 37) +#define STR_DESCRIPTION_WRITER_TEMPLATE (RID_DESCRIPTION_START + 38) +#define STR_DESCRIPTION_LOCALE_VOLUME (RID_DESCRIPTION_START + 39) +#define STR_DESCRIPTION_FLOPPY_VOLUME (RID_DESCRIPTION_START + 40) +#define STR_DESCRIPTION_CDROM_VOLUME (RID_DESCRIPTION_START + 41) +#define STR_DESCRIPTION_REMOTE_VOLUME (RID_DESCRIPTION_START + 42) +#define STR_DESCRIPTION_POWERPOINT (RID_DESCRIPTION_START + 43) +#define STR_DESCRIPTION_POWERPOINT_TEMPLATE (RID_DESCRIPTION_START + 44) +#define STR_DESCRIPTION_POWERPOINT_SHOW (RID_DESCRIPTION_START + 45) +#define STR_DESCRIPTION_SXMATH_DOC (RID_DESCRIPTION_START + 46) +#define STR_DESCRIPTION_SXCHART_DOC (RID_DESCRIPTION_START + 47) +#define STR_DESCRIPTION_SXDRAW_DOC (RID_DESCRIPTION_START + 48) +#define STR_DESCRIPTION_SXCALC_DOC (RID_DESCRIPTION_START + 49) +#define STR_DESCRIPTION_SXIMPRESS_DOC (RID_DESCRIPTION_START + 50) +#define STR_DESCRIPTION_SXWRITER_DOC (RID_DESCRIPTION_START + 51) +#define STR_DESCRIPTION_SXGLOBAL_DOC (RID_DESCRIPTION_START + 52) +#define STR_DESCRIPTION_MATHML_DOC (RID_DESCRIPTION_START + 53) +#define STR_DESCRIPTION_SDATABASE_DOC (RID_DESCRIPTION_START + 54) +#define STR_DESCRIPTION_OO_DATABASE_DOC (RID_DESCRIPTION_START + 55) +#define STR_DESCRIPTION_OO_DRAW_DOC (RID_DESCRIPTION_START + 56) +#define STR_DESCRIPTION_OO_MATH_DOC (RID_DESCRIPTION_START + 57) +#define STR_DESCRIPTION_OO_GLOBAL_DOC (RID_DESCRIPTION_START + 58) +#define STR_DESCRIPTION_OO_IMPRESS_DOC (RID_DESCRIPTION_START + 59) +#define STR_DESCRIPTION_OO_CALC_DOC (RID_DESCRIPTION_START + 60) +#define STR_DESCRIPTION_OO_WRITER_DOC (RID_DESCRIPTION_START + 61) +#define STR_DESCRIPTION_OO_DRAW_TEMPLATE (RID_DESCRIPTION_START + 62) +#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 63) +#define STR_DESCRIPTION_OO_CALC_TEMPLATE (RID_DESCRIPTION_START + 64) +#define STR_DESCRIPTION_OO_WRITER_TEMPLATE (RID_DESCRIPTION_START + 65) +#define STR_DESCRIPTION_FACTORY_DATABASE (RID_DESCRIPTION_START + 66) +#define STR_DESCRIPTION_EXTENSION (RID_DESCRIPTION_START + 67) + +#endif + diff --git a/svtools/inc/svtools/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx new file mode 100644 index 000000000000..67159de7450d --- /dev/null +++ b/svtools/inc/svtools/imagemgr.hxx @@ -0,0 +1,98 @@ +/************************************************************************* + * + * 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: imagemgr.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMAGEMGR_HXX +#define _SVTOOLS_IMAGEMGR_HXX + +// includes ****************************************************************** + +#include "svtools/svtdllapi.h" +#include "sal/types.h" + +class Image; +class String; +class INetURLObject; + +namespace svtools { + +struct VolumeInfo +{ + sal_Bool m_bIsVolume; + sal_Bool m_bIsRemote; + sal_Bool m_bIsRemoveable; + sal_Bool m_bIsFloppy; + sal_Bool m_bIsCompactDisc; + + VolumeInfo() : + m_bIsVolume ( sal_False ), + m_bIsRemote ( sal_False ), + m_bIsRemoveable ( sal_False ), + m_bIsFloppy ( sal_False ), + m_bIsCompactDisc( sal_False ) {} + + VolumeInfo( sal_Bool _bIsVolume, + sal_Bool _bIsRemote, + sal_Bool _bIsRemoveable, + sal_Bool _bIsFloppy, + sal_Bool _bIsCompactDisc ) : + m_bIsVolume ( _bIsVolume ), + m_bIsRemote ( _bIsRemote ), + m_bIsRemoveable ( _bIsRemoveable ), + m_bIsFloppy ( _bIsFloppy ), + m_bIsCompactDisc( _bIsCompactDisc ) {} +}; + +} + +class SvFileInformationManager +{ +private: + SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); + +public: + // depricated, because no high contrast mode + SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False ); + + // now with high contrast mode + SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast ); + + SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo ); +}; + +#endif + diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx new file mode 100644 index 000000000000..5b6767c5f7c9 --- /dev/null +++ b/svtools/inc/svtools/imageresourceaccess.hxx @@ -0,0 +1,93 @@ +/************************************************************************* + * + * 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: imageresourceaccess.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX +#define SVTOOLS_INC_IMAGERESOURCEACCESS_HXX + +#include "svtools/svtdllapi.h" + +/** === begin UNO includes === **/ +#include +#include +/** === end UNO includes === **/ + +class SvStream; +//........................................................................ +namespace svt +{ +//........................................................................ + + //==================================================================== + //= GraphicAccess + //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) + from a resource + */ + class GraphicAccess + { + private: + GraphicAccess(); // never implemented + + public: + /** determines whether the given URL denotes an image within a resource + ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) + */ + SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); + + /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves + an SvStream for this image. + + This method works for arbitrary URLs denoting an image, since the + GraphicsProvider service is used + to resolve the URL. However, obtaining the stream is expensive (since + the image must be copied), so you are strongly encouraged to only use it + when you know that the image is small enough. + */ + SVT_DLLPUBLIC static SvStream* getImageStream( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::rtl::OUString& _rImageResourceURL + ); + + /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves + an XInputStream for this image. + */ + SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + getImageXStream( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::rtl::OUString& _rImageResourceURL + ); + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX + diff --git a/svtools/inc/svtools/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx new file mode 100644 index 000000000000..2881fe5150bc --- /dev/null +++ b/svtools/inc/svtools/imgdef.hxx @@ -0,0 +1,46 @@ +/************************************************************************* + * + * 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: imgdef.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMGDEF_HXX +#define _SVTOOLS_IMGDEF_HXX + +enum SfxSymbolsSize +{ + SFX_SYMBOLS_SIZE_SMALL, + SFX_SYMBOLS_SIZE_LARGE, + SFX_SYMBOLS_SIZE_AUTO +}; + +#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 +#define SFX_TOOLBOX_CHANGEOUTSTYLE 0x0002 +#define SFX_TOOLBOX_CHANGEBUTTONTYPE 0x0004 + +#endif // _SVTOOLS_IMGDEF_HXX + diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx new file mode 100644 index 000000000000..f2c73000ed67 --- /dev/null +++ b/svtools/inc/svtools/indexentryres.hxx @@ -0,0 +1,23 @@ + +#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX +#define SVTOOLS_INDEXENTRYRESSOURCE_HXX + +#include "svtools/svtdllapi.h" +#include + +class IndexEntryRessourceData; + +class SVT_DLLPUBLIC IndexEntryRessource +{ + private: + IndexEntryRessourceData *mp_Data; + + public: + IndexEntryRessource (); + ~IndexEntryRessource (); + const String& GetTranslation (const String& r_Algorithm); +}; + +#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ + + diff --git a/svtools/inc/svtools/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx new file mode 100644 index 000000000000..8068f4deda3f --- /dev/null +++ b/svtools/inc/svtools/inetimg.hxx @@ -0,0 +1,89 @@ +/************************************************************************* + * + * 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: inetimg.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _INETIMG_HXX +#define _INETIMG_HXX + +#include +#include + +class SvData; +class SotDataObject; +class SotDataMemberObject; + +//========================================================================= + +class INetImage +{ + String aImageURL; + String aTargetURL; + String aTargetFrame; + String aAlternateText; + Size aSizePixel; + +protected: + String CopyExchange() const; + void PasteExchange( const String& rString ); + + void SetImageURL( const String& rS ) { aImageURL = rS; } + void SetTargetURL( const String& rS ) { aTargetURL = rS; } + void SetTargetFrame( const String& rS ) { aTargetFrame = rS; } + void SetAlternateText( const String& rS ){ aAlternateText = rS; } + void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; } + +public: + INetImage( + const String& rImageURL, + const String& rTargetURL, + const String& rTargetFrame, + const String& rAlternateText, + const Size& rSizePixel ) + : aImageURL( rImageURL ), + aTargetURL( rTargetURL ), + aTargetFrame( rTargetFrame ), + aAlternateText( rAlternateText ), + aSizePixel( rSizePixel ) + {} + INetImage() + {} + + const String& GetImageURL() const { return aImageURL; } + const String& GetTargetURL() const { return aTargetURL; } + const String& GetTargetFrame() const { return aTargetFrame; } + const String& GetAlternateText() const { return aAlternateText; } + const Size& GetSizePixel() const { return aSizePixel; } + + // Im-/Export + sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; + sal_Bool Read( SvStream& rIStm, ULONG nFormat ); +}; + +#endif // #ifndef _INETIMG_HXX + + diff --git a/svtools/inc/svtools/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx new file mode 100644 index 000000000000..1af9b6e55421 --- /dev/null +++ b/svtools/inc/svtools/itemdel.hxx @@ -0,0 +1,42 @@ +/************************************************************************* + * + * 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: itemdel.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_ITEMDEL_HXX +#define _SVTOOLS_ITEMDEL_HXX + +#include "svtools/svtdllapi.h" + +class SfxPoolItem; + +SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ); + +void DeleteOnIdleItems(); + +#endif + diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx new file mode 100644 index 000000000000..08fe6d57b652 --- /dev/null +++ b/svtools/inc/svtools/ivctrl.hxx @@ -0,0 +1,393 @@ +/************************************************************************* + * + * 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: ivctrl.hxx,v $ + * $Revision: 1.20 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _ICNVW_HXX +#define _ICNVW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include + +class SvPtrarr; +class ResId; +class Point; +class SvxIconChoiceCtrl_Impl; +class Image; + +#define ICNVIEW_FLAG_POS_LOCKED 0x0001 +#define ICNVIEW_FLAG_SELECTED 0x0002 +#define ICNVIEW_FLAG_FOCUSED 0x0004 +#define ICNVIEW_FLAG_IN_USE 0x0008 +#define ICNVIEW_FLAG_CURSORED 0x0010 // Rahmen um Image +#define ICNVIEW_FLAG_POS_MOVED 0x0020 // per D&D verschoben aber nicht gelockt +#define ICNVIEW_FLAG_DROP_TARGET 0x0040 // im QueryDrop gesetzt +#define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Emphasis nicht painten +#define ICNVIEW_FLAG_USER1 0x0100 +#define ICNVIEW_FLAG_USER2 0x0200 +#define ICNVIEW_FLAG_PRED_SET 0x0400 // Predecessor wurde umgesetzt + +enum SvxIconChoiceCtrlTextMode +{ + IcnShowTextFull = 1, // BoundRect nach unten aufplustern + IcnShowTextShort, // Abkuerzung mit "..." + IcnShowTextSmart, // Text komplett anzeigen, wenn moeglich (n.i.) + IcnShowTextDontKnow // Einstellung der View +}; + +enum SvxIconChoiceCtrlPositionMode +{ + IcnViewPositionModeFree = 0, // freies pixelgenaues Positionieren + IcnViewPositionModeAutoArrange = 1, // automatisches Ausrichten + IcnViewPositionModeAutoAdjust = 2, // automatisches Anordnen + IcnViewPositionModeLast = IcnViewPositionModeAutoAdjust +}; + +class SvxIconChoiceCtrlEntry +{ + Image aImage; + Image aImageHC; + + String aText; + String aQuickHelpText; + void* pUserData; + + friend class SvxIconChoiceCtrl_Impl; + friend class IcnCursor_Impl; + friend class EntryList_Impl; + friend class IcnGridMap_Impl; + + Rectangle aRect; // Bounding-Rect des Entries + Rectangle aGridRect; // nur gesetzt im Grid-Modus + ULONG nPos; + + // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen + // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus + // kann die sichtbare Reihenfolge aber anders sein. Die Eintraege werden deshalb dann + // verkettet + SvxIconChoiceCtrlEntry* pblink; // backward (linker Nachbar) + SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) + + SvxIconChoiceCtrlTextMode eTextMode; + USHORT nX,nY; // fuer Tastatursteuerung + USHORT nFlags; + + void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } + void SetFlags( USHORT nMask ) { nFlags |= nMask; } + void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } + + // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) + void SetBacklink( SvxIconChoiceCtrlEntry* pA ) + { + pA->pflink->pblink = this; // X <- B + this->pflink = pA->pflink; // X -> B + this->pblink = pA; // A <- X + pA->pflink = this; // A -> X + } + // loest eine Verbindung (A <-> this <-> B ==> A <-> B) + void Unlink() + { + this->pblink->pflink = this->pflink; + this->pflink->pblink = this->pblink; + this->pflink = 0; + this->pblink = 0; + } + +public: + SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 ); + ~SvxIconChoiceCtrlEntry () {} + + void SetImage ( const Image& rImage ) { aImage = rImage; } + void SetImageHC ( const Image& rImage ) { aImageHC = rImage; } + Image GetImage () const { return aImage; } + Image GetImageHC () const { return aImageHC; } + void SetText ( const String& rText ) { aText = rText; } + String GetText () const { return aText; } + String SVT_DLLPUBLIC GetDisplayText() const; + void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } + String GetQuickHelpText() const { return aQuickHelpText; } + void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } + void* GetUserData () { return pUserData; } + + const Rectangle & GetBoundRect() const { return aRect; } + + void SetFocus ( BOOL bSet ) + { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } + + SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } + USHORT GetFlags() const { return nFlags; } + BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } + BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } + BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } + BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } + BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } + BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } + BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } + void SetMoved( BOOL bMoved ); + BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } + void LockPos( BOOL bLock ); + // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead + SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } + SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } + +// sal_Unicode GetMnemonicChar() const; +}; + +enum SvxIconChoiceCtrlColumnAlign +{ + IcnViewAlignLeft = 1, + IcnViewAlignRight, + IcnViewAlignCenter +}; + +class SvxIconChoiceCtrlColumnInfo +{ + String aColText; + Image aColImage; + long nWidth; + SvxIconChoiceCtrlColumnAlign eAlignment; + USHORT nSubItem; + +public: + SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, + SvxIconChoiceCtrlColumnAlign eAlign ) : + nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} + SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); + + void SetText( const String& rText ) { aColText = rText; } + void SetImage( const Image& rImg ) { aColImage = rImg; } + void SetWidth( long nWd ) { nWidth = nWd; } + void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } + void SetSubItem( USHORT nSub) { nSubItem = nSub; } + + const String& GetText() const { return aColText; } + const Image& GetImage() const { return aColImage; } + long GetWidth() const { return nWidth; } + SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } + USHORT GetSubItem() const { return nSubItem; } +}; + +//################################################################################################################################### +/* + Window-Bits: + WB_ICON // Text unter dem Icon + WB_SMALL_ICON // Text rechts neben Icon, beliebige Positionierung + WB_DETAILS // Text rechts neben Icon, eingeschraenkte Posit. + WB_BORDER + WB_NOHIDESELECTION // Selektion inaktiv zeichnen, wenn kein Fokus + WB_NOHSCROLL + WB_NOVSCROLL + WB_NOSELECTION + WB_SMART_ARRANGE // im Arrange die Vis-Area beibehalten + WB_ALIGN_TOP // Anordnung zeilenweise von links nach rechts + WB_ALIGN_LEFT // Anordnung spaltenweise von oben nach unten + WB_NODRAGSELECTION // Keine Selektion per Tracking-Rect + WB_NOCOLUMNHEADER // keine Headerbar in Detailsview (Headerbar not implemented) + WB_NOPOINTERFOCUS // Kein GrabFocus im MouseButtonDown + WB_HIGHLIGHTFRAME // der unter der Maus befindliche Eintrag wird hervorgehoben + WB_NOASYNCSELECTHDL // Selektionshandler synchron aufrufen, d.h. Events nicht sammeln +*/ + +#define WB_ICON WB_RECTSTYLE +#define WB_SMALLICON WB_SMALLSTYLE +#define WB_DETAILS WB_VCENTER +#define WB_NOHSCROLL WB_SPIN +#define WB_NOVSCROLL WB_DRAG +#define WB_NOSELECTION WB_REPEAT +#define WB_NODRAGSELECTION WB_PATHELLIPSIS +#define WB_SMART_ARRANGE WB_PASSWORD +#define WB_ALIGN_TOP WB_TOP +#define WB_ALIGN_LEFT WB_LEFT +#define WB_NOCOLUMNHEADER WB_CENTER +#define WB_HIGHLIGHTFRAME WB_INFO +#define WB_NOASYNCSELECTHDL WB_NOLABEL + +class MnemonicGenerator; + +class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control +{ + friend class SvxIconChoiceCtrl_Impl; + + Link _aClickIconHdl; + Link _aDocRectChangedHdl; + Link _aVisRectChangedHdl; + KeyEvent* _pCurKeyEvent; + SvxIconChoiceCtrl_Impl* _pImp; + BOOL _bAutoFontColor; + +protected: + + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); + virtual void DocumentRectChanged(); + virtual void VisibleRectChanged(); + virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void ClickIcon(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void DrawEntryImage( + SvxIconChoiceCtrlEntry* pEntry, + const Point& rPos, + OutputDevice& rDev ); + + virtual String GetEntryText( + SvxIconChoiceCtrlEntry* pEntry, + BOOL bInplaceEdit ); + + virtual void FillLayoutData() const; + + void CallImplEventListeners(ULONG nEvent, void* pData); + +public: + + SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); + SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ); + virtual ~SvtIconChoiceCtrl(); + + void SetStyle( WinBits nWinStyle ); + WinBits GetStyle() const; + + BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); + + void SetUpdateMode( BOOL bUpdateMode ); + void SetFont( const Font& rFont ); + void SetPointFont( const Font& rFont ); + + void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; } + const Link& GetClickHdl() const { return _aClickIconHdl; } + + using OutputDevice::SetBackground; + void SetBackground( const Wallpaper& rWallpaper ); + + void ArrangeIcons(); + + + SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, + ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, + ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + + /** creates automatic mnemonics for all icon texts in the control + */ + void CreateAutoMnemonics( void ); + + /** creates automatic mnemonics for all icon texts in the control + + @param _rUsedMnemonics + a MnemonicGenerator at which some other mnemonics are already registered. + This can be used if the control needs to share the "mnemonic space" with other elements, + such as a menu bar. + */ + void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics ); + + void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); + + BOOL DoKeyInput( const KeyEvent& rKEvt ); + + BOOL IsEntryEditing() const; + void Clear(); + + ULONG GetEntryCount() const; + SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; + ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + using Window::SetCursor; + void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); + SvxIconChoiceCtrlEntry* GetCursor() const; + + // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster + void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); + + // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt + // ==TRUE : Bitmap oder Text muss getroffen sein + SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; + // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) + SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) + SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + + // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben + SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; + + void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); + SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; + + // offene asynchron abzuarbeitende Aktionen ausfuehren. Muss vor dem Speichern von + // Eintragspositionen etc. gerufen werden + void Flush(); + + + virtual BOOL HasBackground() const; + virtual BOOL HasFont() const; + virtual BOOL HasFontTextColor() const; + virtual BOOL HasFontFillColor() const; + + void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } + BOOL AutoFontColor () { return _bAutoFontColor; } + + Point GetLogicPos( const Point& rPosPixel ) const; + Point GetPixelPos( const Point& rPosLogic ) const; + void SetSelectionMode( SelectionMode eMode ); + + BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); + + Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; + Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; + + void SetNoSelection(); + + // ACCESSIBILITY ========================================================== + + /** Creates and returns the accessible object of the Box. */ + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > CreateAccessible(); +}; + +#endif // _ICNVW_HXX + diff --git a/svtools/inc/svtools/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx new file mode 100644 index 000000000000..4d2043d7b992 --- /dev/null +++ b/svtools/inc/svtools/localresaccess.hxx @@ -0,0 +1,85 @@ +/************************************************************************* + * + * 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: localresaccess.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ +#define _SVTOOLS_LOCALRESACCESS_HXX_ + +#include +#include +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //========================================================================= + //= OLocalResourceAccess + //========================================================================= + /** helper class for acessing local resources + */ + class OLocalResourceAccess : public Resource + { + protected: + ResMgr* m_pManager; + + public: + OLocalResourceAccess( const ResId& _rId ) + :Resource( _rId.SetAutoRelease( sal_False ) ) + ,m_pManager( _rId.GetResMgr() ) + { + } + + OLocalResourceAccess(const ResId& _rId, RESOURCE_TYPE _rType) + :Resource(_rId.SetRT(_rType).SetAutoRelease(sal_False)) + ,m_pManager(_rId.GetResMgr()) + { + OSL_ENSURE( m_pManager != NULL, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); + } + + ~OLocalResourceAccess() + { + if ( m_pManager ) + m_pManager->Increment( m_pManager->GetRemainSize() ); + FreeResource(); + } + + inline BOOL IsAvailableRes( const ResId& _rId ) const + { + return Resource::IsAvailableRes( _rId ); + } + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // _SVTOOLS_LOCALRESACCESS_HXX_ + diff --git a/svtools/inc/svtools/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx new file mode 100644 index 000000000000..ca569ac152f4 --- /dev/null +++ b/svtools/inc/svtools/prgsbar.hxx @@ -0,0 +1,103 @@ +/************************************************************************* + * + * 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: prgsbar.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _PRGSBAR_HXX +#define _PRGSBAR_HXX + +#include "svtools/svtdllapi.h" +#include + +/************************************************************************* + +Beschreibung +============ + +class ProgressBar + +Diese Klasse dient zur Anzeige einer Progress-Anzeige. + +-------------------------------------------------------------------------- + +WinBits + +WB_BORDER Border um das Fenster +WB_3DLOOK 3D-Darstellung + +-------------------------------------------------------------------------- + +Methoden + +Mit SetValue() setzt man einen Prozent-Wert zwischen 0 und 100. Wenn Werte +groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken. + +*************************************************************************/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_STDPROGRESSBAR WB_BORDER + +// --------------- +// - ProgressBar - +// --------------- + +class SVT_DLLPUBLIC ProgressBar : public Window +{ +private: + Point maPos; + long mnPrgsWidth; + long mnPrgsHeight; + USHORT mnPercent; + USHORT mnPercentCount; + BOOL mbCalcNew; + +#ifdef _SV_PRGSBAR_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); +#endif + +public: + ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); + ProgressBar( Window* pParent, const ResId& rResId ); + ~ProgressBar(); + + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + void SetValue( USHORT nNewPercent ); + USHORT GetValue() const { return mnPercent; } +}; + +#endif // _PRGSBAR_HXX diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx new file mode 100644 index 000000000000..14ed6abceed6 --- /dev/null +++ b/svtools/inc/svtools/roadmap.hxx @@ -0,0 +1,140 @@ +/************************************************************************* + * + * 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: roadmap.hxx,v $ + * $Revision: 1.10 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_ROADMAP_HXX +#define _SVTOOLS_ROADMAP_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +#ifndef _SVTOOLS_HYPERLABEL_HXX +#include "svtools/hyperlabel.hxx" +#endif + + + + +class Bitmap; +//......................................................................... +namespace svt +{ +//......................................................................... + + struct RoadmapTypes + { + public: + typedef sal_Int16 ItemId; + typedef sal_Int32 ItemIndex; + }; + + class RoadmapImpl; + class RoadmapItem; + + //===================================================================== + //= Roadmap + //===================================================================== + class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes + { + protected: + RoadmapImpl* m_pImpl; + // Window overridables + void Paint( const Rectangle& _rRect ); + void implInit(); + + public: + ORoadmap( Window* _pParent, const ResId& _rId ); + ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); + ~ORoadmap( ); + + void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True ); + const BitmapEx& GetRoadmapBitmap( ) const; + + void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); + sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const; + + void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); + ::rtl::OUString GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex = 0 ); + void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); + + void SetRoadmapInteractive( sal_Bool _bInteractive ); + sal_Bool IsRoadmapInteractive(); + + void SetRoadmapComplete( sal_Bool _bComplete ); + sal_Bool IsRoadmapComplete() const; + + ItemIndex GetItemCount() const; + ItemId GetItemID( ItemIndex _nIndex ) const; + ItemIndex GetItemIndex( ItemId _nID ) const; + + void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); + void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); + void DeleteRoadmapItem( ItemIndex _nIndex ); + + ItemId GetCurrentRoadmapItemID() const; + sal_Bool SelectRoadmapItemByID( ItemId _nItemID ); + + void SetItemSelectHdl( const Link& _rHdl ); + Link GetItemSelectHdl( ) const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus(); + + + protected: + long PreNotify( NotifyEvent& rNEvt ); + + protected: + /// called when an item has been selected by any means + virtual void Select(); + + private: + DECL_LINK(ImplClickHdl, HyperLabel*); + + RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); + const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; + + RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); + const RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ) const; + RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); + + void DrawHeadline(); + void DeselectOldRoadmapItems(); + ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); + ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); + RoadmapItem* GetByPointer(Window* pWindow); + RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); + void UpdatefollowingHyperLabels( ItemIndex _Index ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif + diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx new file mode 100644 index 000000000000..f76399ffd824 --- /dev/null +++ b/svtools/inc/svtools/rtfkeywd.hxx @@ -0,0 +1,1144 @@ +/************************************************************************* + * + * 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: rtfkeywd.hxx,v $ + * $Revision: 1.13.134.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RTFKEYWD_HXX +#define _RTFKEYWD_HXX + +#include "sal/config.h" + +#define OOO_STRING_SVTOOLS_RTF_HEXCHAR "\\'" +#define OOO_STRING_SVTOOLS_RTF_IGNORE "\\*" +#define OOO_STRING_SVTOOLS_RTF_OPTHYPH "\\-" +#define OOO_STRING_SVTOOLS_RTF_SUBENTRY "\\:" +#define OOO_STRING_SVTOOLS_RTF_ABSH "\\absh" +#define OOO_STRING_SVTOOLS_RTF_ABSW "\\absw" +#define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" +#define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" +#define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" +#define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" +#define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" +#define OOO_STRING_SVTOOLS_RTF_B "\\b" +#define OOO_STRING_SVTOOLS_RTF_BGBDIAG "\\bgbdiag" +#define OOO_STRING_SVTOOLS_RTF_BGCROSS "\\bgcross" +#define OOO_STRING_SVTOOLS_RTF_BGDCROSS "\\bgdcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKBDIAG "\\bgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_BGDKCROSS "\\bgdkcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKDCROSS "\\bgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKFDIAG "\\bgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_BGDKHORIZ "\\bgdkhoriz" +#define OOO_STRING_SVTOOLS_RTF_BGDKVERT "\\bgdkvert" +#define OOO_STRING_SVTOOLS_RTF_BGFDIAG "\\bgfdiag" +#define OOO_STRING_SVTOOLS_RTF_BGHORIZ "\\bghoriz" +#define OOO_STRING_SVTOOLS_RTF_BGVERT "\\bgvert" +#define OOO_STRING_SVTOOLS_RTF_BIN "\\bin" +#define OOO_STRING_SVTOOLS_RTF_BINFSXN "\\binfsxn" +#define OOO_STRING_SVTOOLS_RTF_BINSXN "\\binsxn" +#define OOO_STRING_SVTOOLS_RTF_BKMKCOLF "\\bkmkcolf" +#define OOO_STRING_SVTOOLS_RTF_BKMKCOLL "\\bkmkcoll" +#define OOO_STRING_SVTOOLS_RTF_BKMKEND "\\bkmkend" +#define OOO_STRING_SVTOOLS_RTF_BKMKSTART "\\bkmkstart" +#define OOO_STRING_SVTOOLS_RTF_BLUE "\\blue" +#define OOO_STRING_SVTOOLS_RTF_BOX "\\box" +#define OOO_STRING_SVTOOLS_RTF_BRDRB "\\brdrb" +#define OOO_STRING_SVTOOLS_RTF_BRDRBAR "\\brdrbar" +#define OOO_STRING_SVTOOLS_RTF_BRDRBTW "\\brdrbtw" +#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf" +#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb" +#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot" +#define OOO_STRING_SVTOOLS_RTF_BRDRHAIR "\\brdrhair" +#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl" +#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr" +#define OOO_STRING_SVTOOLS_RTF_BRDRS "\\brdrs" +#define OOO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh" +#define OOO_STRING_SVTOOLS_RTF_BRDRT "\\brdrt" +#define OOO_STRING_SVTOOLS_RTF_BRDRTH "\\brdrth" +#define OOO_STRING_SVTOOLS_RTF_BRDRW "\\brdrw" +#define OOO_STRING_SVTOOLS_RTF_BRSP "\\brsp" +#define OOO_STRING_SVTOOLS_RTF_BULLET "\\bullet" +#define OOO_STRING_SVTOOLS_RTF_BUPTIM "\\buptim" +#define OOO_STRING_SVTOOLS_RTF_BXE "\\bxe" +#define OOO_STRING_SVTOOLS_RTF_CAPS "\\caps" +#define OOO_STRING_SVTOOLS_RTF_CB "\\cb" +#define OOO_STRING_SVTOOLS_RTF_CBPAT "\\cbpat" +#define OOO_STRING_SVTOOLS_RTF_CELL "\\cell" +#define OOO_STRING_SVTOOLS_RTF_CELLX "\\cellx" +#define OOO_STRING_SVTOOLS_RTF_CF "\\cf" +#define OOO_STRING_SVTOOLS_RTF_CFPAT "\\cfpat" +#define OOO_STRING_SVTOOLS_RTF_CHATN "\\chatn" +#define OOO_STRING_SVTOOLS_RTF_CHDATE "\\chdate" +#define OOO_STRING_SVTOOLS_RTF_CHDPA "\\chdpa" +#define OOO_STRING_SVTOOLS_RTF_CHDPL "\\chdpl" +#define OOO_STRING_SVTOOLS_RTF_CHFTN "\\chftn" +#define OOO_STRING_SVTOOLS_RTF_CHFTNSEP "\\chftnsep" +#define OOO_STRING_SVTOOLS_RTF_CHFTNSEPC "\\chftnsepc" +#define OOO_STRING_SVTOOLS_RTF_CHPGN "\\chpgn" +#define OOO_STRING_SVTOOLS_RTF_CHTIME "\\chtime" +#define OOO_STRING_SVTOOLS_RTF_CLBGBDIAG "\\clbgbdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGCROSS "\\clbgcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDCROSS "\\clbgdcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG "\\clbgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS "\\clbgdkcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS "\\clbgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG "\\clbgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKHOR "\\clbgdkhor" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKVERT "\\clbgdkvert" +#define OOO_STRING_SVTOOLS_RTF_CLBGFDIAG "\\clbgfdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGHORIZ "\\clbghoriz" +#define OOO_STRING_SVTOOLS_RTF_CLBGVERT "\\clbgvert" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRB "\\clbrdrb" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRL "\\clbrdrl" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRR "\\clbrdrr" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRT "\\clbrdrt" +#define OOO_STRING_SVTOOLS_RTF_CLCBPAT "\\clcbpat" +#define OOO_STRING_SVTOOLS_RTF_CLCFPAT "\\clcfpat" +#define OOO_STRING_SVTOOLS_RTF_CLMGF "\\clmgf" +#define OOO_STRING_SVTOOLS_RTF_CLMRG "\\clmrg" +#define OOO_STRING_SVTOOLS_RTF_CLSHDNG "\\clshdng" +#define OOO_STRING_SVTOOLS_RTF_COLNO "\\colno" +#define OOO_STRING_SVTOOLS_RTF_COLORTBL "\\colortbl" +#define OOO_STRING_SVTOOLS_RTF_COLS "\\cols" +#define OOO_STRING_SVTOOLS_RTF_COLSR "\\colsr" +#define OOO_STRING_SVTOOLS_RTF_COLSX "\\colsx" +#define OOO_STRING_SVTOOLS_RTF_COLUMN "\\column" +#define OOO_STRING_SVTOOLS_RTF_COLW "\\colw" +#define OOO_STRING_SVTOOLS_RTF_COMMENT "\\comment" +#define OOO_STRING_SVTOOLS_RTF_CREATIM "\\creatim" +#define OOO_STRING_SVTOOLS_RTF_CTRL "\\ctrl" +#define OOO_STRING_SVTOOLS_RTF_DEFF "\\deff" +#define OOO_STRING_SVTOOLS_RTF_DEFFORMAT "\\defformat" +#define OOO_STRING_SVTOOLS_RTF_DEFLANG "\\deflang" +#define OOO_STRING_SVTOOLS_RTF_DEFTAB "\\deftab" +#define OOO_STRING_SVTOOLS_RTF_DELETED "\\deleted" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTX "\\dfrmtxtx" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTY "\\dfrmtxty" +#define OOO_STRING_SVTOOLS_RTF_DIBITMAP "\\dibitmap" +#define OOO_STRING_SVTOOLS_RTF_DN "\\dn" +#define OOO_STRING_SVTOOLS_RTF_DOCCOMM "\\doccomm" +#define OOO_STRING_SVTOOLS_RTF_DOCTEMP "\\doctemp" +#define OOO_STRING_SVTOOLS_RTF_DROPCAPLI "\\dropcapli" +#define OOO_STRING_SVTOOLS_RTF_DROPCAPT "\\dropcapt" +#define OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP "\\absnoovrlp" +#define OOO_STRING_SVTOOLS_RTF_DXFRTEXT "\\dxfrtext" +#define OOO_STRING_SVTOOLS_RTF_DY "\\dy" +#define OOO_STRING_SVTOOLS_RTF_EDMINS "\\edmins" +#define OOO_STRING_SVTOOLS_RTF_EMDASH "\\emdash" +#define OOO_STRING_SVTOOLS_RTF_ENDASH "\\endash" +#define OOO_STRING_SVTOOLS_RTF_ENDDOC "\\enddoc" +#define OOO_STRING_SVTOOLS_RTF_ENDNHERE "\\endnhere" +#define OOO_STRING_SVTOOLS_RTF_ENDNOTES "\\endnotes" +#define OOO_STRING_SVTOOLS_RTF_EXPND "\\expnd" +#define OOO_STRING_SVTOOLS_RTF_EXPNDTW "\\expndtw" +#define OOO_STRING_SVTOOLS_RTF_F "\\f" +#define OOO_STRING_SVTOOLS_RTF_FACINGP "\\facingp" +#define OOO_STRING_SVTOOLS_RTF_FACPGSXN "\\facpgsxn" +#define OOO_STRING_SVTOOLS_RTF_FALT "\\falt" +#define OOO_STRING_SVTOOLS_RTF_FCHARSET "\\fcharset" +#define OOO_STRING_SVTOOLS_RTF_FDECOR "\\fdecor" +#define OOO_STRING_SVTOOLS_RTF_FI "\\fi" +#define OOO_STRING_SVTOOLS_RTF_FIELD "\\field" +#define OOO_STRING_SVTOOLS_RTF_FLDDIRTY "\\flddirty" +#define OOO_STRING_SVTOOLS_RTF_FLDEDIT "\\fldedit" +#define OOO_STRING_SVTOOLS_RTF_FLDINST "\\fldinst" +#define OOO_STRING_SVTOOLS_RTF_FLDLOCK "\\fldlock" +#define OOO_STRING_SVTOOLS_RTF_FLDPRIV "\\fldpriv" +#define OOO_STRING_SVTOOLS_RTF_FLDRSLT "\\fldrslt" +#define OOO_STRING_SVTOOLS_RTF_FMODERN "\\fmodern" +#define OOO_STRING_SVTOOLS_RTF_FN "\\fn" +#define OOO_STRING_SVTOOLS_RTF_FNIL "\\fnil" +#define OOO_STRING_SVTOOLS_RTF_FONTTBL "\\fonttbl" +#define OOO_STRING_SVTOOLS_RTF_FOOTER "\\footer" +#define OOO_STRING_SVTOOLS_RTF_FOOTERF "\\footerf" +#define OOO_STRING_SVTOOLS_RTF_FOOTERL "\\footerl" +#define OOO_STRING_SVTOOLS_RTF_FOOTERR "\\footerr" +#define OOO_STRING_SVTOOLS_RTF_FOOTERY "\\footery" +#define OOO_STRING_SVTOOLS_RTF_FOOTNOTE "\\footnote" +#define OOO_STRING_SVTOOLS_RTF_FPRQ "\\fprq" +#define OOO_STRING_SVTOOLS_RTF_FRACWIDTH "\\fracwidth" +#define OOO_STRING_SVTOOLS_RTF_FROMAN "\\froman" +#define OOO_STRING_SVTOOLS_RTF_FS "\\fs" +#define OOO_STRING_SVTOOLS_RTF_FSCRIPT "\\fscript" +#define OOO_STRING_SVTOOLS_RTF_FSWISS "\\fswiss" +#define OOO_STRING_SVTOOLS_RTF_FTECH "\\ftech" +#define OOO_STRING_SVTOOLS_RTF_FTNBJ "\\ftnbj" +#define OOO_STRING_SVTOOLS_RTF_FTNCN "\\ftncn" +#define OOO_STRING_SVTOOLS_RTF_FTNRESTART "\\ftnrestart" +#define OOO_STRING_SVTOOLS_RTF_FTNSEP "\\ftnsep" +#define OOO_STRING_SVTOOLS_RTF_FTNSEPC "\\ftnsepc" +#define OOO_STRING_SVTOOLS_RTF_FTNSTART "\\ftnstart" +#define OOO_STRING_SVTOOLS_RTF_FTNTJ "\\ftntj" +#define OOO_STRING_SVTOOLS_RTF_GREEN "\\green" +#define OOO_STRING_SVTOOLS_RTF_GUTTER "\\gutter" +#define OOO_STRING_SVTOOLS_RTF_GUTTERSXN "\\guttersxn" +#define OOO_STRING_SVTOOLS_RTF_HEADER "\\header" +#define OOO_STRING_SVTOOLS_RTF_HEADERF "\\headerf" +#define OOO_STRING_SVTOOLS_RTF_HEADERL "\\headerl" +#define OOO_STRING_SVTOOLS_RTF_HEADERR "\\headerr" +#define OOO_STRING_SVTOOLS_RTF_HEADERY "\\headery" +#define OOO_STRING_SVTOOLS_RTF_HR "\\hr" +#define OOO_STRING_SVTOOLS_RTF_HYPHHOTZ "\\hyphhotz" +#define OOO_STRING_SVTOOLS_RTF_I "\\i" +#define OOO_STRING_SVTOOLS_RTF_ID "\\id" +#define OOO_STRING_SVTOOLS_RTF_INFO "\\info" +#define OOO_STRING_SVTOOLS_RTF_INTBL "\\intbl" +#define OOO_STRING_SVTOOLS_RTF_IXE "\\ixe" +#define OOO_STRING_SVTOOLS_RTF_KEEP "\\keep" +#define OOO_STRING_SVTOOLS_RTF_KEEPN "\\keepn" +#define OOO_STRING_SVTOOLS_RTF_KERNING "\\kerning" +#define OOO_STRING_SVTOOLS_RTF_KEYCODE "\\keycode" +#define OOO_STRING_SVTOOLS_RTF_KEYWORDS "\\keywords" +#define OOO_STRING_SVTOOLS_RTF_LANDSCAPE "\\landscape" +#define OOO_STRING_SVTOOLS_RTF_LANG "\\lang" +#define OOO_STRING_SVTOOLS_RTF_LDBLQUOTE "\\ldblquote" +#define OOO_STRING_SVTOOLS_RTF_LEVEL "\\level" +#define OOO_STRING_SVTOOLS_RTF_LI "\\li" +#define OOO_STRING_SVTOOLS_RTF_LIN "\\lin" +#define OOO_STRING_SVTOOLS_RTF_LINE "\\line" +#define OOO_STRING_SVTOOLS_RTF_LINEBETCOL "\\linebetcol" +#define OOO_STRING_SVTOOLS_RTF_LINECONT "\\linecont" +#define OOO_STRING_SVTOOLS_RTF_LINEMOD "\\linemod" +#define OOO_STRING_SVTOOLS_RTF_LINEPPAGE "\\lineppage" +#define OOO_STRING_SVTOOLS_RTF_LINERESTART "\\linerestart" +#define OOO_STRING_SVTOOLS_RTF_LINESTART "\\linestart" +#define OOO_STRING_SVTOOLS_RTF_LINESTARTS "\\linestarts" +#define OOO_STRING_SVTOOLS_RTF_LINEX "\\linex" +#define OOO_STRING_SVTOOLS_RTF_LNDSCPSXN "\\lndscpsxn" +#define OOO_STRING_SVTOOLS_RTF_LQUOTE "\\lquote" +#define OOO_STRING_SVTOOLS_RTF_MAC "\\mac" +#define OOO_STRING_SVTOOLS_RTF_MACPICT "\\macpict" +#define OOO_STRING_SVTOOLS_RTF_MAKEBACKUP "\\makebackup" +#define OOO_STRING_SVTOOLS_RTF_MARGB "\\margb" +#define OOO_STRING_SVTOOLS_RTF_MARGBSXN "\\margbsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGL "\\margl" +#define OOO_STRING_SVTOOLS_RTF_MARGLSXN "\\marglsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGMIRROR "\\margmirror" +#define OOO_STRING_SVTOOLS_RTF_MARGR "\\margr" +#define OOO_STRING_SVTOOLS_RTF_MARGRSXN "\\margrsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGT "\\margt" +#define OOO_STRING_SVTOOLS_RTF_MARGTSXN "\\margtsxn" +#define OOO_STRING_SVTOOLS_RTF_MIN "\\min" +#define OOO_STRING_SVTOOLS_RTF_MO "\\mo" +#define OOO_STRING_SVTOOLS_RTF_NEXTCSET "\\nextcset" +#define OOO_STRING_SVTOOLS_RTF_NEXTFILE "\\nextfile" +#define OOO_STRING_SVTOOLS_RTF_NOFCHARS "\\nofchars" +#define OOO_STRING_SVTOOLS_RTF_NOFPAGES "\\nofpages" +#define OOO_STRING_SVTOOLS_RTF_NOFWORDS "\\nofwords" +#define OOO_STRING_SVTOOLS_RTF_NOLINE "\\noline" +#define OOO_STRING_SVTOOLS_RTF_NOSUPERSUB "\\nosupersub" +#define OOO_STRING_SVTOOLS_RTF_NOWRAP "\\nowrap" +#define OOO_STRING_SVTOOLS_RTF_OPERATOR "\\operator" +#define OOO_STRING_SVTOOLS_RTF_OUTL "\\outl" +#define OOO_STRING_SVTOOLS_RTF_PAGE "\\page" +#define OOO_STRING_SVTOOLS_RTF_PAGEBB "\\pagebb" +#define OOO_STRING_SVTOOLS_RTF_PAPERH "\\paperh" +#define OOO_STRING_SVTOOLS_RTF_PAPERW "\\paperw" +#define OOO_STRING_SVTOOLS_RTF_PAR "\\par" +#define OOO_STRING_SVTOOLS_RTF_PARD "\\pard" +#define OOO_STRING_SVTOOLS_RTF_PC "\\pc" +#define OOO_STRING_SVTOOLS_RTF_PCA "\\pca" +#define OOO_STRING_SVTOOLS_RTF_PGHSXN "\\pghsxn" +#define OOO_STRING_SVTOOLS_RTF_PGNCONT "\\pgncont" +#define OOO_STRING_SVTOOLS_RTF_PGNDEC "\\pgndec" +#define OOO_STRING_SVTOOLS_RTF_PGNLCLTR "\\pgnlcltr" +#define OOO_STRING_SVTOOLS_RTF_PGNLCRM "\\pgnlcrm" +#define OOO_STRING_SVTOOLS_RTF_PGNRESTART "\\pgnrestart" +#define OOO_STRING_SVTOOLS_RTF_PGNSTART "\\pgnstart" +#define OOO_STRING_SVTOOLS_RTF_PGNSTARTS "\\pgnstarts" +#define OOO_STRING_SVTOOLS_RTF_PGNUCLTR "\\pgnucltr" +#define OOO_STRING_SVTOOLS_RTF_PGNUCRM "\\pgnucrm" +#define OOO_STRING_SVTOOLS_RTF_PGNX "\\pgnx" +#define OOO_STRING_SVTOOLS_RTF_PGNY "\\pgny" +#define OOO_STRING_SVTOOLS_RTF_PGWSXN "\\pgwsxn" +#define OOO_STRING_SVTOOLS_RTF_PHCOL "\\phcol" +#define OOO_STRING_SVTOOLS_RTF_PHMRG "\\phmrg" +#define OOO_STRING_SVTOOLS_RTF_PHPG "\\phpg" +#define OOO_STRING_SVTOOLS_RTF_PICCROPB "\\piccropb" +#define OOO_STRING_SVTOOLS_RTF_PICCROPL "\\piccropl" +#define OOO_STRING_SVTOOLS_RTF_PICCROPR "\\piccropr" +#define OOO_STRING_SVTOOLS_RTF_PICCROPT "\\piccropt" +#define OOO_STRING_SVTOOLS_RTF_PICH "\\pich" +#define OOO_STRING_SVTOOLS_RTF_PICHGOAL "\\pichgoal" +#define OOO_STRING_SVTOOLS_RTF_PICSCALED "\\picscaled" +#define OOO_STRING_SVTOOLS_RTF_PICSCALEX "\\picscalex" +#define OOO_STRING_SVTOOLS_RTF_PICSCALEY "\\picscaley" +#define OOO_STRING_SVTOOLS_RTF_PICT "\\pict" +#define OOO_STRING_SVTOOLS_RTF_PICW "\\picw" +#define OOO_STRING_SVTOOLS_RTF_PICWGOAL "\\picwgoal" +#define OOO_STRING_SVTOOLS_RTF_PLAIN "\\plain" +#define OOO_STRING_SVTOOLS_RTF_PMMETAFILE "\\pmmetafile" +#define OOO_STRING_SVTOOLS_RTF_POSNEGX "\\posnegx" +#define OOO_STRING_SVTOOLS_RTF_POSNEGY "\\posnegy" +#define OOO_STRING_SVTOOLS_RTF_POSX "\\posx" +#define OOO_STRING_SVTOOLS_RTF_POSXC "\\posxc" +#define OOO_STRING_SVTOOLS_RTF_POSXI "\\posxi" +#define OOO_STRING_SVTOOLS_RTF_POSXL "\\posxl" +#define OOO_STRING_SVTOOLS_RTF_POSXO "\\posxo" +#define OOO_STRING_SVTOOLS_RTF_POSXR "\\posxr" +#define OOO_STRING_SVTOOLS_RTF_POSY "\\posy" +#define OOO_STRING_SVTOOLS_RTF_POSYB "\\posyb" +#define OOO_STRING_SVTOOLS_RTF_POSYC "\\posyc" +#define OOO_STRING_SVTOOLS_RTF_POSYIL "\\posyil" +#define OOO_STRING_SVTOOLS_RTF_POSYT "\\posyt" +#define OOO_STRING_SVTOOLS_RTF_PRINTIM "\\printim" +#define OOO_STRING_SVTOOLS_RTF_PSOVER "\\psover" +#define OOO_STRING_SVTOOLS_RTF_PVMRG "\\pvmrg" +#define OOO_STRING_SVTOOLS_RTF_PVPARA "\\pvpara" +#define OOO_STRING_SVTOOLS_RTF_PVPG "\\pvpg" +#define OOO_STRING_SVTOOLS_RTF_QC "\\qc" +#define OOO_STRING_SVTOOLS_RTF_QJ "\\qj" +#define OOO_STRING_SVTOOLS_RTF_QL "\\ql" +#define OOO_STRING_SVTOOLS_RTF_QR "\\qr" +#define OOO_STRING_SVTOOLS_RTF_RDBLQUOTE "\\rdblquote" +#define OOO_STRING_SVTOOLS_RTF_RED "\\red" +#define OOO_STRING_SVTOOLS_RTF_REVBAR "\\revbar" +#define OOO_STRING_SVTOOLS_RTF_REVISED "\\revised" +#define OOO_STRING_SVTOOLS_RTF_REVISIONS "\\revisions" +#define OOO_STRING_SVTOOLS_RTF_REVPROP "\\revprop" +#define OOO_STRING_SVTOOLS_RTF_REVTIM "\\revtim" +#define OOO_STRING_SVTOOLS_RTF_RI "\\ri" +#define OOO_STRING_SVTOOLS_RTF_RIN "\\rin" +#define OOO_STRING_SVTOOLS_RTF_ROW "\\row" +#define OOO_STRING_SVTOOLS_RTF_RQUOTE "\\rquote" +#define OOO_STRING_SVTOOLS_RTF_RTF "\\rtf" +#define OOO_STRING_SVTOOLS_RTF_RXE "\\rxe" +#define OOO_STRING_SVTOOLS_RTF_S "\\s" +#define OOO_STRING_SVTOOLS_RTF_SA "\\sa" +#define OOO_STRING_SVTOOLS_RTF_SB "\\sb" +#define OOO_STRING_SVTOOLS_RTF_SBASEDON "\\sbasedon" +#define OOO_STRING_SVTOOLS_RTF_SBKCOL "\\sbkcol" +#define OOO_STRING_SVTOOLS_RTF_SBKEVEN "\\sbkeven" +#define OOO_STRING_SVTOOLS_RTF_SBKNONE "\\sbknone" +#define OOO_STRING_SVTOOLS_RTF_SBKODD "\\sbkodd" +#define OOO_STRING_SVTOOLS_RTF_SBKPAGE "\\sbkpage" +#define OOO_STRING_SVTOOLS_RTF_SBYS "\\sbys" +#define OOO_STRING_SVTOOLS_RTF_SCAPS "\\scaps" +#define OOO_STRING_SVTOOLS_RTF_SECT "\\sect" +#define OOO_STRING_SVTOOLS_RTF_SECTD "\\sectd" +#define OOO_STRING_SVTOOLS_RTF_SHAD "\\shad" +#define OOO_STRING_SVTOOLS_RTF_SHADING "\\shading" +#define OOO_STRING_SVTOOLS_RTF_SHIFT "\\shift" +#define OOO_STRING_SVTOOLS_RTF_SL "\\sl" +#define OOO_STRING_SVTOOLS_RTF_SNEXT "\\snext" +#define OOO_STRING_SVTOOLS_RTF_STRIKE "\\strike" +#define OOO_STRING_SVTOOLS_RTF_STYLESHEET "\\stylesheet" +#define OOO_STRING_SVTOOLS_RTF_SUB "\\sub" +#define OOO_STRING_SVTOOLS_RTF_SUBJECT "\\subject" +#define OOO_STRING_SVTOOLS_RTF_SUPER "\\super" +#define OOO_STRING_SVTOOLS_RTF_TAB "\\tab" +#define OOO_STRING_SVTOOLS_RTF_TB "\\tb" +#define OOO_STRING_SVTOOLS_RTF_TC "\\tc" +#define OOO_STRING_SVTOOLS_RTF_TCF "\\tcf" +#define OOO_STRING_SVTOOLS_RTF_TCL "\\tcl" +#define OOO_STRING_SVTOOLS_RTF_TEMPLATE "\\template" +#define OOO_STRING_SVTOOLS_RTF_TITLE "\\title" +#define OOO_STRING_SVTOOLS_RTF_TITLEPG "\\titlepg" +#define OOO_STRING_SVTOOLS_RTF_TLDOT "\\tldot" +#define OOO_STRING_SVTOOLS_RTF_TLEQ "\\tleq" +#define OOO_STRING_SVTOOLS_RTF_TLHYPH "\\tlhyph" +#define OOO_STRING_SVTOOLS_RTF_TLTH "\\tlth" +#define OOO_STRING_SVTOOLS_RTF_TLUL "\\tlul" +#define OOO_STRING_SVTOOLS_RTF_TQC "\\tqc" +#define OOO_STRING_SVTOOLS_RTF_TQDEC "\\tqdec" +#define OOO_STRING_SVTOOLS_RTF_TQR "\\tqr" +#define OOO_STRING_SVTOOLS_RTF_TQL "\\tql" +#define OOO_STRING_SVTOOLS_RTF_TRGAPH "\\trgaph" +#define OOO_STRING_SVTOOLS_RTF_TRLEFT "\\trleft" +#define OOO_STRING_SVTOOLS_RTF_TROWD "\\trowd" +#define OOO_STRING_SVTOOLS_RTF_TRQC "\\trqc" +#define OOO_STRING_SVTOOLS_RTF_TRQL "\\trql" +#define OOO_STRING_SVTOOLS_RTF_TRQR "\\trqr" +#define OOO_STRING_SVTOOLS_RTF_TRRH "\\trrh" +#define OOO_STRING_SVTOOLS_RTF_TX "\\tx" +#define OOO_STRING_SVTOOLS_RTF_TXE "\\txe" +#define OOO_STRING_SVTOOLS_RTF_UL "\\ul" +#define OOO_STRING_SVTOOLS_RTF_ULD "\\uld" +#define OOO_STRING_SVTOOLS_RTF_ULDB "\\uldb" +#define OOO_STRING_SVTOOLS_RTF_ULNONE "\\ulnone" +#define OOO_STRING_SVTOOLS_RTF_ULW "\\ulw" +#define OOO_STRING_SVTOOLS_RTF_UP "\\up" +#define OOO_STRING_SVTOOLS_RTF_V "\\v" +#define OOO_STRING_SVTOOLS_RTF_VERN "\\vern" +#define OOO_STRING_SVTOOLS_RTF_VERSION "\\version" +#define OOO_STRING_SVTOOLS_RTF_VERTALB "\\vertalb" +#define OOO_STRING_SVTOOLS_RTF_VERTALC "\\vertalc" +#define OOO_STRING_SVTOOLS_RTF_VERTALJ "\\vertalj" +#define OOO_STRING_SVTOOLS_RTF_VERTALT "\\vertalt" +#define OOO_STRING_SVTOOLS_RTF_WBITMAP "\\wbitmap" +#define OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL "\\wbmbitspixel" +#define OOO_STRING_SVTOOLS_RTF_WBMPLANES "\\wbmplanes" +#define OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES "\\wbmwidthbytes" +#define OOO_STRING_SVTOOLS_RTF_WIDOWCTRL "\\widowctrl" +#define OOO_STRING_SVTOOLS_RTF_WMETAFILE "\\wmetafile" +#define OOO_STRING_SVTOOLS_RTF_XE "\\xe" +#define OOO_STRING_SVTOOLS_RTF_YR "\\yr" +#define OOO_STRING_SVTOOLS_RTF_NOBRKHYPH "\\_" +#define OOO_STRING_SVTOOLS_RTF_FORMULA "\\|" +#define OOO_STRING_SVTOOLS_RTF_NOBREAK "\\~" +#define OOO_STRING_SVTOOLS_RTF_AB "\\ab" +#define OOO_STRING_SVTOOLS_RTF_ACAPS "\\acaps" +#define OOO_STRING_SVTOOLS_RTF_ACF "\\acf" +#define OOO_STRING_SVTOOLS_RTF_ADDITIVE "\\additive" +#define OOO_STRING_SVTOOLS_RTF_ADN "\\adn" +#define OOO_STRING_SVTOOLS_RTF_AENDDOC "\\aenddoc" +#define OOO_STRING_SVTOOLS_RTF_AENDNOTES "\\aendnotes" +#define OOO_STRING_SVTOOLS_RTF_AEXPND "\\aexpnd" +#define OOO_STRING_SVTOOLS_RTF_AF "\\af" +#define OOO_STRING_SVTOOLS_RTF_AFS "\\afs" +#define OOO_STRING_SVTOOLS_RTF_AFTNBJ "\\aftnbj" +#define OOO_STRING_SVTOOLS_RTF_AFTNCN "\\aftncn" +#define OOO_STRING_SVTOOLS_RTF_AFTNNALC "\\aftnnalc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNAR "\\aftnnar" +#define OOO_STRING_SVTOOLS_RTF_AFTNNAUC "\\aftnnauc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCHI "\\aftnnchi" +#define OOO_STRING_SVTOOLS_RTF_AFTNNRLC "\\aftnnrlc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNRUC "\\aftnnruc" +#define OOO_STRING_SVTOOLS_RTF_AFTNRESTART "\\aftnrestart" +#define OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT "\\aftnrstcont" +#define OOO_STRING_SVTOOLS_RTF_AFTNSEP "\\aftnsep" +#define OOO_STRING_SVTOOLS_RTF_AFTNSEPC "\\aftnsepc" +#define OOO_STRING_SVTOOLS_RTF_AFTNSTART "\\aftnstart" +#define OOO_STRING_SVTOOLS_RTF_AFTNTJ "\\aftntj" +#define OOO_STRING_SVTOOLS_RTF_AI "\\ai" +#define OOO_STRING_SVTOOLS_RTF_ALANG "\\alang" +#define OOO_STRING_SVTOOLS_RTF_ALLPROT "\\allprot" +#define OOO_STRING_SVTOOLS_RTF_ANNOTPROT "\\annotprot" +#define OOO_STRING_SVTOOLS_RTF_AOUTL "\\aoutl" +#define OOO_STRING_SVTOOLS_RTF_ASCAPS "\\ascaps" +#define OOO_STRING_SVTOOLS_RTF_ASHAD "\\ashad" +#define OOO_STRING_SVTOOLS_RTF_ASTRIKE "\\astrike" +#define OOO_STRING_SVTOOLS_RTF_ATNAUTHOR "\\atnauthor" +#define OOO_STRING_SVTOOLS_RTF_ATNICN "\\atnicn" +#define OOO_STRING_SVTOOLS_RTF_ATNREF "\\atnref" +#define OOO_STRING_SVTOOLS_RTF_ATNTIME "\\atntime" +#define OOO_STRING_SVTOOLS_RTF_ATRFEND "\\atrfend" +#define OOO_STRING_SVTOOLS_RTF_ATRFSTART "\\atrfstart" +#define OOO_STRING_SVTOOLS_RTF_AUL "\\aul" +#define OOO_STRING_SVTOOLS_RTF_AULD "\\auld" +#define OOO_STRING_SVTOOLS_RTF_AULDB "\\auldb" +#define OOO_STRING_SVTOOLS_RTF_AULNONE "\\aulnone" +#define OOO_STRING_SVTOOLS_RTF_AULW "\\aulw" +#define OOO_STRING_SVTOOLS_RTF_AUP "\\aup" +#define OOO_STRING_SVTOOLS_RTF_BKMKPUB "\\bkmkpub" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASH "\\brdrdash" +#define OOO_STRING_SVTOOLS_RTF_BRKFRM "\\brkfrm" +#define OOO_STRING_SVTOOLS_RTF_CCHS "\\cchs" +#define OOO_STRING_SVTOOLS_RTF_CPG "\\cpg" +#define OOO_STRING_SVTOOLS_RTF_CS "\\cs" +#define OOO_STRING_SVTOOLS_RTF_CVMME "\\cvmme" +#define OOO_STRING_SVTOOLS_RTF_DATAFIELD "\\datafield" +#define OOO_STRING_SVTOOLS_RTF_DO "\\do" +#define OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN "\\dobxcolumn" +#define OOO_STRING_SVTOOLS_RTF_DOBXMARGIN "\\dobxmargin" +#define OOO_STRING_SVTOOLS_RTF_DOBXPAGE "\\dobxpage" +#define OOO_STRING_SVTOOLS_RTF_DOBYMARGIN "\\dobymargin" +#define OOO_STRING_SVTOOLS_RTF_DOBYPAGE "\\dobypage" +#define OOO_STRING_SVTOOLS_RTF_DOBYPARA "\\dobypara" +#define OOO_STRING_SVTOOLS_RTF_DODHGT "\\dodhgt" +#define OOO_STRING_SVTOOLS_RTF_DOLOCK "\\dolock" +#define OOO_STRING_SVTOOLS_RTF_DPAENDHOL "\\dpaendhol" +#define OOO_STRING_SVTOOLS_RTF_DPAENDL "\\dpaendl" +#define OOO_STRING_SVTOOLS_RTF_DPAENDSOL "\\dpaendsol" +#define OOO_STRING_SVTOOLS_RTF_DPAENDW "\\dpaendw" +#define OOO_STRING_SVTOOLS_RTF_DPARC "\\dparc" +#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPX "\\dparcflipx" +#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPY "\\dparcflipy" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTHOL "\\dpastarthol" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTL "\\dpastartl" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTSOL "\\dpastartsol" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTW "\\dpastartw" +#define OOO_STRING_SVTOOLS_RTF_DPCALLOUT "\\dpcallout" +#define OOO_STRING_SVTOOLS_RTF_DPCOA "\\dpcoa" +#define OOO_STRING_SVTOOLS_RTF_DPCOACCENT "\\dpcoaccent" +#define OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT "\\dpcobestfit" +#define OOO_STRING_SVTOOLS_RTF_DPCOBORDER "\\dpcoborder" +#define OOO_STRING_SVTOOLS_RTF_DPCODABS "\\dpcodabs" +#define OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM "\\dpcodbottom" +#define OOO_STRING_SVTOOLS_RTF_DPCODCENTER "\\dpcodcenter" +#define OOO_STRING_SVTOOLS_RTF_DPCODTOP "\\dpcodtop" +#define OOO_STRING_SVTOOLS_RTF_DPCOLENGTH "\\dpcolength" +#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSX "\\dpcominusx" +#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSY "\\dpcominusy" +#define OOO_STRING_SVTOOLS_RTF_DPCOOFFSET "\\dpcooffset" +#define OOO_STRING_SVTOOLS_RTF_DPCOSMARTA "\\dpcosmarta" +#define OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE "\\dpcotdouble" +#define OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT "\\dpcotright" +#define OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE "\\dpcotsingle" +#define OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE "\\dpcottriple" +#define OOO_STRING_SVTOOLS_RTF_DPCOUNT "\\dpcount" +#define OOO_STRING_SVTOOLS_RTF_DPELLIPSE "\\dpellipse" +#define OOO_STRING_SVTOOLS_RTF_DPENDGROUP "\\dpendgroup" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCB "\\dpfillbgcb" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCG "\\dpfillbgcg" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCR "\\dpfillbgcr" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY "\\dpfillbggray" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL "\\dpfillbgpal" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCB "\\dpfillfgcb" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCG "\\dpfillfgcg" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCR "\\dpfillfgcr" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY "\\dpfillfggray" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL "\\dpfillfgpal" +#define OOO_STRING_SVTOOLS_RTF_DPFILLPAT "\\dpfillpat" +#define OOO_STRING_SVTOOLS_RTF_DPGROUP "\\dpgroup" +#define OOO_STRING_SVTOOLS_RTF_DPLINE "\\dpline" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOB "\\dplinecob" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOG "\\dplinecog" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOR "\\dplinecor" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDADO "\\dplinedado" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDADODO "\\dplinedadodo" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDASH "\\dplinedash" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDOT "\\dplinedot" +#define OOO_STRING_SVTOOLS_RTF_DPLINEGRAY "\\dplinegray" +#define OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW "\\dplinehollow" +#define OOO_STRING_SVTOOLS_RTF_DPLINEPAL "\\dplinepal" +#define OOO_STRING_SVTOOLS_RTF_DPLINESOLID "\\dplinesolid" +#define OOO_STRING_SVTOOLS_RTF_DPLINEW "\\dplinew" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT "\\dppolycount" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYGON "\\dppolygon" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYLINE "\\dppolyline" +#define OOO_STRING_SVTOOLS_RTF_DPPTX "\\dpptx" +#define OOO_STRING_SVTOOLS_RTF_DPPTY "\\dppty" +#define OOO_STRING_SVTOOLS_RTF_DPRECT "\\dprect" +#define OOO_STRING_SVTOOLS_RTF_DPROUNDR "\\dproundr" +#define OOO_STRING_SVTOOLS_RTF_DPSHADOW "\\dpshadow" +#define OOO_STRING_SVTOOLS_RTF_DPSHADX "\\dpshadx" +#define OOO_STRING_SVTOOLS_RTF_DPSHADY "\\dpshady" +#define OOO_STRING_SVTOOLS_RTF_DPTXBX "\\dptxbx" +#define OOO_STRING_SVTOOLS_RTF_DPTXBXMAR "\\dptxbxmar" +#define OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT "\\dptxbxtext" +#define OOO_STRING_SVTOOLS_RTF_DPX "\\dpx" +#define OOO_STRING_SVTOOLS_RTF_DPXSIZE "\\dpxsize" +#define OOO_STRING_SVTOOLS_RTF_DPY "\\dpy" +#define OOO_STRING_SVTOOLS_RTF_DPYSIZE "\\dpysize" +#define OOO_STRING_SVTOOLS_RTF_DS "\\ds" +#define OOO_STRING_SVTOOLS_RTF_EMSPACE "\\emspace" +#define OOO_STRING_SVTOOLS_RTF_ENSPACE "\\enspace" +#define OOO_STRING_SVTOOLS_RTF_FBIDI "\\fbidi" +#define OOO_STRING_SVTOOLS_RTF_FET "\\fet" +#define OOO_STRING_SVTOOLS_RTF_FID "\\fid" +#define OOO_STRING_SVTOOLS_RTF_FILE "\\file" +#define OOO_STRING_SVTOOLS_RTF_FILETBL "\\filetbl" +#define OOO_STRING_SVTOOLS_RTF_FLDALT "\\fldalt" +#define OOO_STRING_SVTOOLS_RTF_FNETWORK "\\fnetwork" +#define OOO_STRING_SVTOOLS_RTF_FONTEMB "\\fontemb" +#define OOO_STRING_SVTOOLS_RTF_FONTFILE "\\fontfile" +#define OOO_STRING_SVTOOLS_RTF_FORMDISP "\\formdisp" +#define OOO_STRING_SVTOOLS_RTF_FORMPROT "\\formprot" +#define OOO_STRING_SVTOOLS_RTF_FORMSHADE "\\formshade" +#define OOO_STRING_SVTOOLS_RTF_FOSNUM "\\fosnum" +#define OOO_STRING_SVTOOLS_RTF_FRELATIVE "\\frelative" +#define OOO_STRING_SVTOOLS_RTF_FTNALT "\\ftnalt" +#define OOO_STRING_SVTOOLS_RTF_FTNIL "\\ftnil" +#define OOO_STRING_SVTOOLS_RTF_FTNNALC "\\ftnnalc" +#define OOO_STRING_SVTOOLS_RTF_FTNNAR "\\ftnnar" +#define OOO_STRING_SVTOOLS_RTF_FTNNAUC "\\ftnnauc" +#define OOO_STRING_SVTOOLS_RTF_FTNNCHI "\\ftnnchi" +#define OOO_STRING_SVTOOLS_RTF_FTNNRLC "\\ftnnrlc" +#define OOO_STRING_SVTOOLS_RTF_FTNNRUC "\\ftnnruc" +#define OOO_STRING_SVTOOLS_RTF_FTNRSTCONT "\\ftnrstcont" +#define OOO_STRING_SVTOOLS_RTF_FTNRSTPG "\\ftnrstpg" +#define OOO_STRING_SVTOOLS_RTF_FTTRUETYPE "\\fttruetype" +#define OOO_STRING_SVTOOLS_RTF_FVALIDDOS "\\fvaliddos" +#define OOO_STRING_SVTOOLS_RTF_FVALIDHPFS "\\fvalidhpfs" +#define OOO_STRING_SVTOOLS_RTF_FVALIDMAC "\\fvalidmac" +#define OOO_STRING_SVTOOLS_RTF_FVALIDNTFS "\\fvalidntfs" +#define OOO_STRING_SVTOOLS_RTF_HYPHAUTO "\\hyphauto" +#define OOO_STRING_SVTOOLS_RTF_HYPHCAPS "\\hyphcaps" +#define OOO_STRING_SVTOOLS_RTF_HYPHCONSEC "\\hyphconsec" +#define OOO_STRING_SVTOOLS_RTF_HYPHPAR "\\hyphpar" +#define OOO_STRING_SVTOOLS_RTF_LINKSELF "\\linkself" +#define OOO_STRING_SVTOOLS_RTF_LINKSTYLES "\\linkstyles" +#define OOO_STRING_SVTOOLS_RTF_LTRCH "\\ltrch" +#define OOO_STRING_SVTOOLS_RTF_LTRDOC "\\ltrdoc" +#define OOO_STRING_SVTOOLS_RTF_LTRMARK "\\ltrmark" +#define OOO_STRING_SVTOOLS_RTF_LTRPAR "\\ltrpar" +#define OOO_STRING_SVTOOLS_RTF_LTRROW "\\ltrrow" +#define OOO_STRING_SVTOOLS_RTF_LTRSECT "\\ltrsect" +#define OOO_STRING_SVTOOLS_RTF_NOCOLBAL "\\nocolbal" +#define OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL "\\noextrasprl" +#define OOO_STRING_SVTOOLS_RTF_NOTABIND "\\notabind" +#define OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR "\\nowidctlpar" +#define OOO_STRING_SVTOOLS_RTF_OBJALIAS "\\objalias" +#define OOO_STRING_SVTOOLS_RTF_OBJALIGN "\\objalign" +#define OOO_STRING_SVTOOLS_RTF_OBJAUTLINK "\\objautlink" +#define OOO_STRING_SVTOOLS_RTF_OBJCLASS "\\objclass" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPB "\\objcropb" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPL "\\objcropl" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPR "\\objcropr" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPT "\\objcropt" +#define OOO_STRING_SVTOOLS_RTF_OBJDATA "\\objdata" +#define OOO_STRING_SVTOOLS_RTF_OBJECT "\\object" +#define OOO_STRING_SVTOOLS_RTF_OBJEMB "\\objemb" +#define OOO_STRING_SVTOOLS_RTF_OBJH "\\objh" +#define OOO_STRING_SVTOOLS_RTF_OBJICEMB "\\objicemb" +#define OOO_STRING_SVTOOLS_RTF_OBJLINK "\\objlink" +#define OOO_STRING_SVTOOLS_RTF_OBJLOCK "\\objlock" +#define OOO_STRING_SVTOOLS_RTF_OBJNAME "\\objname" +#define OOO_STRING_SVTOOLS_RTF_OBJPUB "\\objpub" +#define OOO_STRING_SVTOOLS_RTF_OBJSCALEX "\\objscalex" +#define OOO_STRING_SVTOOLS_RTF_OBJSCALEY "\\objscaley" +#define OOO_STRING_SVTOOLS_RTF_OBJSECT "\\objsect" +#define OOO_STRING_SVTOOLS_RTF_OBJSETSIZE "\\objsetsize" +#define OOO_STRING_SVTOOLS_RTF_OBJSUB "\\objsub" +#define OOO_STRING_SVTOOLS_RTF_OBJTIME "\\objtime" +#define OOO_STRING_SVTOOLS_RTF_OBJTRANSY "\\objtransy" +#define OOO_STRING_SVTOOLS_RTF_OBJUPDATE "\\objupdate" +#define OOO_STRING_SVTOOLS_RTF_OBJW "\\objw" +#define OOO_STRING_SVTOOLS_RTF_OTBLRUL "\\otblrul" +#define OOO_STRING_SVTOOLS_RTF_PGNHN "\\pgnhn" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSC "\\pgnhnsc" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSH "\\pgnhnsh" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSM "\\pgnhnsm" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSN "\\pgnhnsn" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSP "\\pgnhnsp" +#define OOO_STRING_SVTOOLS_RTF_PICBMP "\\picbmp" +#define OOO_STRING_SVTOOLS_RTF_PICBPP "\\picbpp" +#define OOO_STRING_SVTOOLS_RTF_PN "\\pn" +#define OOO_STRING_SVTOOLS_RTF_PNACROSS "\\pnacross" +#define OOO_STRING_SVTOOLS_RTF_PNB "\\pnb" +#define OOO_STRING_SVTOOLS_RTF_PNCAPS "\\pncaps" +#define OOO_STRING_SVTOOLS_RTF_PNCARD "\\pncard" +#define OOO_STRING_SVTOOLS_RTF_PNCF "\\pncf" +#define OOO_STRING_SVTOOLS_RTF_PNDEC "\\pndec" +#define OOO_STRING_SVTOOLS_RTF_PNF "\\pnf" +#define OOO_STRING_SVTOOLS_RTF_PNFS "\\pnfs" +#define OOO_STRING_SVTOOLS_RTF_PNHANG "\\pnhang" +#define OOO_STRING_SVTOOLS_RTF_PNI "\\pni" +#define OOO_STRING_SVTOOLS_RTF_PNINDENT "\\pnindent" +#define OOO_STRING_SVTOOLS_RTF_PNLCLTR "\\pnlcltr" +#define OOO_STRING_SVTOOLS_RTF_PNLCRM "\\pnlcrm" +#define OOO_STRING_SVTOOLS_RTF_PNLVL "\\pnlvl" +#define OOO_STRING_SVTOOLS_RTF_PNLVLBLT "\\pnlvlblt" +#define OOO_STRING_SVTOOLS_RTF_PNLVLBODY "\\pnlvlbody" +#define OOO_STRING_SVTOOLS_RTF_PNLVLCONT "\\pnlvlcont" +#define OOO_STRING_SVTOOLS_RTF_PNNUMONCE "\\pnnumonce" +#define OOO_STRING_SVTOOLS_RTF_PNORD "\\pnord" +#define OOO_STRING_SVTOOLS_RTF_PNORDT "\\pnordt" +#define OOO_STRING_SVTOOLS_RTF_PNPREV "\\pnprev" +#define OOO_STRING_SVTOOLS_RTF_PNQC "\\pnqc" +#define OOO_STRING_SVTOOLS_RTF_PNQL "\\pnql" +#define OOO_STRING_SVTOOLS_RTF_PNQR "\\pnqr" +#define OOO_STRING_SVTOOLS_RTF_PNRESTART "\\pnrestart" +#define OOO_STRING_SVTOOLS_RTF_PNSCAPS "\\pnscaps" +#define OOO_STRING_SVTOOLS_RTF_PNSECLVL "\\pnseclvl" +#define OOO_STRING_SVTOOLS_RTF_PNSP "\\pnsp" +#define OOO_STRING_SVTOOLS_RTF_PNSTART "\\pnstart" +#define OOO_STRING_SVTOOLS_RTF_PNSTRIKE "\\pnstrike" +#define OOO_STRING_SVTOOLS_RTF_PNTEXT "\\pntext" +#define OOO_STRING_SVTOOLS_RTF_PNTXTA "\\pntxta" +#define OOO_STRING_SVTOOLS_RTF_PNTXTB "\\pntxtb" +#define OOO_STRING_SVTOOLS_RTF_PNUCLTR "\\pnucltr" +#define OOO_STRING_SVTOOLS_RTF_PNUCRM "\\pnucrm" +#define OOO_STRING_SVTOOLS_RTF_PNUL "\\pnul" +#define OOO_STRING_SVTOOLS_RTF_PNULD "\\pnuld" +#define OOO_STRING_SVTOOLS_RTF_PNULDB "\\pnuldb" +#define OOO_STRING_SVTOOLS_RTF_PNULNONE "\\pnulnone" +#define OOO_STRING_SVTOOLS_RTF_PNULW "\\pnulw" +#define OOO_STRING_SVTOOLS_RTF_PRCOLBL "\\prcolbl" +#define OOO_STRING_SVTOOLS_RTF_PRINTDATA "\\printdata" +#define OOO_STRING_SVTOOLS_RTF_PSZ "\\psz" +#define OOO_STRING_SVTOOLS_RTF_PUBAUTO "\\pubauto" +#define OOO_STRING_SVTOOLS_RTF_RESULT "\\result" +#define OOO_STRING_SVTOOLS_RTF_REVAUTH "\\revauth" +#define OOO_STRING_SVTOOLS_RTF_REVDTTM "\\revdttm" +#define OOO_STRING_SVTOOLS_RTF_REVPROT "\\revprot" +#define OOO_STRING_SVTOOLS_RTF_REVTBL "\\revtbl" +#define OOO_STRING_SVTOOLS_RTF_RSLTBMP "\\rsltbmp" +#define OOO_STRING_SVTOOLS_RTF_RSLTMERGE "\\rsltmerge" +#define OOO_STRING_SVTOOLS_RTF_RSLTPICT "\\rsltpict" +#define OOO_STRING_SVTOOLS_RTF_RSLTRTF "\\rsltrtf" +#define OOO_STRING_SVTOOLS_RTF_RSLTTXT "\\rslttxt" +#define OOO_STRING_SVTOOLS_RTF_RTLCH "\\rtlch" +#define OOO_STRING_SVTOOLS_RTF_RTLDOC "\\rtldoc" +#define OOO_STRING_SVTOOLS_RTF_RTLMARK "\\rtlmark" +#define OOO_STRING_SVTOOLS_RTF_RTLPAR "\\rtlpar" +#define OOO_STRING_SVTOOLS_RTF_RTLROW "\\rtlrow" +#define OOO_STRING_SVTOOLS_RTF_RTLSECT "\\rtlsect" +#define OOO_STRING_SVTOOLS_RTF_SEC "\\sec" +#define OOO_STRING_SVTOOLS_RTF_SECTNUM "\\sectnum" +#define OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED "\\sectunlocked" +#define OOO_STRING_SVTOOLS_RTF_SLMULT "\\slmult" +#define OOO_STRING_SVTOOLS_RTF_SOFTCOL "\\softcol" +#define OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT "\\softlheight" +#define OOO_STRING_SVTOOLS_RTF_SOFTLINE "\\softline" +#define OOO_STRING_SVTOOLS_RTF_SOFTPAGE "\\softpage" +#define OOO_STRING_SVTOOLS_RTF_SPRSSPBF "\\sprsspbf" +#define OOO_STRING_SVTOOLS_RTF_SPRSTSP "\\sprstsp" +#define OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT "\\subdocument" +#define OOO_STRING_SVTOOLS_RTF_SWPBDR "\\swpbdr" +#define OOO_STRING_SVTOOLS_RTF_TCN "\\tcn" +#define OOO_STRING_SVTOOLS_RTF_TRANSMF "\\transmf" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRB "\\trbrdrb" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRH "\\trbrdrh" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRL "\\trbrdrl" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRR "\\trbrdrr" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRT "\\trbrdrt" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRV "\\trbrdrv" +#define OOO_STRING_SVTOOLS_RTF_TRHDR "\\trhdr" +#define OOO_STRING_SVTOOLS_RTF_TRKEEP "\\trkeep" +#define OOO_STRING_SVTOOLS_RTF_TRPADDB "\\trpaddb" +#define OOO_STRING_SVTOOLS_RTF_TRPADDL "\\trpaddl" +#define OOO_STRING_SVTOOLS_RTF_TRPADDR "\\trpaddr" +#define OOO_STRING_SVTOOLS_RTF_TRPADDT "\\trpaddt" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFB "\\trpaddfb" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFL "\\trpaddfl" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFR "\\trpaddfr" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFT "\\trpaddft" +#define OOO_STRING_SVTOOLS_RTF_WRAPTRSP "\\wraptrsp" +#define OOO_STRING_SVTOOLS_RTF_XEF "\\xef" +#define OOO_STRING_SVTOOLS_RTF_ZWJ "\\zwj" +#define OOO_STRING_SVTOOLS_RTF_ZWNJ "\\zwnj" + +// neue Tokens zur 1.5 +#define OOO_STRING_SVTOOLS_RTF_ABSLOCK "\\abslock" +#define OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT "\\adjustright" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG "\\aftnnchosung" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCNUM "\\aftnncnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBAR "\\aftnndbar" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM "\\aftnndbnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD "\\aftnndbnumd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK "\\aftnndbnumk" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT "\\aftnndbnumt" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGANADA "\\aftnnganada" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM "\\aftnngbnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD "\\aftnngbnumd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK "\\aftnngbnumk" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML "\\aftnngbnuml" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC "\\aftnnzodiac" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD "\\aftnnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL "\\aftnnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_ANIMTEXT "\\animtext" +#define OOO_STRING_SVTOOLS_RTF_ANSICPG "\\ansicpg" +#define OOO_STRING_SVTOOLS_RTF_BACKGROUND "\\background" +#define OOO_STRING_SVTOOLS_RTF_BDBFHDR "\\bdbfhdr" +#define OOO_STRING_SVTOOLS_RTF_BLIPTAG "\\bliptag" +#define OOO_STRING_SVTOOLS_RTF_BLIPUID "\\blipuid" +#define OOO_STRING_SVTOOLS_RTF_BLIPUPI "\\blipupi" +#define OOO_STRING_SVTOOLS_RTF_BRDRART "\\brdrart" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHD "\\brdrdashd" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDD "\\brdrdashdd" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR "\\brdrdashdotstr" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm" +#define OOO_STRING_SVTOOLS_RTF_BRDREMBOSS "\\brdremboss" +#define OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE "\\brdrengrave" +#define OOO_STRING_SVTOOLS_RTF_BRDRFRAME "\\brdrframe" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG "\\brdrthtnlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG "\\brdrthtnmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG "\\brdrthtnsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG "\\brdrtnthlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG "\\brdrtnthmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG "\\brdrtnthsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG "\\brdrtnthtnlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG "\\brdrtnthtnmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG "\\brdrtnthtnsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE "\\brdrtriple" +#define OOO_STRING_SVTOOLS_RTF_BRDRWAVY "\\brdrwavy" +#define OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB "\\brdrwavydb" +#define OOO_STRING_SVTOOLS_RTF_CATEGORY "\\category" +#define OOO_STRING_SVTOOLS_RTF_CGRID "\\cgrid" +#define OOO_STRING_SVTOOLS_RTF_CHARSCALEX "\\charscalex" +#define OOO_STRING_SVTOOLS_RTF_CHBGBDIAG "\\chbgbdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGCROSS "\\chbgcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDCROSS "\\chbgdcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG "\\chbgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS "\\chbgdkcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS "\\chbgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG "\\chbgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ "\\chbgdkhoriz" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKVERT "\\chbgdkvert" +#define OOO_STRING_SVTOOLS_RTF_CHBGFDIAG "\\chbgfdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGHORIZ "\\chbghoriz" +#define OOO_STRING_SVTOOLS_RTF_CHBGVERT "\\chbgvert" +#define OOO_STRING_SVTOOLS_RTF_CHBRDR "\\chbrdr" +#define OOO_STRING_SVTOOLS_RTF_CHCBPAT "\\chcbpat" +#define OOO_STRING_SVTOOLS_RTF_CHCFPAT "\\chcfpat" +#define OOO_STRING_SVTOOLS_RTF_CHSHDNG "\\chshdng" +#define OOO_STRING_SVTOOLS_RTF_CLPADL "\\clpadl" +#define OOO_STRING_SVTOOLS_RTF_CLPADT "\\clpadt" +#define OOO_STRING_SVTOOLS_RTF_CLPADB "\\clpadb" +#define OOO_STRING_SVTOOLS_RTF_CLPADR "\\clpadr" +#define OOO_STRING_SVTOOLS_RTF_CLPADFL "\\clpadfl" +#define OOO_STRING_SVTOOLS_RTF_CLPADFT "\\clpadft" +#define OOO_STRING_SVTOOLS_RTF_CLPADFB "\\clpadfb" +#define OOO_STRING_SVTOOLS_RTF_CLPADFR "\\clpadfr" +#define OOO_STRING_SVTOOLS_RTF_CLTXLRTB "\\cltxlrtb" +#define OOO_STRING_SVTOOLS_RTF_CLTXTBRL "\\cltxtbrl" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALB "\\clvertalb" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALC "\\clvertalc" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALT "\\clvertalt" +#define OOO_STRING_SVTOOLS_RTF_CLVMGF "\\clvmgf" +#define OOO_STRING_SVTOOLS_RTF_CLVMRG "\\clvmrg" +#define OOO_STRING_SVTOOLS_RTF_CLTXTBRLV "\\cltxtbrlv" +#define OOO_STRING_SVTOOLS_RTF_CLTXBTLR "\\cltxbtlr" +#define OOO_STRING_SVTOOLS_RTF_CLTXLRTBV "\\cltxlrtbv" +#define OOO_STRING_SVTOOLS_RTF_COMPANY "\\company" +#define OOO_STRING_SVTOOLS_RTF_CRAUTH "\\crauth" +#define OOO_STRING_SVTOOLS_RTF_CRDATE "\\crdate" +#define OOO_STRING_SVTOOLS_RTF_DATE "\\date" +#define OOO_STRING_SVTOOLS_RTF_DEFLANGFE "\\deflangfe" +#define OOO_STRING_SVTOOLS_RTF_DFRAUTH "\\dfrauth" +#define OOO_STRING_SVTOOLS_RTF_DFRDATE "\\dfrdate" +#define OOO_STRING_SVTOOLS_RTF_DFRSTART "\\dfrstart" +#define OOO_STRING_SVTOOLS_RTF_DFRSTOP "\\dfrstop" +#define OOO_STRING_SVTOOLS_RTF_DFRXST "\\dfrxst" +#define OOO_STRING_SVTOOLS_RTF_DGMARGIN "\\dgmargin" +#define OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB "\\dntblnsbdb" +#define OOO_STRING_SVTOOLS_RTF_DOCTYPE "\\doctype" +#define OOO_STRING_SVTOOLS_RTF_DOCVAR "\\docvar" +#define OOO_STRING_SVTOOLS_RTF_DPCODESCENT "\\dpcodescent" +#define OOO_STRING_SVTOOLS_RTF_EMBO "\\embo" +#define OOO_STRING_SVTOOLS_RTF_EMFBLIP "\\emfblip" +#define OOO_STRING_SVTOOLS_RTF_EXPSHRTN "\\expshrtn" +#define OOO_STRING_SVTOOLS_RTF_FAAUTO "\\faauto" +#define OOO_STRING_SVTOOLS_RTF_FBIAS "\\fbias" +#define OOO_STRING_SVTOOLS_RTF_FFDEFRES "\\ffdefres" +#define OOO_STRING_SVTOOLS_RTF_FFDEFTEXT "\\ffdeftext" +#define OOO_STRING_SVTOOLS_RTF_FFENTRYMCR "\\ffentrymcr" +#define OOO_STRING_SVTOOLS_RTF_FFEXITMCR "\\ffexitmcr" +#define OOO_STRING_SVTOOLS_RTF_FFFORMAT "\\ffformat" +#define OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX "\\ffhaslistbox" +#define OOO_STRING_SVTOOLS_RTF_FFHELPTEXT "\\ffhelptext" +#define OOO_STRING_SVTOOLS_RTF_FFHPS "\\ffhps" +#define OOO_STRING_SVTOOLS_RTF_FFL "\\ffl" +#define OOO_STRING_SVTOOLS_RTF_FFMAXLEN "\\ffmaxlen" +#define OOO_STRING_SVTOOLS_RTF_FFNAME "\\ffname" +#define OOO_STRING_SVTOOLS_RTF_FFOWNHELP "\\ffownhelp" +#define OOO_STRING_SVTOOLS_RTF_FFOWNSTAT "\\ffownstat" +#define OOO_STRING_SVTOOLS_RTF_FFPROT "\\ffprot" +#define OOO_STRING_SVTOOLS_RTF_FFRECALC "\\ffrecalc" +#define OOO_STRING_SVTOOLS_RTF_FFRES "\\ffres" +#define OOO_STRING_SVTOOLS_RTF_FFSIZE "\\ffsize" +#define OOO_STRING_SVTOOLS_RTF_FFSTATTEXT "\\ffstattext" +#define OOO_STRING_SVTOOLS_RTF_FFTYPE "\\fftype" +#define OOO_STRING_SVTOOLS_RTF_FFTYPETXT "\\fftypetxt" +#define OOO_STRING_SVTOOLS_RTF_FLDTYPE "\\fldtype" +#define OOO_STRING_SVTOOLS_RTF_FNAME "\\fname" +#define OOO_STRING_SVTOOLS_RTF_FORMFIELD "\\formfield" +#define OOO_STRING_SVTOOLS_RTF_FROMTEXT "\\fromtext" +#define OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG "\\ftnnchosung" +#define OOO_STRING_SVTOOLS_RTF_FTNNCNUM "\\ftnncnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBAR "\\ftnndbar" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUM "\\ftnndbnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD "\\ftnndbnumd" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK "\\ftnndbnumk" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT "\\ftnndbnumt" +#define OOO_STRING_SVTOOLS_RTF_FTNNGANADA "\\ftnnganada" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUM "\\ftnngbnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD "\\ftnngbnumd" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK "\\ftnngbnumk" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUML "\\ftnngbnuml" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIAC "\\ftnnzodiac" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACD "\\ftnnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACL "\\ftnnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_G "\\g" +#define OOO_STRING_SVTOOLS_RTF_GCW "\\gcw" +#define OOO_STRING_SVTOOLS_RTF_GRIDTBL "\\gridtbl" +#define OOO_STRING_SVTOOLS_RTF_HIGHLIGHT "\\highlight" +#define OOO_STRING_SVTOOLS_RTF_HLFR "\\hlfr" +#define OOO_STRING_SVTOOLS_RTF_HLINKBASE "\\hlinkbase" +#define OOO_STRING_SVTOOLS_RTF_HLLOC "\\hlloc" +#define OOO_STRING_SVTOOLS_RTF_HLSRC "\\hlsrc" +#define OOO_STRING_SVTOOLS_RTF_ILVL "\\ilvl" +#define OOO_STRING_SVTOOLS_RTF_IMPR "\\impr" +#define OOO_STRING_SVTOOLS_RTF_JPEGBLIP "\\jpegblip" +#define OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW "\\levelfollow" +#define OOO_STRING_SVTOOLS_RTF_LEVELINDENT "\\levelindent" +#define OOO_STRING_SVTOOLS_RTF_LEVELJC "\\leveljc" +#define OOO_STRING_SVTOOLS_RTF_LEVELLEGAL "\\levellegal" +#define OOO_STRING_SVTOOLS_RTF_LEVELNFC "\\levelnfc" +#define OOO_STRING_SVTOOLS_RTF_LEVELNORESTART "\\levelnorestart" +#define OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS "\\levelnumbers" +#define OOO_STRING_SVTOOLS_RTF_LEVELOLD "\\levelold" +#define OOO_STRING_SVTOOLS_RTF_LEVELPREV "\\levelprev" +#define OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE "\\levelprevspace" +#define OOO_STRING_SVTOOLS_RTF_LEVELSPACE "\\levelspace" +#define OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT "\\levelstartat" +#define OOO_STRING_SVTOOLS_RTF_LEVELTEXT "\\leveltext" +#define OOO_STRING_SVTOOLS_RTF_LINKVAL "\\linkval" +#define OOO_STRING_SVTOOLS_RTF_LIST "\\list" +#define OOO_STRING_SVTOOLS_RTF_LISTID "\\listid" +#define OOO_STRING_SVTOOLS_RTF_LISTLEVEL "\\listlevel" +#define OOO_STRING_SVTOOLS_RTF_LISTNAME "\\listname" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE "\\listoverride" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT "\\listoverridecount" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT "\\listoverrideformat" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART "\\listoverridestart" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE "\\listoverridetable" +#define OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN "\\listrestarthdn" +#define OOO_STRING_SVTOOLS_RTF_LISTSIMPLE "\\listsimple" +#define OOO_STRING_SVTOOLS_RTF_LISTTABLE "\\listtable" +#define OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID "\\listtemplateid" +#define OOO_STRING_SVTOOLS_RTF_LISTTEXT "\\listtext" +#define OOO_STRING_SVTOOLS_RTF_LS "\\ls" +#define OOO_STRING_SVTOOLS_RTF_LYTEXCTTP "\\lytexcttp" +#define OOO_STRING_SVTOOLS_RTF_LYTPRTMET "\\lytprtmet" +#define OOO_STRING_SVTOOLS_RTF_MANAGER "\\manager" +#define OOO_STRING_SVTOOLS_RTF_MSMCAP "\\msmcap" +#define OOO_STRING_SVTOOLS_RTF_NOFCHARSWS "\\nofcharsws" +#define OOO_STRING_SVTOOLS_RTF_NOLEAD "\\nolead" +#define OOO_STRING_SVTOOLS_RTF_NONSHPPICT "\\nonshppict" +#define OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND "\\nosectexpand" +#define OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID "\\nosnaplinegrid" +#define OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL "\\nospaceforul" +#define OOO_STRING_SVTOOLS_RTF_NOULTRLSPC "\\noultrlspc" +#define OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN "\\noxlattoyen" +#define OOO_STRING_SVTOOLS_RTF_OBJATTPH "\\objattph" +#define OOO_STRING_SVTOOLS_RTF_OBJHTML "\\objhtml" +#define OOO_STRING_SVTOOLS_RTF_OBJOCX "\\objocx" +#define OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP "\\oldlinewrap" +#define OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL "\\outlinelevel" +#define OOO_STRING_SVTOOLS_RTF_OVERLAY "\\overlay" +#define OOO_STRING_SVTOOLS_RTF_PANOSE "\\panose" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRB "\\pgbrdrb" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT "\\pgbrdrfoot" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD "\\pgbrdrhead" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRL "\\pgbrdrl" +#define OOO_STRING_SVTOOLS_RTF_PGBRDROPT "\\pgbrdropt" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRR "\\pgbrdrr" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP "\\pgbrdrsnap" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRT "\\pgbrdrt" +#define OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG "\\pgnchosung" +#define OOO_STRING_SVTOOLS_RTF_PGNCNUM "\\pgncnum" +#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMK "\\pgndbnumk" +#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMT "\\pgndbnumt" +#define OOO_STRING_SVTOOLS_RTF_PGNGANADA "\\pgnganada" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUM "\\pgngbnum" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMD "\\pgngbnumd" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMK "\\pgngbnumk" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUML "\\pgngbnuml" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIAC "\\pgnzodiac" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIACD "\\pgnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIACL "\\pgnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_PICPROP "\\picprop" +#define OOO_STRING_SVTOOLS_RTF_PNAIUEO "\\pnaiueo" +#define OOO_STRING_SVTOOLS_RTF_PNAIUEOD "\\pnaiueod" +#define OOO_STRING_SVTOOLS_RTF_PNCHOSUNG "\\pnchosung" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMD "\\pndbnumd" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMK "\\pndbnumk" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUML "\\pndbnuml" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMT "\\pndbnumt" +#define OOO_STRING_SVTOOLS_RTF_PNGANADA "\\pnganada" +#define OOO_STRING_SVTOOLS_RTF_PNGBLIP "\\pngblip" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUM "\\pngbnum" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUMD "\\pngbnumd" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUMK "\\pngbnumk" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUML "\\pngbnuml" +#define OOO_STRING_SVTOOLS_RTF_PNRAUTH "\\pnrauth" +#define OOO_STRING_SVTOOLS_RTF_PNRDATE "\\pnrdate" +#define OOO_STRING_SVTOOLS_RTF_PNRNFC "\\pnrnfc" +#define OOO_STRING_SVTOOLS_RTF_PNRNOT "\\pnrnot" +#define OOO_STRING_SVTOOLS_RTF_PNRPNBR "\\pnrpnbr" +#define OOO_STRING_SVTOOLS_RTF_PNRRGB "\\pnrrgb" +#define OOO_STRING_SVTOOLS_RTF_PNRSTART "\\pnrstart" +#define OOO_STRING_SVTOOLS_RTF_PNRSTOP "\\pnrstop" +#define OOO_STRING_SVTOOLS_RTF_PNRXST "\\pnrxst" +#define OOO_STRING_SVTOOLS_RTF_PNZODIAC "\\pnzodiac" +#define OOO_STRING_SVTOOLS_RTF_PNZODIACD "\\pnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_PNZODIACL "\\pnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_LFOLEVEL "\\lfolevel" +#define OOO_STRING_SVTOOLS_RTF_POSYIN "\\posyin" +#define OOO_STRING_SVTOOLS_RTF_POSYOUT "\\posyout" +#define OOO_STRING_SVTOOLS_RTF_PRIVATE "\\private" +#define OOO_STRING_SVTOOLS_RTF_PROPNAME "\\propname" +#define OOO_STRING_SVTOOLS_RTF_PROPTYPE "\\proptype" +#define OOO_STRING_SVTOOLS_RTF_REVAUTHDEL "\\revauthdel" +#define OOO_STRING_SVTOOLS_RTF_REVDTTMDEL "\\revdttmdel" +#define OOO_STRING_SVTOOLS_RTF_SAUTOUPD "\\sautoupd" +#define OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL "\\sectdefaultcl" +#define OOO_STRING_SVTOOLS_RTF_SECTEXPAND "\\sectexpand" +#define OOO_STRING_SVTOOLS_RTF_SECTLINEGRID "\\sectlinegrid" +#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL "\\sectspecifycl" +#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL "\\sectspecifyl" +#define OOO_STRING_SVTOOLS_RTF_SHIDDEN "\\shidden" +#define OOO_STRING_SVTOOLS_RTF_SHPBOTTOM "\\shpbottom" +#define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" +#define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" +#define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" +#define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" +#define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" +#define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" +#define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" +#define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" +#define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" +#define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" +#define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" +#define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" +#define OOO_STRING_SVTOOLS_RTF_SHPPICT "\\shppict" +#define OOO_STRING_SVTOOLS_RTF_SHPRIGHT "\\shpright" +#define OOO_STRING_SVTOOLS_RTF_SHPRSLT "\\shprslt" +#define OOO_STRING_SVTOOLS_RTF_SHPTOP "\\shptop" +#define OOO_STRING_SVTOOLS_RTF_SHPTXT "\\shptxt" +#define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" +#define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" +#define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" +#define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" +#define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" +#define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" +#define OOO_STRING_SVTOOLS_RTF_STATICVAL "\\staticval" +#define OOO_STRING_SVTOOLS_RTF_STEXTFLOW "\\stextflow" +#define OOO_STRING_SVTOOLS_RTF_STRIKED "\\striked" +#define OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE "\\subfontbysize" +#define OOO_STRING_SVTOOLS_RTF_TCELLD "\\tcelld" +#define OOO_STRING_SVTOOLS_RTF_TIME "\\time" +#define OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT "\\truncatefontheight" +#define OOO_STRING_SVTOOLS_RTF_UC "\\uc" +#define OOO_STRING_SVTOOLS_RTF_UD "\\ud" +#define OOO_STRING_SVTOOLS_RTF_ULDASH "\\uldash" +#define OOO_STRING_SVTOOLS_RTF_ULDASHD "\\uldashd" +#define OOO_STRING_SVTOOLS_RTF_ULDASHDD "\\uldashdd" +#define OOO_STRING_SVTOOLS_RTF_ULTH "\\ulth" +#define OOO_STRING_SVTOOLS_RTF_ULWAVE "\\ulwave" +#define OOO_STRING_SVTOOLS_RTF_ULC "\\ulc" +#define OOO_STRING_SVTOOLS_RTF_U "\\u" +#define OOO_STRING_SVTOOLS_RTF_UPR "\\upr" +#define OOO_STRING_SVTOOLS_RTF_USERPROPS "\\userprops" +#define OOO_STRING_SVTOOLS_RTF_VIEWKIND "\\viewkind" +#define OOO_STRING_SVTOOLS_RTF_VIEWSCALE "\\viewscale" +#define OOO_STRING_SVTOOLS_RTF_VIEWZK "\\viewzk" +#define OOO_STRING_SVTOOLS_RTF_WIDCTLPAR "\\widctlpar" +#define OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION "\\windowcaption" +#define OOO_STRING_SVTOOLS_RTF_WPEQN "\\wpeqn" +#define OOO_STRING_SVTOOLS_RTF_WPJST "\\wpjst" +#define OOO_STRING_SVTOOLS_RTF_WPSP "\\wpsp" +#define OOO_STRING_SVTOOLS_RTF_YXE "\\yxe" +#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTB "\\frmtxlrtb" +#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRL "\\frmtxtbrl" +#define OOO_STRING_SVTOOLS_RTF_FRMTXBTLR "\\frmtxbtlr" +#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV "\\frmtxlrtbv" +#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV "\\frmtxtbrlv" + +// MS-2000 Tokens +#define OOO_STRING_SVTOOLS_RTF_ULTHD "\\ulthd" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASH "\\ulthdash" +#define OOO_STRING_SVTOOLS_RTF_ULLDASH "\\ulldash" +#define OOO_STRING_SVTOOLS_RTF_ULTHLDASH "\\ulthldash" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASHD "\\ulthdashd" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASHDD "\\ulthdashdd" +#define OOO_STRING_SVTOOLS_RTF_ULHWAVE "\\ulhwave" +#define OOO_STRING_SVTOOLS_RTF_ULULDBWAVE "\\ululdbwave" +#define OOO_STRING_SVTOOLS_RTF_LOCH "\\loch" +#define OOO_STRING_SVTOOLS_RTF_HICH "\\hich" +#define OOO_STRING_SVTOOLS_RTF_DBCH "\\dbch" +#define OOO_STRING_SVTOOLS_RTF_LANGFE "\\langfe" +#define OOO_STRING_SVTOOLS_RTF_ADEFLANG "\\adeflang" +#define OOO_STRING_SVTOOLS_RTF_ADEFF "\\adeff" +#define OOO_STRING_SVTOOLS_RTF_ACCNONE "\\accnone" +#define OOO_STRING_SVTOOLS_RTF_ACCDOT "\\accdot" +#define OOO_STRING_SVTOOLS_RTF_ACCCOMMA "\\acccomma" +#define OOO_STRING_SVTOOLS_RTF_TWOINONE "\\twoinone" +#define OOO_STRING_SVTOOLS_RTF_HORZVERT "\\horzvert" +#define OOO_STRING_SVTOOLS_RTF_FAHANG "\\fahang" +#define OOO_STRING_SVTOOLS_RTF_FAVAR "\\favar" +#define OOO_STRING_SVTOOLS_RTF_FACENTER "\\facenter" +#define OOO_STRING_SVTOOLS_RTF_FAROMAN "\\faroman" +#define OOO_STRING_SVTOOLS_RTF_FAFIXED "\\fafixed" +#define OOO_STRING_SVTOOLS_RTF_NOCWRAP "\\nocwrap" +#define OOO_STRING_SVTOOLS_RTF_NOOVERFLOW "\\nooverflow" +#define OOO_STRING_SVTOOLS_RTF_ASPALPHA "\\aspalpha" + +// SWG spezifische Attribute +#define OOO_STRING_SVTOOLS_RTF_GRFALIGNV "\\grfalignv" +#define OOO_STRING_SVTOOLS_RTF_GRFALIGNH "\\grfalignh" +#define OOO_STRING_SVTOOLS_RTF_GRFMIRROR "\\grfmirror" +#define OOO_STRING_SVTOOLS_RTF_HEADERYB "\\headeryb" +#define OOO_STRING_SVTOOLS_RTF_HEADERXL "\\headerxl" +#define OOO_STRING_SVTOOLS_RTF_HEADERXR "\\headerxr" +#define OOO_STRING_SVTOOLS_RTF_FOOTERYT "\\footeryt" +#define OOO_STRING_SVTOOLS_RTF_FOOTERXL "\\footerxl" +#define OOO_STRING_SVTOOLS_RTF_FOOTERXR "\\footerxr" +#define OOO_STRING_SVTOOLS_RTF_HEADERYH "\\headeryh" +#define OOO_STRING_SVTOOLS_RTF_FOOTERYH "\\footeryh" +#define OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN "\\swcolmnblnc" +#define OOO_STRING_SVTOOLS_RTF_UPDNPROP "\\updnprop" +#define OOO_STRING_SVTOOLS_RTF_PRTDATA "\\prtdata" +#define OOO_STRING_SVTOOLS_RTF_BKMKKEY "\\bkmkkey" + +// Attribute fuer die freifliegenden Rahmen +#define OOO_STRING_SVTOOLS_RTF_FLYPRINT "\\flyprint" +#define OOO_STRING_SVTOOLS_RTF_FLYOPAQUE "\\flyopaque" +#define OOO_STRING_SVTOOLS_RTF_FLYPRTCTD "\\flyprtctd" +#define OOO_STRING_SVTOOLS_RTF_FLYMAINCNT "\\flymaincnt" +#define OOO_STRING_SVTOOLS_RTF_FLYVERT "\\flyvert" +#define OOO_STRING_SVTOOLS_RTF_FLYHORZ "\\flyhorz" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTL "\\dfrmtxtl" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTR "\\dfrmtxtr" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTU "\\dfrmtxtu" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTW "\\dfrmtxtw" +#define OOO_STRING_SVTOOLS_RTF_FLYANCHOR "\\flyanchor" +#define OOO_STRING_SVTOOLS_RTF_FLYCNTNT "\\flycntnt" +#define OOO_STRING_SVTOOLS_RTF_FLYCOLUMN "\\flycolumn" +#define OOO_STRING_SVTOOLS_RTF_FLYPAGE "\\flypage" +#define OOO_STRING_SVTOOLS_RTF_FLYINPARA "\\flyinpara" +#define OOO_STRING_SVTOOLS_RTF_BRDBOX "\\brdbox" +#define OOO_STRING_SVTOOLS_RTF_BRDLNCOL "\\brdlncol" +#define OOO_STRING_SVTOOLS_RTF_BRDLNIN "\\brdlnin" +#define OOO_STRING_SVTOOLS_RTF_BRDLNOUT "\\brdlnout" +#define OOO_STRING_SVTOOLS_RTF_BRDLNDIST "\\brdlndist" +#define OOO_STRING_SVTOOLS_RTF_SHADOW "\\shadow" +#define OOO_STRING_SVTOOLS_RTF_SHDWDIST "\\shdwdist" +#define OOO_STRING_SVTOOLS_RTF_SHDWSTYLE "\\shdwstyle" +#define OOO_STRING_SVTOOLS_RTF_SHDWCOL "\\shdwcol" +#define OOO_STRING_SVTOOLS_RTF_SHDWFCOL "\\shdwfcol" +#define OOO_STRING_SVTOOLS_RTF_PGDSCTBL "\\pgdsctbl" +#define OOO_STRING_SVTOOLS_RTF_PGDSC "\\pgdsc" +#define OOO_STRING_SVTOOLS_RTF_PGDSCUSE "\\pgdscuse" +#define OOO_STRING_SVTOOLS_RTF_PGDSCNXT "\\pgdscnxt" +#define OOO_STRING_SVTOOLS_RTF_HYPHEN "\\hyphen" +#define OOO_STRING_SVTOOLS_RTF_HYPHLEAD "\\hyphlead" +#define OOO_STRING_SVTOOLS_RTF_HYPHTRAIL "\\hyphtrail" +#define OOO_STRING_SVTOOLS_RTF_HYPHMAX "\\hyphmax" +#define OOO_STRING_SVTOOLS_RTF_TLSWG "\\tlswg" +#define OOO_STRING_SVTOOLS_RTF_PGBRK "\\pgbrk" +#define OOO_STRING_SVTOOLS_RTF_PGDSCNO "\\pgdscno" +#define OOO_STRING_SVTOOLS_RTF_SOUTLVL "\\soutlvl" +#define OOO_STRING_SVTOOLS_RTF_SHP "\\shp" +#define OOO_STRING_SVTOOLS_RTF_SN "\\sn" +#define OOO_STRING_SVTOOLS_RTF_SV "\\sv" + +// Support for overline attributes +#define OOO_STRING_SVTOOLS_RTF_OL "\\ol" +#define OOO_STRING_SVTOOLS_RTF_OLD "\\old" +#define OOO_STRING_SVTOOLS_RTF_OLDB "\\oldb" +#define OOO_STRING_SVTOOLS_RTF_OLNONE "\\olnone" +#define OOO_STRING_SVTOOLS_RTF_OLW "\\olw" +#define OOO_STRING_SVTOOLS_RTF_OLDASH "\\oldash" +#define OOO_STRING_SVTOOLS_RTF_OLDASHD "\\oldashd" +#define OOO_STRING_SVTOOLS_RTF_OLDASHDD "\\oldashdd" +#define OOO_STRING_SVTOOLS_RTF_OLTH "\\olth" +#define OOO_STRING_SVTOOLS_RTF_OLWAVE "\\olwave" +#define OOO_STRING_SVTOOLS_RTF_OLC "\\olc" +#define OOO_STRING_SVTOOLS_RTF_OLTHD "\\olthd" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASH "\\olthdash" +#define OOO_STRING_SVTOOLS_RTF_OLLDASH "\\olldash" +#define OOO_STRING_SVTOOLS_RTF_OLTHLDASH "\\olthldash" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASHD "\\olthdashd" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASHDD "\\olthdashdd" +#define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" +#define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" + +#endif // _RTFKEYWD_HXX diff --git a/svtools/inc/svtools/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx new file mode 100644 index 000000000000..ba20add1d968 --- /dev/null +++ b/svtools/inc/svtools/rtfout.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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: rtfout.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RTFOUT_HXX +#define _RTFOUT_HXX + +#include "svtools/svtdllapi.h" +#include + +#ifndef _RTL_TEXTENC_H_ +#include +#endif + +class String; +class SvStream; + +class SVT_DLLPUBLIC RTFOutFuncs +{ +public: +#if defined(MAC) || defined(UNX) + static const sal_Char sNewLine; // nur \012 oder \015 +#else + static const sal_Char __FAR_DATA sNewLine[]; // \015\012 +#endif + + static SvStream& Out_Char( SvStream&, sal_Unicode cChar, + int *pUCMode, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + static SvStream& Out_String( SvStream&, const String&, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + static SvStream& Out_Fontname( SvStream&, const String&, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + + static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); +}; + + +#endif + + diff --git a/svtools/inc/svtools/rtftoken.h b/svtools/inc/svtools/rtftoken.h new file mode 100644 index 000000000000..c7981361ffc9 --- /dev/null +++ b/svtools/inc/svtools/rtftoken.h @@ -0,0 +1,1276 @@ +/************************************************************************* + * + * 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: rtftoken.h,v $ + * $Revision: 1.13.134.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + +#ifndef _RTFTOKEN_H +#define _RTFTOKEN_H + +class String; + +// suche die TokenID zu dem Token +int GetRTFToken( const String& rSearch ); + +enum RTF_TOKEN_RANGES { + RTF_NOGROUP = 0x0100, + RTF_DOCFMT = 0x0200, + RTF_SECTFMT = 0x0300, + RTF_PARFMT = 0x0400, + RTF_TABSTOPDEF = 0x0500, + RTF_BRDRDEF = 0x0600, + RTF_CHRFMT = 0x0700, + RTF_SPECCHAR = 0x0800, + RTF_APOCTL = 0x0900, + RTF_SHADINGDEF = 0x0A00, + // free = 0x0B00, + RTF_DRAWOBJECTS = 0x0C00, + RTF_OBJECTS = 0x0D00, + RTF_NUMBULLETS = 0x0E00, + + // !!! kann hinein verodert werden (Border/Background) !!!! + RTF_TABLEDEF = 0x1000, + + // !!! kann hinein verodert werden (Border/Tab) !!!! + RTF_SWGDEFS = 0x4000 +}; + +enum RTF_TOKEN_IDS { + + RTF_TEXTTOKEN = RTF_NOGROUP, + RTF_SINGLECHAR, + RTF_UNKNOWNCONTROL, + RTF_UNKNOWNDATA, + + RTF_RTF, + RTF_ANSITYPE, + RTF_MACTYPE, + RTF_PCTYPE, + RTF_PCATYPE, + RTF_NEXTTYPE, + + RTF_STYLESHEET, + RTF_SBASEDON, + RTF_SNEXT, + RTF_SHIDDEN, + RTF_SAUTOUPD, + + RTF_KEYCODE, + RTF_FNKEY, + RTF_ALTKEY, + RTF_SHIFTKEY, + RTF_CTRLKEY, + + RTF_FONTTBL, + RTF_DEFF, + RTF_FNIL, + RTF_FROMAN, + RTF_FSWISS, + RTF_FMODERN, + RTF_FSCRIPT, + RTF_FDECOR, + RTF_FTECH, + + RTF_COLORTBL, + RTF_RED, + RTF_GREEN, + RTF_BLUE, + + RTF_INFO, + RTF_TITLE, + RTF_SUBJECT, + RTF_AUTHOR, + RTF_OPERATOR, + RTF_KEYWORDS, + RTF_COMMENT, + RTF_VERSION, + RTF_DOCCOMM, + RTF_VERN, + RTF_CREATIM, + RTF_REVTIM, + RTF_PRINTIM, + RTF_BUPTIM, + RTF_EDMINS, + RTF_NOFPAGES, + RTF_NOFWORDS, + RTF_NOFCHARS, + RTF_ID, + RTF_YR, + RTF_MO, + RTF_DY, + RTF_HR, + RTF_MIN, + RTF_USERPROPS, + RTF_CATEGORY, + RTF_COMPANY, + RTF_MANAGER, + RTF_PROPNAME, + RTF_LINKVAL, + RTF_NOFCHARSWS, + RTF_HLINKBASE, + RTF_STATICVAL, + RTF_PROPTYPE, + + RTF_ANNOTATION, + RTF_ATNID, + + RTF_FOOTNOTE, + + RTF_XE, + RTF_BXE, + RTF_IXE, + RTF_RXE, + RTF_TXE, + RTF_YXE, + + RTF_TC, + RTF_TCF, + RTF_TCL, + + RTF_BKMKSTART, + RTF_BKMKEND, + + RTF_PICT, // Bitmaps + RTF_PICW, + RTF_PICH, + RTF_WBMBITSPIXEL, + RTF_WBMPLANES, + RTF_WBMWIDTHBYTES, + RTF_PICWGOAL, + RTF_PICHGOAL, + RTF_BIN, + RTF_PICSCALEX, + RTF_PICSCALEY, + RTF_PICSCALED, + RTF_WBITMAP, + RTF_WMETAFILE, + RTF_MACPICT, + RTF_OSMETAFILE, + RTF_DIBITMAP, + RTF_PICCROPT, + RTF_PICCROPB, + RTF_PICCROPL, + RTF_PICCROPR, + RTF_PICDATA, + RTF_PICBMP, + RTF_PICBPP, + RTF_PICPROP, + RTF_SHPPICT, + RTF_EMFBLIP, + RTF_PNGBLIP, + RTF_JPEGBLIP, + RTF_NONSHPPICT, + RTF_BLIPTAG, + RTF_BLIPUID, + RTF_BLIPUPI, + + RTF_FIELD, // Felder + RTF_FLDDIRTY, + RTF_FLDEDIT, + RTF_FLDLOCK, + RTF_FLDPRIV, + RTF_FLDINST, + RTF_FLDRSLT, + RTF_FLDTYPE, + RTF_TIME, + RTF_DATE, + RTF_WPEQN, + + RTF_NOLINE, + RTF_REVISED, + + RTF_BKMKCOLF, + RTF_BKMKCOLL, + RTF_PSOVER, + RTF_DOCTEMP, + RTF_DELETED, + + RTF_FCHARSET, + RTF_FALT, + RTF_FPRQ, + RTF_PANOSE, + RTF_FNAME, + RTF_FBIAS, + + RTF_ADDITIVE, + RTF_BKMKPUB, + RTF_CPG, + RTF_DATAFIELD, + + RTF_FBIDI, + RTF_FID, + RTF_FILE, + RTF_FILETBL, + RTF_FNETWORK, + RTF_FONTEMB, + RTF_FONTFILE, + RTF_FOSNUM, + RTF_FRELATIVE, + RTF_FTNIL, + RTF_FTTRUETYPE, + RTF_FVALIDDOS, + RTF_FVALIDHPFS, + RTF_FVALIDMAC, + RTF_FVALIDNTFS, + RTF_LINKSELF, + RTF_PUBAUTO, + RTF_REVTBL, + RTF_RTLMARK, + RTF_SEC, + RTF_TCN, + RTF_XEF, + + RTF_UD, // Unicode + RTF_UPR, + RTF_U, + RTF_UC, + RTF_ANSICPG, + + RTF_FFEXITMCR, // Form Fields + RTF_FFENTRYMCR, + RTF_FFDEFTEXT, + RTF_FFFORMAT, + RTF_FFSTATTEXT, + RTF_FORMFIELD, + RTF_FFNAME, + RTF_FFHELPTEXT, + RTF_FFL, + RTF_FFOWNHELP, + RTF_FFOWNSTAT, + RTF_FFMAXLEN, + RTF_FFHASLISTBOX, + RTF_FFHPS, + RTF_FFPROT, + RTF_FFTYPE, + RTF_FFTYPETXT, + RTF_FFSIZE, + RTF_FFRECALC, + RTF_FFRES, + RTF_FFDEFRES, + + RTF_HIGHLIGHT, + +/* */ + + RTF_DEFTAB = RTF_DOCFMT, + RTF_HYPHHOTZ, + RTF_LINESTART, + RTF_FRACWIDTH, + RTF_NEXTFILE, + RTF_TEMPLATE, + RTF_MAKEBACKUP, + RTF_DEFFORMAT, + RTF_DEFLANG, + RTF_FTNSEP, + RTF_FTNSEPC, + RTF_FTNCN, + RTF_ENDNOTES, + RTF_ENDDOC, + RTF_FTNTJ, + RTF_FTNBJ, + RTF_FTNSTART, + RTF_FTNRESTART, + RTF_PAPERW, + RTF_PAPERH, + RTF_MARGL, + RTF_MARGR, + RTF_MARGT, + RTF_MARGB, + RTF_FACINGP, + RTF_GUTTER, + RTF_MARGMIRROR, + RTF_LANDSCAPE, + RTF_PGNSTART, + RTF_WIDOWCTRL, + RTF_REVISIONS, + RTF_REVPROP, + RTF_REVBAR, + + RTF_AENDDOC, + RTF_AENDNOTES, + RTF_AFTNBJ, + RTF_AFTNCN, + RTF_AFTNNALC, + RTF_AFTNNAR, + RTF_AFTNNAUC, + RTF_AFTNNCHI, + RTF_AFTNNRLC, + RTF_AFTNNRUC, + RTF_AFTNRESTART, + RTF_AFTNRSTCONT, + RTF_AFTNSEP, + RTF_AFTNSEPC, + RTF_AFTNSTART, + RTF_AFTNTJ, + RTF_ALLPROT, + RTF_ANNOTPROT, + RTF_ATNAUTHOR, + RTF_ATNICN, + RTF_ATNREF, + RTF_ATNTIME, + RTF_ATRFEND, + RTF_ATRFSTART, + RTF_BRKFRM, + RTF_CVMME, + RTF_FET, + RTF_FLDALT, + RTF_FORMDISP, + RTF_FORMPROT, + RTF_FORMSHADE, + RTF_FTNALT, + RTF_FTNNALC, + RTF_FTNNAR, + RTF_FTNNAUC, + RTF_FTNNCHI, + RTF_FTNNRLC, + RTF_FTNNRUC, + RTF_FTNRSTCONT, + RTF_FTNRSTPG, + RTF_HYPHAUTO, + RTF_HYPHCAPS, + RTF_HYPHCONSEC, + RTF_LINKSTYLES, + RTF_LTRDOC, + RTF_NOCOLBAL, + RTF_NOEXTRASPRL, + RTF_NOTABIND, + RTF_OTBLRUL, + RTF_PRCOLBL, + RTF_PRINTDATA, + RTF_PSZ, + RTF_REVPROT, + RTF_RTLDOC, + RTF_SPRSSPBF, + RTF_SPRSTSP, + RTF_SWPBDR, + RTF_TRANSMF, + RTF_WRAPTRSP, + + RTF_PRIVATE, + RTF_NOULTRLSPC, + RTF_MSMCAP, + RTF_NOLEAD, + RTF_NOSPACEFORUL, + RTF_LYTEXCTTP, + RTF_LYTPRTMET, + RTF_DNTBLNSBDB, + RTF_FROMTEXT, + RTF_EXPSHRTN, + RTF_PGBRDRT, + RTF_SPRSBSP, + RTF_PGBRDRR, + RTF_PGBRDRSNAP, + RTF_BDBFHDR, + RTF_SUBFONTBYSIZE, + RTF_TRUNCATEFONTHEIGHT, + RTF_SPRSLNSP, + RTF_SPRSTSM, + RTF_PGBRDRL, + RTF_WPJST, + RTF_PGBRDRB, + RTF_WPSP, + RTF_NOXLATTOYEN, + RTF_OLDLINEWRAP, + RTF_PGBRDRFOOT, + RTF_PGBRDRHEAD, + RTF_DEFLANGFE, + RTF_DOCTYPE, + RTF_PGBRDROPT, + RTF_VIEWKIND, + RTF_VIEWSCALE, + RTF_WINDOWCAPTION, + RTF_BRDRART, + RTF_VIEWZK, + RTF_DOCVAR, + + RTF_DGMARGIN, + RTF_AFTNNCHOSUNG, + RTF_AFTNNCNUM, + RTF_AFTNNDBAR, + RTF_AFTNNDBNUM, + RTF_AFTNNDBNUMD, + RTF_AFTNNDBNUMK, + RTF_AFTNNDBNUMT, + RTF_AFTNNGANADA, + RTF_AFTNNGBNUM, + RTF_AFTNNGBNUMD, + RTF_AFTNNGBNUMK, + RTF_AFTNNGBNUML, + RTF_AFTNNZODIAC, + RTF_AFTNNZODIACD, + RTF_AFTNNZODIACL, + RTF_FTNNCHOSUNG, + RTF_FTNNCNUM, + RTF_FTNNDBAR, + RTF_FTNNDBNUM, + RTF_FTNNDBNUMD, + RTF_FTNNDBNUMK, + RTF_FTNNDBNUMT, + RTF_FTNNGANADA, + RTF_FTNNGBNUM, + RTF_FTNNGBNUMD, + RTF_FTNNGBNUMK, + RTF_FTNNGBNUML, + RTF_FTNNZODIAC, + RTF_FTNNZODIACD, + RTF_FTNNZODIACL, + + RTF_ADEFLANG, + RTF_ADEFF, + +/* */ + + RTF_SECTD = RTF_SECTFMT, + RTF_ENDNHERE, + RTF_BINFSXN, + RTF_BINSXN, + RTF_SBKNONE, + RTF_SBKCOL, + RTF_SBKPAGE, + RTF_SBKEVEN, + RTF_SBKODD, + RTF_COLS, + RTF_COLSX, + RTF_COLNO, + RTF_COLSR, + RTF_COLW, + RTF_LINEBETCOL, + RTF_LINEMOD, + RTF_LINEX, + RTF_LINESTARTS, + RTF_LINERESTART, + RTF_LINEPAGE, + RTF_LINECONT, + RTF_PGWSXN, + RTF_PGHSXN, + RTF_MARGLSXN, + RTF_MARGRSXN, + RTF_MARGTSXN, + RTF_MARGBSXN, + RTF_GUTTERSXN, + RTF_LNDSCPSXN, + RTF_FACPGSXN, + RTF_TITLEPG, + RTF_HEADERY, + RTF_FOOTERY, + RTF_PGNSTARTS, + RTF_PGNCONT, + RTF_PGNRESTART, + RTF_PGNX, + RTF_PGNY, + RTF_PGNDEC, + RTF_PGNUCRM, + RTF_PGNLCRM, + RTF_PGNUCLTR, + RTF_PGNLCLTR, + RTF_VERTALT, + RTF_VERTALB, + RTF_VERTALC, + RTF_VERTALJ, + + RTF_FOOTER, + RTF_FOOTERL, + RTF_FOOTERR, + RTF_FOOTERF, + RTF_HEADER, + RTF_HEADERL, + RTF_HEADERR, + RTF_HEADERF, + RTF_DS, + RTF_LTRSECT, + RTF_PGNHN, + RTF_PGNHNSC, + RTF_PGNHNSH, + RTF_PGNHNSM, + RTF_PGNHNSN, + RTF_PGNHNSP, + RTF_RTLSECT, + RTF_SECTUNLOCKED, + RTF_STEXTFLOW, + RTF_PGNCHOSUNG, + RTF_PGNCNUM, + RTF_PGNDBNUMK, + RTF_PGNDBNUMT, + RTF_PGNGANADA, + RTF_PGNGBNUM, + RTF_PGNGBNUMD, + RTF_PGNGBNUMK, + RTF_PGNGBNUML, + RTF_PGNZODIAC, + RTF_PGNZODIACD, + RTF_PGNZODIACL, + RTF_SECTDEFAULTCL, + RTF_SECTEXPAND, + RTF_SECTLINEGRID, + RTF_SECTSPECIFYCL, + RTF_SECTSPECIFYL, + + // Swg-Header/Footer-Tokens + RTF_HEADER_YB = (RTF_SECTFMT|RTF_SWGDEFS), + RTF_HEADER_XL, + RTF_HEADER_XR, + RTF_FOOTER_YT, + RTF_FOOTER_XL, + RTF_FOOTER_XR, + RTF_HEADER_YH, + RTF_FOOTER_YH, + RTF_BALANCED_COLUMN, + + +/* */ + + RTF_PARD = RTF_PARFMT, + RTF_S, + RTF_INTBL, + RTF_KEEP, + RTF_KEEPN, + RTF_LEVEL, + RTF_PAGEBB, + RTF_SBYS, + RTF_QL, + RTF_QR, + RTF_QJ, + RTF_QC, + RTF_FI, + RTF_LI, + RTF_LIN, + RTF_RI, + RTF_RIN, + RTF_SB, + RTF_SA, + RTF_SL, + RTF_HYPHPAR, + RTF_LTRPAR, + RTF_NOWIDCTLPAR, + RTF_RTLPAR, + RTF_SLMULT, + RTF_SUBDOCUMENT, + + RTF_WIDCTLPAR, + + RTF_LISTTEXT, + RTF_POSYIN, + RTF_PNRNOT, + RTF_BRDRDASHDOTSTR, + RTF_POSYOUT, + RTF_BRDRDASHD, + RTF_BRDRDASHDD, + RTF_BRDRENGRAVE, + RTF_BRDRTHTNLG, + RTF_BRDREMBOSS, + RTF_BRDRTNTHTNLG, + RTF_BRDRDASHSM, + RTF_BRDRTHTNMG, + RTF_OVERLAY, + RTF_BRDRTNTHSG, + RTF_BRDRTNTHMG, + RTF_BRDRTHTNSG, + RTF_BRDRTNTHLG, + RTF_BRDRTRIPLE, + RTF_BRDRTNTHTNSG, + RTF_BRDRTNTHTNMG, + RTF_BRDRWAVYDB, + RTF_BRDRWAVY, + RTF_ILVL, + RTF_DFRSTOP, + RTF_DFRXST, + RTF_PNRAUTH, + RTF_DFRSTART, + RTF_OUTLINELEVEL, + RTF_DFRAUTH, + RTF_DFRDATE, + RTF_PNRRGB, + RTF_PNRPNBR, + RTF_PNRSTART, + RTF_PNRXST, + RTF_PNRSTOP, + RTF_PNRDATE, + RTF_PNRNFC, + RTF_NOSNAPLINEGRID, + RTF_FAAUTO, + RTF_FAHANG, + RTF_FAVAR, + RTF_FACENTER, + RTF_FAROMAN, + RTF_FAFIXED, + RTF_ADJUSTRIGHT, + RTF_LS, + RTF_NOCWRAP, + RTF_NOOVERFLOW, + RTF_ASPALPHA, + + +/* */ + + RTF_TX = RTF_TABSTOPDEF, + RTF_TB, + RTF_TQL, + RTF_TQR, + RTF_TQC, + RTF_TQDEC, + RTF_TLDOT, + RTF_TLHYPH, + RTF_TLUL, + RTF_TLTH, + RTF_TLEQ, + + // Swg-TabStop-Tokens + RTF_TLSWG = (RTF_TABSTOPDEF|RTF_SWGDEFS), + +/* */ + + RTF_BRDRT = RTF_BRDRDEF, + RTF_BRDRB, + RTF_BRDRL, + RTF_BRDRR, + RTF_BRDRBTW, + RTF_BRDRBAR, + RTF_BOX, + RTF_BRSP, + RTF_BRDRW, + RTF_BRDRCF, + RTF_BRDRS, + RTF_BRDRTH, + RTF_BRDRSH, + RTF_BRDRDB, + RTF_BRDRDOT, + RTF_BRDRHAIR, + RTF_BRDRDASH, + RTF_BRDRFRAME, + + // Swg-Border-Tokens + RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS), + RTF_BRDLINE_COL, + RTF_BRDLINE_IN, + RTF_BRDLINE_OUT, + RTF_BRDLINE_DIST, + +/* */ + + RTF_PLAIN = RTF_CHRFMT, + RTF_B, + RTF_CAPS, + RTF_DN, + RTF_SUB, + RTF_NOSUPERSUB, + RTF_EXPND, + RTF_EXPNDTW, + RTF_KERNING, + RTF_F, + RTF_FS, + RTF_I, + RTF_OUTL, + RTF_SCAPS, + RTF_SHAD, + RTF_STRIKE, + RTF_UL, + RTF_ULD, + RTF_ULDB, + RTF_ULNONE, + RTF_ULW, + RTF_OL, + RTF_OLD, + RTF_OLDB, + RTF_OLNONE, + RTF_OLW, + RTF_UP, + RTF_SUPER, + RTF_V, + RTF_CF, + RTF_CB, + RTF_LANG, + RTF_CCHS, + RTF_CS, + RTF_LTRCH, + RTF_REVAUTH, + RTF_REVDTTM, + RTF_RTLCH, + + RTF_CHBGFDIAG, + RTF_CHBGDKVERT, + RTF_CHBGDKHORIZ, + RTF_CHBRDR, + RTF_CHBGVERT, + RTF_CHBGHORIZ, + RTF_CHBGDKFDIAG, + RTF_CHBGDCROSS, + RTF_CHBGCROSS, + RTF_CHBGBDIAG, + RTF_CHBGDKDCROSS, + RTF_CHBGDKCROSS, + RTF_CHBGDKBDIAG, + RTF_ULDASHD, + RTF_ULDASH, + RTF_ULDASHDD, + RTF_ULWAVE, + RTF_ULC, + RTF_ULTH, + RTF_OLDASHD, + RTF_OLDASH, + RTF_OLDASHDD, + RTF_OLWAVE, + RTF_OLC, + RTF_OLTH, + RTF_EMBO, + RTF_IMPR, + RTF_STRIKED, + RTF_CRDATE, + RTF_CRAUTH, + RTF_CHARSCALEX, + RTF_CHCBPAT, + RTF_CHCFPAT, + RTF_CHSHDNG, + RTF_REVAUTHDEL, + RTF_REVDTTMDEL, + RTF_CGRID, + RTF_GCW, + RTF_NOSECTEXPAND, + RTF_GRIDTBL, + RTF_G, + RTF_ANIMTEXT, + RTF_ULTHD, + RTF_ULTHDASH, + RTF_ULLDASH, + RTF_ULTHLDASH, + RTF_ULTHDASHD, + RTF_ULTHDASHDD, + RTF_ULHWAVE, + RTF_ULULDBWAVE, + RTF_OLTHD, + RTF_OLTHDASH, + RTF_OLLDASH, + RTF_OLTHLDASH, + RTF_OLTHDASHD, + RTF_OLTHDASHDD, + RTF_OLHWAVE, + RTF_OLOLDBWAVE, + + // association control words + RTF_AB, + RTF_ACAPS, + RTF_ACF, + RTF_ADN, + RTF_AEXPND, + RTF_AF, + RTF_AFS, + RTF_AI, + RTF_ALANG, + RTF_AOUTL, + RTF_ASCAPS, + RTF_ASHAD, + RTF_ASTRIKE, + RTF_AUL, + RTF_AULD, + RTF_AULDB, + RTF_AULNONE, + RTF_AULW, + RTF_AUP, + + RTF_LOCH, + RTF_HICH, + RTF_DBCH, + RTF_LANGFE, + RTF_ACCNONE, + RTF_ACCDOT, + RTF_ACCCOMMA, + RTF_TWOINONE, + RTF_HORZVERT, + + // Swg-Border-Tokens + RTF_SWG_ESCPROP = (RTF_CHRFMT|RTF_SWGDEFS), + RTF_HYPHEN, + RTF_HYPHLEAD, + RTF_HYPHTRAIL, + RTF_HYPHMAX, + + +/* */ + + RTF_CHDATE = RTF_SPECCHAR, + RTF_CHDATEL, + RTF_CHDATEA, + RTF_CHTIME, + RTF_CHPGN, + RTF_CHFTN, + RTF_CHATN, + RTF_CHFTNSEP, + RTF_CHFTNSEPC, + RTF_CELL, + RTF_ROW, + RTF_PAR, + RTF_SECT, + RTF_PAGE, + RTF_COLUM, + RTF_LINE, + RTF_TAB, + RTF_EMDASH, + RTF_ENDASH, + RTF_BULLET, + RTF_LQUOTE, + RTF_RQUOTE, + RTF_LDBLQUOTE, + RTF_RDBLQUOTE, + RTF_FORMULA, + RTF_NONBREAKINGSPACE, + RTF_OPTIONALHYPHEN, + RTF_NONBREAKINGHYPHEN, + RTF_SUBENTRYINDEX, + RTF_IGNOREFLAG, + RTF_HEX, + RTF_EMSPACE, + RTF_ENSPACE, + RTF_LTRMARK, + RTF_SECTNUM, + RTF_SOFTCOL, + RTF_SOFTLHEIGHT, + RTF_SOFTLINE, + RTF_SOFTPAGE, + RTF_ZWJ, + RTF_ZWNJ, + +/* */ + + RTF_ABSW = RTF_APOCTL, + RTF_ABSH, + RTF_NOWRAP, + RTF_DXFRTEXT, + RTF_DFRMTXTX, + RTF_DFRMTXTY, + RTF_DROPCAPLI, + RTF_DROPCAPT, + RTF_ABSNOOVRLP, + RTF_PHMRG, + RTF_PHPG, + RTF_PHCOL, + RTF_POSX, + RTF_POSNEGX, + RTF_POSXC, + RTF_POSXI, + RTF_POSXO, + RTF_POSXL, + RTF_POSXR, + RTF_PVMRG, + RTF_PVPG, + RTF_PVPARA, + RTF_POSY, + RTF_POSNEGY, + RTF_POSYT, + RTF_POSYIL, + RTF_POSYB, + RTF_POSYC, + RTF_ABSLOCK, + RTF_FRMTXLRTB, + RTF_FRMTXTBRL, + RTF_FRMTXBTLR, + RTF_FRMTXLRTBV, + RTF_FRMTXTBRLV, + + // Swg-Frame-Tokens + RTF_FLYPRINT = (RTF_APOCTL|RTF_SWGDEFS), + RTF_FLYOPAQUE, + RTF_FLYPRTCTD, + RTF_FLYMAINCNT, + RTF_FLYVERT, + RTF_FLYHORZ, + RTF_FLYOUTLEFT, + RTF_FLYOUTRIGHT, + RTF_FLYOUTUPPER, + RTF_FLYOUTLOWER, + RTF_FLYANCHOR, + RTF_FLY_CNTNT, + RTF_FLY_COLUMN, + RTF_FLY_PAGE, + RTF_FLY_INPARA, + + +/* */ + + RTF_SHADING = RTF_SHADINGDEF, + RTF_CFPAT, + RTF_CBPAT, + RTF_BGHORIZ, + RTF_BGVERT, + RTF_BGFDIAG, + RTF_BGBDIAG, + RTF_BGCROSS, + RTF_BGDCROSS, + RTF_BGDKHORIZ, + RTF_BGDKVERT, + RTF_BGDKFDIAG, + RTF_BGDKBDIAG, + RTF_BGDKCROSS, + RTF_BGDKDCROSS, + +/* */ + + RTF_TROWD = RTF_TABLEDEF, + RTF_TRGAPH, + RTF_TRLEFT, + RTF_TRRH, + + RTF_TRQL, + RTF_TRQR, + RTF_TRQC, + + RTF_CLMGF, + RTF_CLMRG, + RTF_CELLX, + RTF_LTRROW, + RTF_RTLROW, + RTF_TRBRDRB, + RTF_TRBRDRH, + RTF_TRBRDRL, + RTF_TRBRDRR, + RTF_TRBRDRT, + RTF_TRBRDRV, + RTF_TRHDR, + RTF_TRKEEP, + RTF_TRPADDB, + RTF_TRPADDL, + RTF_TRPADDR, + RTF_TRPADDT, + RTF_TRPADDFB, + RTF_TRPADDFL, + RTF_TRPADDFR, + RTF_TRPADDFT, + RTF_TCELLD, + RTF_CLTXTBRL, + RTF_CLTXLRTB, + RTF_CLVERTALB, + RTF_CLVERTALT, + RTF_CLVERTALC, + RTF_CLVMGF, + RTF_CLVMRG, + RTF_CLTXTBRLV, + RTF_CLTXBTLR, + RTF_CLTXLRTBV, + RTF_CLPADL, + RTF_CLPADT, + RTF_CLPADB, + RTF_CLPADR, + RTF_CLPADFL, + RTF_CLPADFT, + RTF_CLPADFB, + RTF_CLPADFR, + + + RTF_CLBRDRT = (RTF_BRDRDEF|RTF_TABLEDEF), + RTF_CLBRDRL, + RTF_CLBRDRB, + RTF_CLBRDRR, + + RTF_CLCFPAT = (RTF_SHADINGDEF|RTF_TABLEDEF), + RTF_CLCBPAT, + RTF_CLSHDNG, + RTF_CLBGHORIZ, + RTF_CLBGVERT, + RTF_CLBGFDIAG, + RTF_CLBGBDIAG, + RTF_CLBGCROSS, + RTF_CLBGDCROSS, + RTF_CLBGDKHOR, + RTF_CLBGDKVERT, + RTF_CLBGDKFDIAG, + RTF_CLBGDKBDIAG, + RTF_CLBGDKCROSS, + RTF_CLBGDKDCROSS, + +/* */ + + +/* */ + + RTF_DO = RTF_DRAWOBJECTS, + RTF_DOBXCOLUMN, + RTF_DOBXMARGIN, + RTF_DOBXPAGE, + RTF_DOBYMARGIN, + RTF_DOBYPAGE, + RTF_DOBYPARA, + RTF_DODHGT, + RTF_DOLOCK, + RTF_DPAENDHOL, + RTF_DPAENDL, + RTF_DPAENDSOL, + RTF_DPAENDW, + RTF_DPARC, + RTF_DPARCFLIPX, + RTF_DPARCFLIPY, + RTF_DPASTARTHOL, + RTF_DPASTARTL, + RTF_DPASTARTSOL, + RTF_DPASTARTW, + RTF_DPCALLOUT, + RTF_DPCOA, + RTF_DPCOACCENT, + RTF_DPCOBESTFIT, + RTF_DPCOBORDER, + RTF_DPCODABS, + RTF_DPCODBOTTOM, + RTF_DPCODCENTER, + RTF_DPCODTOP, + RTF_DPCOLENGTH, + RTF_DPCOMINUSX, + RTF_DPCOMINUSY, + RTF_DPCOOFFSET, + RTF_DPCOSMARTA, + RTF_DPCOTDOUBLE, + RTF_DPCOTRIGHT, + RTF_DPCOTSINGLE, + RTF_DPCOTTRIPLE, + RTF_DPCOUNT, + RTF_DPELLIPSE, + RTF_DPENDGROUP, + RTF_DPFILLBGCB, + RTF_DPFILLBGCG, + RTF_DPFILLBGCR, + RTF_DPFILLBGGRAY, + RTF_DPFILLBGPAL, + RTF_DPFILLFGCB, + RTF_DPFILLFGCG, + RTF_DPFILLFGCR, + RTF_DPFILLFGGRAY, + RTF_DPFILLFGPAL, + RTF_DPFILLPAT, + RTF_DPGROUP, + RTF_DPLINE, + RTF_DPLINECOB, + RTF_DPLINECOG, + RTF_DPLINECOR, + RTF_DPLINEDADO, + RTF_DPLINEDADODO, + RTF_DPLINEDASH, + RTF_DPLINEDOT, + RTF_DPLINEGRAY, + RTF_DPLINEHOLLOW, + RTF_DPLINEPAL, + RTF_DPLINESOLID, + RTF_DPLINEW, + RTF_DPPOLYCOUNT, + RTF_DPPOLYGON, + RTF_DPPOLYLINE, + RTF_DPPTX, + RTF_DPPTY, + RTF_DPRECT, + RTF_DPROUNDR, + RTF_DPSHADOW, + RTF_DPSHADX, + RTF_DPSHADY, + RTF_DPTXBX, + RTF_DPTXBXMAR, + RTF_DPTXBXTEXT, + RTF_DPX, + RTF_DPXSIZE, + RTF_DPY, + RTF_DPYSIZE, + + RTF_DPCODESCENT, + RTF_BACKGROUND, + RTF_SHPBYPAGE, + RTF_SHPBYPARA, + RTF_SHPBYMARGIN, + RTF_SHPBXCOLUMN, + RTF_SHPBXMARGIN, + RTF_SHPBXPAGE, + RTF_SHPLOCKANCHOR, + RTF_SHPWR, + RTF_HLLOC, + RTF_HLSRC, + RTF_SHPWRK, + RTF_SHPTOP, + RTF_SHPRSLT, + RTF_HLFR, + RTF_SHPTXT, + RTF_SHPFHDR, + RTF_SHPGRP, + RTF_SHPRIGHT, + RTF_SHPFBLWTXT, + RTF_SHPZ, + RTF_SHPBOTTOM, + RTF_SHPLEFT, + RTF_SHPLID, + +/* */ + + RTF_OBJALIAS = RTF_OBJECTS, + RTF_OBJALIGN, + RTF_OBJAUTLINK, + RTF_OBJCLASS, + RTF_OBJCROPB, + RTF_OBJCROPL, + RTF_OBJCROPR, + RTF_OBJCROPT, + RTF_OBJDATA, + RTF_OBJECT, + RTF_OBJEMB, + RTF_OBJH, + RTF_OBJICEMB, + RTF_OBJLINK, + RTF_OBJLOCK, + RTF_OBJNAME, + RTF_OBJPUB, + RTF_OBJSCALEX, + RTF_OBJSCALEY, + RTF_OBJSECT, + RTF_OBJSETSIZE, + RTF_OBJSUB, + RTF_OBJTIME, + RTF_OBJTRANSY, + RTF_OBJUPDATE, + RTF_OBJW, + RTF_RESULT, + RTF_RSLTBMP, + RTF_RSLTMERGE, + RTF_RSLTPICT, + RTF_RSLTRTF, + RTF_RSLTTXT, + RTF_OBJOCX, + RTF_OBJHTML, + RTF_OBJATTPH, + +/* */ + + RTF_PN = RTF_NUMBULLETS, + RTF_PNACROSS, + RTF_PNB, + RTF_PNCAPS, + RTF_PNCARD, + RTF_PNCF, + RTF_PNDEC, + RTF_PNF, + RTF_PNFS, + RTF_PNHANG, + RTF_PNI, + RTF_PNINDENT, + RTF_PNLCLTR, + RTF_PNLCRM, + RTF_PNLVL, + RTF_PNLVLBLT, + RTF_PNLVLBODY, + RTF_PNLVLCONT, + RTF_PNNUMONCE, + RTF_PNORD, + RTF_PNORDT, + RTF_PNPREV, + RTF_PNQC, + RTF_PNQL, + RTF_PNQR, + RTF_PNRESTART, + RTF_PNSCAPS, + RTF_PNSECLVL, + RTF_PNSP, + RTF_PNSTART, + RTF_PNSTRIKE, + RTF_PNTEXT, + RTF_PNTXTA, + RTF_PNTXTB, + RTF_PNUCLTR, + RTF_PNUCRM, + RTF_PNUL, + RTF_PNULD, + RTF_PNULDB, + RTF_PNULNONE, + RTF_PNULW, + RTF_LIST, + RTF_LISTLEVEL, + RTF_LISTOVERRIDE, + RTF_LISTOVERRIDETABLE, + RTF_LISTTABLE, + RTF_LISTNAME, + RTF_LEVELNUMBERS, + RTF_LEVELNORESTART, + RTF_LEVELNFC, + RTF_LEVELOLD, + RTF_LISTOVERRIDECOUNT, + RTF_LISTTEMPLATEID, + RTF_LEVELINDENT, + RTF_LEVELFOLLOW, + RTF_LEVELLEGAL, + RTF_LEVELJC, + RTF_LISTOVERRIDESTART, + RTF_LISTID, + RTF_LISTRESTARTHDN, + RTF_LEVELTEXT, + RTF_LISTOVERRIDEFORMAT, + RTF_LEVELPREVSPACE, + RTF_LEVELPREV, + RTF_LEVELSPACE, + RTF_LISTSIMPLE, + RTF_LEVELSTARTAT, + RTF_PNAIUEO, + RTF_PNAIUEOD, + RTF_PNCHOSUNG, + RTF_PNDBNUMD, + RTF_PNDBNUMK, + RTF_PNDBNUML, + RTF_PNDBNUMT, + RTF_PNGANADA, + RTF_PNGBNUM, + RTF_PNGBNUMD, + RTF_PNGBNUMK, + RTF_PNGBNUML, + RTF_PNZODIAC, + RTF_PNZODIACD, + RTF_PNZODIACL, + RTF_LFOLEVEL, + +/* */ + + RTF_GRF_ALIGNV= RTF_SWGDEFS, + RTF_GRF_ALIGNH, + RTF_GRF_MIRROR, + RTF_SWG_PRTDATA, + RTF_BKMK_KEY, + RTF_SHADOW, + RTF_SHDW_DIST, + RTF_SHDW_STYLE, + RTF_SHDW_COL, + RTF_SHDW_FCOL, + RTF_PGDSCTBL, + RTF_PGDSC, + RTF_PGDSCUSE, + RTF_PGDSCNXT, + RTF_PGDSCNO, + RTF_PGBRK, + RTF_SOUTLVL, + +// shapes + RTF_SHP, RTF_SN, RTF_SV +/* + RTF_SHPLEFT, + RTF_SHPTOP, + RTF_SHPBOTTOM, + RTF_SHPRIGHT +*/ + +}; + +#endif // _RTFTOKEN_H + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx new file mode 100644 index 000000000000..805394999abe --- /dev/null +++ b/svtools/inc/svtools/ruler.hxx @@ -0,0 +1,877 @@ +/************************************************************************* + * + * 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: ruler.hxx,v $ + * $Revision: 1.13 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RULER_HXX +#define _RULER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#ifndef _VIRDEV_HXX +#include +#endif +#include + +class MouseEvent; +class TrackingEvent; +class DataChangedEvent; + +/************************************************************************* + +Beschreibung +============ + +class Ruler + +Diese Klasse dient zur Anzeige eines Lineals. Dabei kann diese Klasse nicht +nur als Anzeige-Control verwendet werden, sondern auch als aktives Control +zum Setzen/Verschieben von Tabulatoren und Raendern. + +-------------------------------------------------------------------------- + +WinBits + +WB_HORZ Lineal wird horizontal dargestellt +WB_VERT Lineal wird vertikal dargestellt +WB_3DLOOK 3D-Darstellung +WB_BORDER Border am unteren/rechten Rand +WB_EXTRAFIELD Feld in der linken/oberen Ecke zur Anzeige und + Auswahl von Tabs, Null-Punkt, ... +WB_RIGHT_ALIGNED Marks the vertical ruler as right aligned + +-------------------------------------------------------------------------- + +Beim Lineal werden alle Werte als Pixel-Werte eingestellt. Dadurch werden +doppelte Umrechnungen und Rundungsfehler vermieden und die Raender werden +im Lineal auch an der Position angezeigt, den Sie auch im Dokument haben. +Dadurch kann die Applikation zum Beispiel bei Tabellendarstellung auch +eigene Rundungen vornehmen und die Positionen im Lineal passen trotzdem noch +zu denen im Dokument. Damit aber das Lineal weiss, wie das Dokument auf dem +Bildschirm dargestellt wird, muessen noch ein paar zusaetzliche Werte +eingestellt werden. + +Mit SetWinPos() wird der Offset des Edit-Fenster zum Lineal eingestellt. +Dabei kann auch die Breite des Fensters eingestellt werden. Wenn bei den +Werten 0 uebergeben wird, wird die Position/Breite vom Fenster automatisch +so breit gesetzt, wie das Lineal breit ist. + +Mit SetPagePos() wird der Offset der Seite zum Edit-Fenster eingestellt und +die Breite der Seite eingestellt. Wenn bei den Werten 0 uebergeben wird, +wird die Position/Breite automatisch so gesetzt, als ob die Seite das ganze +Editfenster ausfuellen wuerde. + +Mit SetBorderPos() kann der Offset eingestellt werden, ab dem der +Border ausgegeben wird. Die Position bezieht sich auf die linke bzw. obere +Fensterkante. Dies wird gebraucht, wenn ein horizontales und vertikales +Lineal gleichzeitig sichtbar sind. Beispiel: + aHRuler.SetBorderPos( aVRuler.GetSizePixel().Width()-1 ); + +Mit SetNullOffset() wird der Null-Punkt bezogen auf die Seite gesetzt. + +Alle anderen Werte (Raender, Einzug, Tabs, ...) beziehen sich auf den 0 Punkt, +der mit SetNullOffset() eingestellt wird. + +Die Werte werden zum Beispiel folgendermassen berechnet: + +- WinPos (wenn beide Fenster den gleichen Parent haben) + + Point aHRulerPos = aHRuler.GetPosPixel(); + Point aEditWinPos = aEditWin.GetPosPixel(); + aHRuler.SetWinPos( aEditWinPos().X() - aHRulerPos.X() ); + +- PagePos + + Point aPagePos = aEditWin.LogicToPixel( aEditWin.GetPagePos() ); + aHRuler.SetPagePos( aPagePos().X() ); + +- Alle anderen Werte + + Die logischen Werte zusammenaddieren, als Position umrechnen und + die vorher gemerkten Pixel-Positionen (von PagePos und NullOffset) + entsprechend abziehen. + +-------------------------------------------------------------------------- + +Mit SetUnit() und SetZoom() wird eingestellt, in welcher Einheit das Lineal +die Werte anzeigt. Folgende Einheiten werden akzeptiert: + + FUNIT_MM + FUNIT_CM (Default) + FUNIT_M + FUNIT_KM + FUNIT_INCH + FUNIT_FOOT + FUNIT_MILE + FUNIT_POINT + FUNIT_PICA + +-------------------------------------------------------------------------- + +Mit SetMargin1() kann der linke/obere Rand und mit SetMargin2() kann +der rechte/untere Rand gesetzt werden. Falls diese Methoden ohne Parameter +aufgerufen werden, werden keine Raender angezeigt. Wenn SetMargin1() bzw. +SetMargin2() mit Parametern aufgerufen werden, kann bei diesen +folgendes angegeben werden: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_MARGIN_SIZEABLE + Rand kann in der Groesse veraendert werden. + + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + + +Mit SetBorders() kann ein Array von Raendern gesetzt werden. Dabei muss +ein Array vom Typ RulerBorder uebergeben werden, wobei folgende Werte +initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + long nWidth - Breite des Spaltenabstands in Pixel (kann zum + Beispiel fuer Tabellenspalten auch 0 sein) + USHORT nStyle - Bit-Style: + RULER_BORDER_SIZEABLE + Spaltenabstand kann in der Groesse veraendert + werden. Dieses Flag sollte nur gesetzt werden, + wenn ein Abstand in der Groesse geaendert wird + und nicht die Groesse einer Zelle. + RULER_BORDER_MOVEABLE + Spaltenabstand/Begrenzung kann verschoben + werden. Wenn Tabellenbegrenzungen verschoben + werden, sollte dieses Flag gesetzt werden und + nicht Sizeable. Denn Sizeable gibt an, das + ein Abstand vergroessert werden kann und nicht + eine einzelne Zelle in der Groesse geaendert + werden kann. + RULER_BORDER_VARIABLE + Nicht alle Spaltenabstande sind gleich + RULER_BORDER_TABLE + Tabellenrahmen. Wenn dieser Style gesetzt + wird, muss die Spaltenbreite 0 sein. + RULER_BORDER_SNAP + Hilfslinie / Fanglinie. Wenn dieser Style + gesetzt wird, muss die Spaltenbreite 0 sein. + RULER_BORDER_MARGIN + Margin. Wenn dieser Style gesetzt wird, + muss die Spaltenbreite 0 sein. + + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetIndents() kann ein Array von Indents gesetzt werden. Diese Methode darf +nur angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als +Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende +Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_INDENT_TOP (Erstzeileneinzug) + RULER_INDENT_BOTTOM (Linker/Rechter Einzug) + RULER_INDENT_BORDER (Verical line that shows the border distance) + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_DONTKNOW (fuer alte Position oder + fuer Uneindeutigkeit) + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetTabs() kann ein Array von Tabs gesetzt werden. Diese Methode darf nur +angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als +Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende +Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_TAB_DEFAULT (kann nicht selektiert werden) + RULER_TAB_LEFT + RULER_TAB_CENTER + RULER_TAB_RIGHT + RULER_TAB_DECIMAL + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_DONTKNOW (fuer alte Position oder + fuer Uneindeutigkeit) + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetLines() koennen Positionslinien im Lineal angezeigt werden. Dabei +muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte +initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + +Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn +Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen +mehr angezeigt. Deshalb sollten die Bemassungspfeile immer ueber die ganze +Linealbreite gesetzt werden. Dabei muss ein Array vom Typ RulerArrow +uebergeben werden, wobei folgende Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + long nWidth - Breite des Pfeils + long nLogWidth - Breite des Pfeils in logischer Einheit + USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + +Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen +Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die +Einheiten MAP_TWIP und MAP_100TH_MM (default) akzeptiert. + +-------------------------------------------------------------------------- + +Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal +geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu +muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden. +Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben +von FALSE das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position +abgefragt werden und die Werte muessen an die neue Position verschoben werden. +Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich +im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst +danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber +entsprechende Set..Hdl()-Methoden gesetzt werden. + + - StartDrag() + Wird gerufen, wenn das Draggen gestartet wird. Wenn FALSE + zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei TRUE + wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert + wird, wird FALSE zurueckgegeben. + + - EndDrag() + Wird gerufen, wenn das Draggen beendet wird. + + - Drag() + Wird gerufen, wenn gedragt wird. + + - Click() + Dieser Handler wird gerufen, wenn kein Element angeklickt wurde. + Die Position kann mit GetClickPos() abgefragt werden. Dadurch + kann man zum Beispiel Tabs in das Lineal setzen. Nach Aufruf des + Click-Handlers wird gegebenenfalls das Drag sofort ausgeloest. Dadurch + ist es moeglich, einen neuen Tab im Click-Handler zu setzen und + danach gleich zu verschieben. + + - DoubleClick() + Dieser Handler wird gerufen, wenn ein DoubleClick ausserhalb des + Extrafeldes gemacht wurde. Was angeklickt wurde, kann mit + GetClickType(), GetClickAryPos() und GetClickPos() abgefragt werden. + Somit kann man zum Beispiel den Tab-Dialog anzeigen, wenn ein + Tab mit einem DoubleClick betaetigt wurde. + +Im Drag-Handler kann man abfragen, was und wohin gedragt wurde. Dazu gibt +es folgende Abfrage-Methoden. + + - GetDragType() + Liefert zurueck, was gedragt wird: + RULER_TYPE_MARGIN1 + RULER_TYPE_MARGIN2 + RULER_TYPE_BORDER + RULER_TYPE_INDENT + RULER_TYPE_TAB + + - GetDragPos() + Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset + zurueck, wohin der Anwender die Maus bewegt hat. + + - GetDragAryPos() + Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein + Tab gedragt wird. Achtung: Es wird die Array-Position waehrend des + gesammten Drag-Vorgangs von dem Item im Array was vor dem Drag gesetzt + war zurueckgeben. Dadurch ist es zum Beispiel auch moeglich, einen + Tab nicht mehr anzuzeigen, wenn die Maus nach unten/rechts aus dem + Lineal gezogen wird. + + - GetDragSize() + Wenn Borders gedragt werden, kann hierueber abgefragt werden, ob + die Groesse bzw. welche Seite oder die Position geaendert werden soll. + RULER_DRAGSIZE_MOVE oder 0 - Move + RULER_DRAGSIZE_1 - Linke/obere Kante + RULER_DRAGSIZE_2 - Rechte/untere Kante + + - IsDragDelete() + Mit dieser Methode kann abgefragt werden, ob beim Draggen die + Maus unten/rechts aus dem Fenster gezogen wurde. Damit kann + zum Beispiel festgestellt werden, ob der Benutzer einen Tab + loeschen will. + + - IsDragCanceled() + Mit dieser Methode kann im EndDrag-Handler abgefragt werden, + ob die Aktion abgebrochen wurde, indem der Anwender die + Maus oben/links vom Fenster losgelassen hat oder ESC gedrueckt + hat. In diesem Fall werden die Werte nicht uebernommen. Wird + waehrend des Draggings die Maus oben/links aus dem Fenster + gezogen, werden automatisch die alten Werte dargestellt, ohne das + der Drag-Handler gerufen wird. + Falls der Benutzer jedoch den Wert auf die alte Position + zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls + dies vermieden werden soll, muss sich die Applikation im StartDrag- + Handler den alten Wert merken und im EndDrag-Handler den Wert + vergleichen. + + - GetDragScroll() + Mit dieser Methode kann abgefragt werden, ob gescrollt werden + soll. Es wird einer der folgenden Werte zurueckgegeben: + RULER_SCROLL_NO - Drag-Position befindet sich + an keinem Rand und somit + muss nicht gescrollt werden. + RULER_SCROLL_1 - Drag-Position befindet sich + am linken/oberen Rand und + somit sollte das Programm evt. + ein Srcoll ausloesen. + RULER_SCROLL_2 - Drag-Position befindet sich + am rechten/unteren Rand und + somit sollte das Programm evt. + ein Srcoll ausloesen. + + - GetDragModifier() + Liefert die Modifier-Tasten zurueck, die beim Starten des Drag- + Vorgangs gedrueckt waren. Siehe MouseEvent. + + - GetClickPos() + Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset + zurueck, wo der Anwender die Maus gedrueckt hat. + + - GetClickType() + Liefert zurueck, was per DoubleClick betaetigt wird: + RULER_TYPE_DONTKNOW (kein Element im Linealbereich) + RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) + RULER_TYPE_MARGIN1 (nur Margin1-Kante) + RULER_TYPE_MARGIN2 (nur Margin2-Kante) + RULER_TYPE_BORDER (Border: GetClickAryPos()) + RULER_TYPE_INDENT (Einzug: GetClickAryPos()) + RULER_TYPE_TAB (Tab: GetClickAryPos()) + + - GetClickAryPos() + Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein + Tab per DoubleClick betaetigt wird. + + - GetType() + Mit dieser Methode kann man einen HitTest durchfuehren, um + gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers + auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als + Paramter ueber gibt man die Fensterposition und gegebenenfalls + einen Pointer auf einen USHORT, um die Array-Position eines + Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende + Werte zurueckgegeben: + RULER_TYPE_DONTKNOW (kein Element im Linealbereich) + RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) + RULER_TYPE_MARGIN1 (nur Margin1-Kante) + RULER_TYPE_MARGIN2 (nur Margin2-Kante) + RULER_TYPE_BORDER (Border: GetClickAryPos()) + RULER_TYPE_INDENT (Einzug: GetClickAryPos()) + RULER_TYPE_TAB (Tab: GetClickAryPos()) + +Wenn der Drag-Vorgang abgebrochen werden soll, kann der Drag-Vorgang +mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die +Drag-Steuerung: + + - IsDrag() + Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. + + - CancelDrag() + Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei + werden die alten Werte wieder hergestellt und der Drag und der + EndDrag-Handler gerufen. + +Um vom Dokument ein Drag auszuloesen, gibt es folgende Methoden: + + - StartDocDrag() + Dieser Methode werden der MouseEvent vom Dokumentfenster und + was gedragt werden soll uebergeben. Wenn als DragType + RULER_TYPE_DONTKNOW uebergeben wird, bestimmt das Lineal, was + verschoben werden soll. Bei den anderen, wird der Drag nur dann + gestartet, wenn auch an der uebergebenen Position ein entsprechendes + Element gefunden wurde. Dies ist zun Beispiel dann notwendig, wenn + zum Beispiel Einzuege und Spalten an der gleichen X-Position liegen. + Der Rueckgabewert gibt an, ob der Drag ausgeloest wurde. Wenn ein + Drag ausgeloest wird, uebernimmt das Lineal die normale Drag-Steuerung + und verhaelt sich dann so, wie als wenn direkt in das Lineal geklickt + wurde. So captured das Lineal die Mouse und uebernimmt auch die + Steuerung des Cancel (ueber Tastatur, oder wenn die Mouse ueber + oder links vom Lineal ruasgeschoben wird). Auch alle Handler werden + gerufen (inkl. des StartDrag-Handlers). Wenn ein MouseEvent mit + Click-Count 2 uebergeben wird auch der DoubleClick-Handler + entsprechend gerufen. + + - GetDocType() + Dieser Methode wird die Position vom Dokumentfenster uebergeben und + testet, was sich unter der Position befindet. Dabei kann wie bei + StartDocDrag() der entsprechende Test auf ein bestimmtes Element + eingeschraenkt werden. Im Gegensatz zu GetType() liefert diese + Methode immer DontKnow zurueck, falls kein Element getroffen wurde. + Falls man den HitTest selber durchfuehren moechte, kann man + folgende Defines fuer die Toleranz benutzen (Werte gelten fuer + eine Richtung): + RULER_MOUSE_TABLEWIDTH - fuer Tabellenspalten + RULER_MOUSE_MARGINWIDTH - fuer Margins + +-------------------------------------------------------------------------- + +Fuer das Extra-Feld kann der Inhalt bestimmt werden und es gibt Handler, +womit man bestimmte Aktionen abfangen kann. + + - ExtraDown() + Dieser Handler wird gerufen, wenn im Extra-Feld die Maus + gedrueckt wird. + + - SetExtraType() + Mit dieser Methode kann festgelegt werden, was im ExtraFeld + dargestellt werden soll. + - ExtraType Was im Extrafeld dargestellt werden soll + RULER_EXTRA_DONTKNOW (Nichts) + RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) + RULER_EXTRA_TAB (Tab) + - USHORT nStyle Bitfeld als Style: + RULER_STYLE_HIGHLIGHT (selektiert) + RULER_TAB_... (ein Tab-Style) + + - GetExtraClick() + Liefert die Anzahl der Mausclicks zurueck. Dadurch ist es zum + Beispiel auch moeglich, auch durch einen DoubleClick im Extrafeld + eine Aktion auszuloesen. + + - GetExtraModifier() + Liefert die Modifier-Tasten zurueck, die beim Klicken in das Extra- + Feld gedrueckt waren. Siehe MouseEvent. + +-------------------------------------------------------------------------- + +Weitere Hilfsfunktionen: + +- static Ruler::DrawTab() + Mit dieser Methode kann ein Tab auf einem OutputDevice ausgegeben + werden. Dadurch ist es moeglich, auch in Dialogen die Tabs so + anzuzeigen, wie Sie im Lineal gemalt werden. + + Diese Methode gibt den Tab zentriert an der uebergebenen Position + aus. Die Groesse der Tabs kann ueber die Defines RULER_TAB_WIDTH und + RULER_TAB_HEIGHT bestimmt werden. + +-------------------------------------------------------------------------- + +Tips zur Benutzung des Lineals: + +- Bei dem Lineal muss weder im Drag-Modus noch sonst das Setzen der Werte + in SetUpdateMode() geklammert werden. Denn das Lineal sorgt von sich + aus dafuer, das wenn mehrere Werte gesetzt werden, diese automatisch + zusammengefast werden und flackerfrei ausgegeben werden. + +- Initial sollten beim Lineal zuerst die Groessen, Positionen und Werte + gesetzt werden, bevor es angezeigt wird. Dies ist deshalb wichtig, da + ansonsten viele Werte unnoetig berechnet werden. + +- Wenn das Dokumentfenster, in dem sich das Lineal befindet aktiv bzw. + deaktiv wird, sollten die Methoden Activate() und Deactivate() vom + Lineal gerufen werden. Denn je nach Einstellungen und System wird die + Anzeige entsprechend umgeschaltet. + +- Zum Beispiel sollte beim Drag von Tabs und Einzuegen nach Moeglichkeit die + alten Positionen noch mit angezeigt werden. Dazu sollte zusaetzlich beim + Setzen der Tabs und Einzuege als erstes im Array die alten Positionen + eingetragen werden und mit dem Style RULER_STYLE_DONTKNOW verknuepft + werden. Danach sollte im Array die restlichen Werte eingetragen werden. + +- Bei mehreren markierten Absaetzen und Tabellen-Zellen, sollten die Tabs + und Einzuege in grau von der ersten Zelle, bzw. vom ersten Absatz + angezeigt werden. Dies kann man auch ueber den Style RULER_STYLE_DONTKNOW + erreichen. + +- Die Bemassungspfeile sollten immer dann angezeigt, wenn beim Drag die + Alt-Taste (WW-Like) gedrueckt wird. Vielleicht sollte diese Einstellung + auch immer vornehmbar sein und vielleicht beim Drag immer die + Bemassungspfeile dargestellt werden. Bei allen Einstellung sollten die + Werte immer auf ein vielfaches eines Wertes gerundet werden, da die + Bildschirmausloesung sehr ungenau ist. + +- DoppelKlicks sollten folgendermassen behandelt werden (GetClickType()): + - RULER_TYPE_DONTKNOW + RULER_TYPE_MARGIN1 + RULER_TYPE_MARGIN2 + Wenn die Bedingunden GetClickPos() <= GetMargin1() oder + GetClickPos() >= GetMargin2() oder der Type gleich + RULER_TYPE_MARGIN1 oder RULER_TYPE_MARGIN2 ist, sollte + ein SeitenDialog angezeigt werden, wo der Focus auf dem + entsprechenden Rand steht + - RULER_TYPE_BORDER + Es sollte ein Spalten- oder Tabellen-Dialog angezeigt werden, + wo der Focus auf der entsprechenden Spalte steht, die mit + GetClickAryPos() abgefragt werden kann. + - RULER_TYPE_INDENT + Es sollte der Dialog angezeigt werden, wo die Einzuege eingestellt + werden koennen. Dabei sollte der Focus auf dem Einzug stehen, der + mit GetClickAryPos() ermittelt werden kann. + - RULER_TYPE_TAB + Es sollte ein TabDialog angezeigt werden, wo der Tab selektiert + sein sollte, der ueber GetClickAryPos() abgefragt werden kann. + +*************************************************************************/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_EXTRAFIELD ((WinBits)0x00004000) +#define WB_RIGHT_ALIGNED ((WinBits)0x00008000) +#define WB_STDRULER WB_HORZ + +// --------------- +// - Ruler-Types - +// --------------- + +struct ImplRulerHitTest; + +// -------------- +// - Ruler-Type - +// -------------- + +enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, + RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2, + RULER_TYPE_BORDER, RULER_TYPE_INDENT, RULER_TYPE_TAB }; + +enum RulerExtra { RULER_EXTRA_DONTKNOW, + RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; + +#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) +#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) +#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) + +#define RULER_DRAGSIZE_MOVE 0 +#define RULER_DRAGSIZE_1 1 +#define RULER_DRAGSIZE_2 2 + +#define RULER_MOUSE_BORDERMOVE 5 +#define RULER_MOUSE_BORDERWIDTH 5 +#define RULER_MOUSE_TABLEWIDTH 1 +#define RULER_MOUSE_MARGINWIDTH 3 + +#define RULER_SCROLL_NO 0 +#define RULER_SCROLL_1 1 +#define RULER_SCROLL_2 2 + +// --------------- +// - RulerMargin - +// --------------- + +#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) + +// --------------- +// - RulerBorder - +// --------------- + +#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) +#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) +#define RULER_BORDER_VARIABLE ((USHORT)0x0004) +#define RULER_BORDER_TABLE ((USHORT)0x0008) +#define RULER_BORDER_SNAP ((USHORT)0x0010) +#define RULER_BORDER_MARGIN ((USHORT)0x0020) + +struct RulerBorder +{ + long nPos; + long nWidth; + USHORT nStyle; + //minimum/maximum position, supported for table borders/rows + long nMinPos; + long nMaxPos; +}; + +// --------------- +// - RulerIndent - +// --------------- + +#define RULER_INDENT_TOP ((USHORT)0x0000) +#define RULER_INDENT_BOTTOM ((USHORT)0x0001) +#define RULER_INDENT_BORDER ((USHORT)0x0002) +#define RULER_INDENT_STYLE ((USHORT)0x000F) + +struct RulerIndent +{ + long nPos; + USHORT nStyle; +}; + +// ------------ +// - RulerTab - +// ------------ + +#define RULER_TAB_LEFT ((USHORT)0x0000) +#define RULER_TAB_RIGHT ((USHORT)0x0001) +#define RULER_TAB_DECIMAL ((USHORT)0x0002) +#define RULER_TAB_CENTER ((USHORT)0x0003) +#define RULER_TAB_DEFAULT ((USHORT)0x0004) +#define RULER_TAB_STYLE ((USHORT)0x000F) +#define RULER_TAB_RTL ((USHORT)0x0010) + +struct RulerTab +{ + long nPos; + USHORT nStyle; +}; + +#define RULER_TAB_WIDTH 7 +#define RULER_TAB_HEIGHT 6 + +// ------------- +// - RulerLine - +// ------------- + +struct RulerLine +{ + long nPos; + USHORT nStyle; +}; + +// -------------- +// - RulerArrow - +// -------------- + +struct RulerArrow +{ + long nPos; + long nWidth; + long nLogWidth; + USHORT nStyle; +}; + +class ImplRulerData; +// --------- +// - Ruler - +// --------- + +class SVT_DLLPUBLIC Ruler : public Window +{ +private: + VirtualDevice maVirDev; + MapMode maMapMode; + long mnBorderOff; + long mnWinOff; + long mnWinWidth; + long mnWidth; + long mnHeight; + long mnVirOff; + long mnVirWidth; + long mnVirHeight; + long mnBorderWidth; + long mnStartDragPos; + long mnDragPos; + ULONG mnUpdateEvtId; + ImplRulerData* mpSaveData; + ImplRulerData* mpData; + ImplRulerData* mpDragData; + Rectangle maExtraRect; + WinBits mnWinStyle; + USHORT mnUnitIndex; + USHORT mnDragAryPos; + USHORT mnDragSize; + USHORT mnDragScroll; + USHORT mnDragModifier; + USHORT mnExtraStyle; + USHORT mnExtraClicks; + USHORT mnExtraModifier; + RulerExtra meExtraType; + RulerType meDragType; + MapUnit meSourceUnit; + FieldUnit meUnit; + Fraction maZoom; + BOOL mbCalc; + BOOL mbFormat; + BOOL mbDrag; + BOOL mbDragDelete; + BOOL mbDragCanceled; + BOOL mbAutoWinWidth; + BOOL mbActive; + BYTE mnUpdateFlags; + Link maStartDragHdl; + Link maDragHdl; + Link maEndDragHdl; + Link maClickHdl; + Link maDoubleClickHdl; + Link maExtraDownHdl; + +#ifdef _SV_RULER_CXX + SVT_DLLPRIVATE void ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 ); + SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 ); + SVT_DLLPRIVATE void ImplVDrawText( long nX, long nY, const String& rText ); + + SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); + SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); + SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); + SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); + SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplCalc(); + SVT_DLLPRIVATE void ImplFormat(); + SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); + SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); + SVT_DLLPRIVATE void ImplDraw(); + SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); + SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); + using Window::ImplHitTest; + SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, + ImplRulerHitTest* pHitTest, + BOOL bRequiredStyle = FALSE, + USHORT nRequiredStyle = 0 ) const; + SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; + SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); + SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); + SVT_DLLPRIVATE void ImplEndDrag(); + DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); +#endif + + // Forbidden and not implemented. + Ruler (const Ruler &); + Ruler & operator= (const Ruler &); + +public: + Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); + virtual ~Ruler(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual long StartDrag(); + virtual void Drag(); + virtual void EndDrag(); + virtual void Click(); + virtual void DoubleClick(); + virtual void ExtraDown(); + + void Activate(); + void Deactivate(); + BOOL IsActive() const { return mbActive; } + + void SetWinPos( long nOff = 0, long nWidth = 0 ); + long GetWinOffset() const { return mnWinOff; } + long GetWinWidth() const { return mnWinWidth; } + void SetPagePos( long nOff = 0, long nWidth = 0 ); + long GetPageOffset() const; + long GetPageWidth() const; + void SetBorderPos( long nOff = 0 ); + long GetBorderOffset() const { return mnBorderOff; } + Rectangle GetExtraRect() const { return maExtraRect; } + + void SetUnit( FieldUnit eNewUnit ); + FieldUnit GetUnit() const { return meUnit; } + void SetZoom( const Fraction& rNewZoom ); + Fraction GetZoom() const { return maZoom; } + + void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } + MapUnit GetSourceUnit() const { return meSourceUnit; } + + void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); + RulerExtra GetExtraType() const { return meExtraType; } + USHORT GetExtraStyle() const { return mnExtraStyle; } + USHORT GetExtraClicks() const { return mnExtraClicks; } + USHORT GetExtraModifier() const { return mnExtraModifier; } + + BOOL StartDocDrag( const MouseEvent& rMEvt, + RulerType eDragType = RULER_TYPE_DONTKNOW ); + RulerType GetDocType( const Point& rPos, + RulerType eDragType = RULER_TYPE_DONTKNOW, + USHORT* pAryPos = NULL ) const; + RulerType GetDragType() const { return meDragType; } + long GetDragPos() const { return mnDragPos; } + USHORT GetDragAryPos() const { return mnDragAryPos; } + USHORT GetDragSize() const { return mnDragSize; } + BOOL IsDragDelete() const { return mbDragDelete; } + BOOL IsDragCanceled() const { return mbDragCanceled; } + USHORT GetDragScroll() const { return mnDragScroll; } + USHORT GetDragModifier() const { return mnDragModifier; } + BOOL IsDrag() const { return mbDrag; } + void CancelDrag(); + long GetClickPos() const { return mnDragPos; } + RulerType GetClickType() const { return meDragType; } + USHORT GetClickAryPos() const { return mnDragAryPos; } + using Window::GetType; + RulerType GetType( const Point& rPos, + USHORT* pAryPos = NULL ) const; + + void SetNullOffset( long nPos ); + long GetNullOffset() const; + void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } + void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + long GetMargin1() const; + USHORT GetMargin1Style() const; + void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } + void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + long GetMargin2() const; + USHORT GetMargin2Style() const; + + void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); + USHORT GetLineCount() const; + const RulerLine* GetLines() const; + + void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); + USHORT GetArrowCount() const; + const RulerArrow* GetArrows() const; + + void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); + USHORT GetBorderCount() const; + const RulerBorder* GetBorders() const; + + void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); + USHORT GetIndentCount() const; + const RulerIndent* GetIndents() const; + + void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); + USHORT GetTabCount() const; + const RulerTab* GetTabs() const; + + static void DrawTab( OutputDevice* pDevice, + const Point& rPos, USHORT nStyle ); + + void SetStyle( WinBits nStyle ); + WinBits GetStyle() const { return mnWinStyle; } + + void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } + const Link& GetStartDragHdl() const { return maStartDragHdl; } + void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } + const Link& GetDragHdl() const { return maDragHdl; } + void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } + const Link& GetEndDragHdl() const { return maEndDragHdl; } + void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } + const Link& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; } + const Link& GetExtraDownHdl() const { return maExtraDownHdl; } + + //set text direction right-to-left + void SetTextRTL(BOOL bRTL); +}; + +#endif // _RULER_HXX diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx new file mode 100644 index 000000000000..0bf026b11ced --- /dev/null +++ b/svtools/inc/svtools/scriptedtext.hxx @@ -0,0 +1,132 @@ +/************************************************************************* + * + * 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: scriptedtext.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_SCRIPTEDTEXT_HXX +#define _SVTOOLS_SCRIPTEDTEXT_HXX + +#include "svtools/svtdllapi.h" +#include +#include + + +namespace rtl { class OUString; } +class OutputDevice; +class Font; +class SvtScriptedTextHelper_Impl; + + +//_____________________________________________________________________________ + +/** +This class provides drawing text with different script types on any output devices. +*/ +class SVT_DLLPUBLIC SvtScriptedTextHelper +{ +private: + SvtScriptedTextHelper_Impl* mpImpl; /// Implementation of class functionality. + + /** Assignment operator not implemented to prevent usage. */ + SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ); + +public: + /** Constructor sets an output device and no fonts. + @param _rOutDevice + A reference to an output device. */ + SvtScriptedTextHelper( OutputDevice& _rOutDevice ); + + /** Constructor sets an output device and fonts for all script types. + @param _rOutDevice + A reference to an output device. + @param _pLatinFont + The font for latin characters. + @param _pAsianFont + The font for asian characters. + @param _pCmplxFont + The font for complex text layout. */ + SvtScriptedTextHelper( + OutputDevice& _rOutDevice, + Font* _pLatinFont, + Font* _pAsianFont, + Font* _pCmplxFont ); + + /** Copy constructor. */ + SvtScriptedTextHelper( + const SvtScriptedTextHelper& _rCopy ); + + /** Destructor. */ + virtual ~SvtScriptedTextHelper(); + + /** Sets new fonts and recalculates the text width. + @param _pLatinFont + The font for latin characters. + @param _pAsianFont + The font for asian characters. + @param _pCmplxFont + The font for complex text layout. */ + void SetFonts( Font* _pLatinFont, Font* _pAsianFont, Font* _pCmplxFont ); + + /** Sets the default font of the current output device to all script types. */ + void SetDefaultFont(); + + /** Sets a new text and calculates all script breaks and the text width. + @param _rText + The new text. + @param _xBreakIter + The break iterator for iterating through the script portions. */ + void SetText( + const ::rtl::OUString& _rText, + const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); + + /** Returns the previously set text. + @return The current text. */ + const ::rtl::OUString& GetText() const; + + /** Returns the calculated width the text will take in the current output device. + @return The calculated text width. */ + sal_Int32 GetTextWidth() const; + + /** Returns the maximum height the text will take in the current output device. + @return The maximum text height. */ + sal_Int32 GetTextHeight() const; + + /** Returns a size struct containing the width and height of the text in the current output device. + @return A size struct with the text dimensions. */ + const Size& GetTextSize() const; + + /** Draws the text in the current output device. + @param _rPos + The position of the top left edge of the text. */ + void DrawText( const Point& _rPos ); +}; + +//_____________________________________________________________________________ + +#endif + diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx new file mode 100644 index 000000000000..c4c06aeb96ab --- /dev/null +++ b/svtools/inc/svtools/scrwin.hxx @@ -0,0 +1,115 @@ +/************************************************************************* + * + * 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: scrwin.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SCRWIN_HXX +#define _SCRWIN_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _SCRBAR_HXX //autogen +#include +#endif + +class DataChangedEvent; + +// ------------------------- +// - ScrollableWindow-Type - +// ------------------------- + +typedef USHORT ScrollableWindowFlags; + +#define SCRWIN_THUMBDRAGGING 1 +#define SCRWIN_VCENTER 2 +#define SCRWIN_HCENTER 4 +#define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) + +// -------------------- +// - ScrollableWindow - +// -------------------- + +class SVT_DLLPUBLIC ScrollableWindow: public Window +{ +private: + Point aPixOffset; // offset to virtual window (pixel) + Size aTotPixSz; // total size of virtual window (pixel) + long nLinePixH; // size of a line/column (pixel) + long nColumnPixW; + + ScrollBar aVScroll; // the scrollbars + ScrollBar aHScroll; + ScrollBarBox aCornerWin; // window in the bottom right corner + BOOL bScrolling:1, // user controlled scrolling + bHandleDragging:1, // scroll window while dragging + bHCenter:1, + bVCenter:1; + +#ifdef _SVT_SCRWIN_CXX + SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); +#endif + +public: + ScrollableWindow( Window* pParent, WinBits nBits = 0, + ScrollableWindowFlags = SCRWIN_DEFAULT ); + ScrollableWindow( Window* pParent, const ResId& rId, + ScrollableWindowFlags = SCRWIN_DEFAULT ); + + virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void DataChanged( const DataChangedEvent& rDEvt ); + + virtual void StartScroll(); + virtual void EndScroll( long nDeltaX, long nDeltaY ); + + using OutputDevice::SetMapMode; + virtual void SetMapMode( const MapMode& rNewMapMode ); + virtual MapMode GetMapMode() const; + + void SetTotalSize( const Size& rNewSize ); + Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } + + void SetVisibleSize( const Size& rNewSize ); + BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); + Rectangle GetVisibleArea() const; + + void SetLineSize( ULONG nHorz, ULONG nVert ); + using Window::Scroll; + virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); + void ScrollLines( long nLinesX, long nLinesY ); + void ScrollPages( long nPagesX, ULONG nOverlapX, + long nPagesY, ULONG nOverlapY ); + +private: + SVT_DLLPRIVATE Size GetOutputSizePixel() const; + SVT_DLLPRIVATE Size GetOutputSize() const; +}; + +#endif diff --git a/svtools/inc/svtools/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx new file mode 100644 index 000000000000..d87fff819748 --- /dev/null +++ b/svtools/inc/svtools/sfxecode.hxx @@ -0,0 +1,121 @@ +/************************************************************************* + * + * 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: sfxecode.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SFXECODE_HXX +#define _SFXECODE_HXX + +#include + +#define ERRCODE_SFX_NOSTDTEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1) +#define ERRCODE_SFX_NOTATEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2) +#define ERRCODE_SFX_GENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3) +#define ERRCODE_SFX_DOLOADFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4) +#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5) +#define ERRCODE_SFX_COMMITFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6) +#define ERRCODE_SFX_HANDSOFFFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7) +#define ERRCODE_SFX_DOINITNEWFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8) +#define ERRCODE_SFX_CANTREADDOCINFO (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9) +#define ERRCODE_SFX_ALREADYOPEN (ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10) +#define ERRCODE_SFX_WRONGPASSWORD (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11) +#define ERRCODE_SFX_DOCUMENTREADONLY (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12) +#define ERRCODE_SFX_OLEGENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14) +#define ERRCODE_SFXMSG_STYLEREPLACE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13) +#define ERRCODE_SFX_TEMPLATENOTFOUND (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15) +#define ERRCODE_SFX_ISRELATIVE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16) +#define ERRCODE_SFX_FORCEDOCLOAD (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17) + +#define ERRCODE_SFX_CANTFINDORIGINAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19) +#define ERRCODE_SFX_RESTART (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20) +#define ERRCODE_SFX_CANTCREATECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21) +#define ERRCODE_SFX_CANTCREATELINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22) +#define ERRCODE_SFX_WRONGBMKFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23) +#define ERRCODE_SFX_WRONGICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24) +#define ERRCODE_SFX_CANTDELICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25) +#define ERRCODE_SFX_CANTWRITEICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26) +#define ERRCODE_SFX_CANTRENAMECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27) +#define ERRCODE_SFX_INVALIDBMKPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28) +#define ERRCODE_SFX_CANTWRITEURLCFGFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29) +#define ERRCODE_SFX_WRONGURLCFGFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30) +#define ERRCODE_SFX_NODOCUMENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31) +#define ERRCODE_SFX_INVALIDLINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32) +#define ERRCODE_SFX_INVALIDTRASHPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33) +#define ERRCODE_SFX_NOTRESTORABLE (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34) +#define ERRCODE_SFX_NOTRASH (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35) +#define ERRCODE_SFX_INVALIDSYNTAX (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36) +#define ERRCODE_SFX_CANTCREATEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37) +#define ERRCODE_SFX_CANTRENAMEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38) +#define ERRCODE_SFX_WRONG_CDF_FORMAT (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39) +#define ERRCODE_SFX_EMPTY_SERVER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40) +#define ERRCODE_SFX_NO_ABOBOX (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41) +#define ERRCODE_SFX_CANTGETPASSWD (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42) +#define ERRCODE_SFX_TARGETFILECORRUPTED (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43) +#define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 44) +#define ERRCODE_SFX_NOFILTER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45) +#define ERRCODE_SFX_FORCEQUIET (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47) +#define ERRCODE_SFX_CONSULTUSER (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48) +#define ERRCODE_SFX_NEVERCHECKCONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49) +#define ERRCODE_SFX_CANTCREATEBACKUP (ERRCODE_AREA_SFX | ERRCODE_CLASS_CREATE | 50) +#define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51) +#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52) +#define ERRCODE_SFX_BROKENSIGNATURE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53) +#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54) +#define ERRCODE_SFX_INCOMPLETE_ENCRYPTION (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55) + + + +//Dies und das +#define ERRCTX_ERROR 21 +#define ERRCTX_WARNING 22 + +//Documentkontexte +#define ERRCTX_SFX_LOADTEMPLATE 1 +#define ERRCTX_SFX_SAVEDOC 2 +#define ERRCTX_SFX_SAVEASDOC 3 +#define ERRCTX_SFX_DOCINFO 4 +#define ERRCTX_SFX_DOCTEMPLATE 5 +#define ERRCTX_SFX_MOVEORCOPYCONTENTS 6 + +//Appkontexte +#define ERRCTX_SFX_DOCMANAGER 50 +#define ERRCTX_SFX_OPENDOC 51 +#define ERRCTX_SFX_NEWDOCDIRECT 52 +#define ERRCTX_SFX_NEWDOC 53 + +//Organizerkontexte +#define ERRCTX_SFX_CREATEOBJSH 70 + +//BASIC-Kontexte +#define ERRCTX_SFX_LOADBASIC 80 + +//Addressbook contexts +#define ERRCTX_SFX_SEARCHADDRESS 90 + +#endif // #ifndef _SFXECODE_HXX + + diff --git a/svtools/inc/svtools/soerr.hxx b/svtools/inc/svtools/soerr.hxx new file mode 100644 index 000000000000..9d8c9797a79f --- /dev/null +++ b/svtools/inc/svtools/soerr.hxx @@ -0,0 +1,84 @@ +/************************************************************************* + * + * 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: soerr.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SOERR_HXX +#define _SOERR_HXX + +#include + +// Fehler Codes +#define RID_SO_ERROR_HANDLER 32000 + +#define SO_ERR() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO) +#define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK) + +#define ERRCODE_SO_GENERALERROR (SO_ERR() | 1) +#define ERRCODE_SO_CANT_BINDTOSOURCE (SO_ERR() | 2) +#define ERRCODE_SO_NOCACHE_UPDATED (SO_ERR() | 3) +#define ERRCODE_SO_SOMECACHES_NOTUPDATED (SO_WRN() | 4) +#define ERRCODE_SO_MK_UNAVAILABLE (SO_ERR() | 5) +#define ERRCODE_SO_E_CLASSDIFF (SO_ERR() | 6) +#define ERRCODE_SO_MK_NO_OBJECT (SO_ERR() | 7) +#define ERRCODE_SO_MK_EXCEEDED_DEADLINE (SO_ERR() | 8) +#define ERRCODE_SO_MK_CONNECT_MANUALLY (SO_ERR() | 9) +#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED (SO_ERR() | 10) +#define ERRCODE_SO_NO_INTERFACE (SO_ERR() | 11) +#define ERRCODE_SO_OUT_OF_MEMORY (SO_ERR() | 12) +#define ERRCODE_SO_MK_SYNTAX (SO_ERR() | 13) +#define ERRCODE_SO_MK_REDUCED_TO_SELF (SO_WRN() | 14) +#define ERRCODE_SO_MK_NO_INVERSE (SO_ERR() | 15) +#define ERRCODE_SO_MK_NO_PREFIX (SO_ERR() | 16) +#define ERRCODE_SO_MK_HIM (SO_WRN() | 17) +#define ERRCODE_SO_MK_US (SO_WRN() | 18) +#define ERRCODE_SO_MK_ME (SO_WRN() | 19) +#define ERRCODE_SO_MK_NOT_BINDABLE (SO_ERR() | 20) +#define ERRCODE_SO_NOT_IMPLEMENTED (SO_ERR() | 21) +#define ERRCODE_SO_MK_NO_STORAGE (SO_ERR() | 22) +#define ERRCODE_SO_FALSE (SO_WRN() | 23) +#define ERRCODE_SO_MK_NEED_GENERIC (SO_ERR() | 24) +#define ERRCODE_SO_PENDING (SO_ERR() | 25) +#define ERRCODE_SO_NOT_INPLACEACTIVE (SO_ERR() | 26) +#define ERRCODE_SO_LINDEX (SO_ERR() | 27) +#define ERRCODE_SO_CANNOT_DOVERB_NOW (SO_WRN() | 28) +#define ERRCODE_SO_OLEOBJ_INVALIDHWND (SO_WRN() | 29) +#define ERRCODE_SO_NOVERBS (SO_ERR() | 30) +#define ERRCODE_SO_INVALIDVERB (SO_WRN() | 31) +#define ERRCODE_SO_MK_CONNECT (SO_ERR() | 32) +#define ERRCODE_SO_NOTIMPL (SO_ERR() | 33) +#define ERRCODE_SO_MK_CANTOPENFILE (SO_ERR() | 34) + +// Fehler Contexte +#define RID_SO_ERRCTX 32001 + +#define ERRCTX_SO_DOVERB 1 + + + +#endif + diff --git a/svtools/inc/svtools/sores.hxx b/svtools/inc/svtools/sores.hxx new file mode 100644 index 000000000000..158810c5b171 --- /dev/null +++ b/svtools/inc/svtools/sores.hxx @@ -0,0 +1,182 @@ +/************************************************************************* + * + * 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: sores.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// Strings +#define STR_INS_OBJECT 32000 +#define STR_INS_OBJECT_ICON 32001 +#define STR_INS_FILE 32002 +#define STR_INS_FILE_ICON 32003 +#define STR_INS_FILE_LINK 32004 +#define STR_INS_FILE_ICON_LINK 32005 +#define STR_PASTE 32012 +#define STR_ERROR_DDE 32013 +#define STR_ERROR_OBJNOCREATE 32014 +#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 +#define STR_VERB_OPEN 32016 +#define STR_PLUGIN_CANT_SHOW 32017 +#define STR_ERROR_OBJNOCREATE_PLUGIN 32018 +#define STR_INS_PLUGIN 32019 +#define STR_CONVERT_TO 32010 +#define STR_ACTIVATE_AS 32021 +#define STR_QUERYUPDATELINKS 32022 +#define STR_INS_APPLET 32023 +#define STR_VERB_PROPS 32025 +#define STR_FURTHER_OBJECT 32026 +#define STR_EDIT_APPLET 32029 +#define STR_UNKNOWN_SOURCE 32027 + +#define BMP_PLUGIN 32000 +#define BMP_OLEOBJ 32001 +#define MB_PLUGIN 32000 +#define MI_PLUGIN 32000 +#define MI_PLUGIN_DEACTIVATE 1 + +// Sot Format Strings +#define STR_FORMAT_START 32100 +#define STR_FORMAT_STRING (STR_FORMAT_START + 1) +#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) +#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) + // #define STR_FORMAT_PRIVATE (STR_FORMAT_START + 4) + // #define STR_FORMAT_FILE (STR_FORMAT_START + 5) + // #define STR_FORMAT_FILE_LIST (STR_FORMAT_START + 6) +#define STR_FORMAT_RTF (STR_FORMAT_START + 7) +#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) +#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) + // #define STR_FORMAT_ID_SVIM (STR_FORMAT_START + 10) + // #define STR_FORMAT_ID_XFA (STR_FORMAT_START + 11) + // #define STR_FORMAT_ID_EDITENGINE (STR_FORMAT_START + 12) +#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) +#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) +#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) + // #define STR_FORMAT_ID_TREELISTBOX (STR_FORMAT_START + 16) + // #define STR_FORMAT_ID_NATIVE (STR_FORMAT_START + 17) + // #define STR_FORMAT_ID_OWNERLINK (STR_FORMAT_START + 18) +#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) +#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) +#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) +#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22) +#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23) +#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24) +#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25) +#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26) +#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27) +#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28) +#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29) +#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30) +#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31) +#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32) +#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33) +#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34) +#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35) +#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36) +#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37) +#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38) +#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39) +#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40) +#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41) +#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42) +#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43) +#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) +#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) +#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) + // #define STR_FORMAT_ID_FILLED_AREA (STR_FORMAT_START + 47) +#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) +#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) + // #define STR_FORMAT_ID_CHAOS (STR_FORMAT_START + 50) + // #define STR_FORMAT_ID_CNT_MSGATTACHFILE (STR_FORMAT_START + 51) +#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) +#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) +#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) + // #define STR_FORMAT_ID_SYLK_BIGCAPS (STR_FORMAT_START + 55) +#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) +#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) + // #define STR_FORMAT_ID_STARDRAW_TABBAR (STR_FORMAT_START + 58) + // #define STR_FORMAT_ID_SONLK (STR_FORMAT_START + 59) +#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) +#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) +#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) +#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) + // #define STR_FORMAT_ID_NOTES_HNOTE (STR_FORMAT_START + 64) + // #define STR_FORMAT_ID_NOTES_NATIVE (STR_FORMAT_START + 65) +#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) + // #define STR_FORMAT_ID_EVDF (STR_FORMAT_START + 67) + // #define STR_FORMAT_ID_ESDF (STR_FORMAT_START + 68) + // #define STR_FORMAT_ID_IDF (STR_FORMAT_START + 69) + // #define STR_FORMAT_ID_EFTP (STR_FORMAT_START + 70) + // #define STR_FORMAT_ID_EFD (STR_FORMAT_START + 71) + // #define STR_FORMAT_ID_SVX_FORMFIELDEXCH (STR_FORMAT_START + 72) + // #define STR_FORMAT_ID_EXTENDED_TABBAR (STR_FORMAT_START + 73) + // #define STR_FORMAT_ID_SBA_DATAEXCHANGE (STR_FORMAT_START + 74) + // #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75) + // #define STR_FORMAT_ID_SBA_PRIVATE_URL (STR_FORMAT_START + 76) + // #define STR_FORMAT_ID_SBA_TABED (STR_FORMAT_START + 77) + // #define STR_FORMAT_ID_SBA_TABID (STR_FORMAT_START + 78) + // #define STR_FORMAT_ID_SBA_JOIN (STR_FORMAT_START + 79) + // #define STR_FORMAT_ID_OBJECTDESCRIPTOR (STR_FORMAT_START + 80) + // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR (STR_FORMAT_START + 81) + // #define STR_FORMAT_ID_EMBED_SOURCE (STR_FORMAT_START + 82) + // #define STR_FORMAT_ID_LINK_SOURCE (STR_FORMAT_START + 83) + // #define STR_FORMAT_ID_EMBEDDED_OBJ (STR_FORMAT_START + 84) + // #define STR_FORMAT_ID_FILECONTENT (STR_FORMAT_START + 85) +#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) + // #define STR_FORMAT_ID_FILENAME (STR_FORMAT_START + 87) + // #define STR_FORMAT_ID_SD_OLE (STR_FORMAT_START + 88) + // #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE (STR_FORMAT_START + 89) + // #define STR_FORMAT_ID_EMBED_SOURCE_OLE (STR_FORMAT_START + 90) + // #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE (STR_FORMAT_START + 91) + // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92) + // #define STR_FORMAT_ID_LINK_SOURCE_OLE (STR_FORMAT_START + 93) + // #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE (STR_FORMAT_START + 94) + // #define STR_FORMAT_ID_OUTPLACE_OBJ (STR_FORMAT_START + 95) + // #define STR_FORMAT_ID_CNT_OWN_CLIP (STR_FORMAT_START + 96) + // #define STR_FORMAT_ID_INET_IMAGE (STR_FORMAT_START + 97) + // #define STR_FORMAT_ID_NETSCAPE_IMAGE (STR_FORMAT_START + 98) + // #define STR_FORMAT_ID_SBA_FORMEXCHANGE (STR_FORMAT_START + 99) + // #define STR_FORMAT_ID_SBA_REPORTEXCHANGE (STR_FORMAT_START + 100) + // #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101) +#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) +#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) +#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) +#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105) +#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106) +#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107) +#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108) +#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109) +#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110) +#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111) +#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112) +#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113) +#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) +#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) +#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) + // #define STR_FORMAT_ID_EMF (STR_FORMAT_START + 117) + // #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118) +#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) +#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx new file mode 100644 index 000000000000..a5f4fc1c974c --- /dev/null +++ b/svtools/inc/svtools/statusbarcontroller.hxx @@ -0,0 +1,161 @@ +/************************************************************************* + * + * 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: statusbarcontroller.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX +#define _SVTOOLS_STATUSBARCONTROLLER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef INCLUDED_HASH_MAP +#include +#define INCLUDED_HASH_MAP +#endif + +#include + +namespace svt +{ + +class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatusListener, + public ::com::sun::star::frame::XStatusbarController, + public ::com::sun::star::lang::XInitialization, + public ::com::sun::star::util::XUpdatable, + public ::com::sun::star::lang::XComponent, + public ::comphelper::OBaseMutex, + public ::cppu::OWeakObject +{ + public: + StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + const rtl::OUString& aCommandURL, + unsigned short nID ); + StatusbarController(); + virtual ~StatusbarController(); + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; + + void updateStatus( const rtl::OUString aCommandURL ); + void updateStatus(); + + ::Rectangle getControlRect() const; + + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); + + // XInitialization + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // XUpdatable + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusbarController + virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, + ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); + + protected: + struct Listener + { + Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + aURL( rURL ), xDispatch( rDispatch ) {} + + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + }; + + typedef ::std::hash_map< ::rtl::OUString, + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, + ::rtl::OUStringHash, + ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + + // methods to support status forwarder, known by the old sfx2 toolbox controller implementation + void addStatusListener( const rtl::OUString& aCommandURL ); + void removeStatusListener( const rtl::OUString& aCommandURL ); + void bindListener(); + void unbindListener(); + sal_Bool isBound() const; + + // execute methods + // execute bound status bar controller command/execute various commands + void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + + sal_Bool m_bInitialized : 1, + m_bDisposed : 1; + unsigned short m_nID; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + rtl::OUString m_aCommandURL; + URLToDispatchMap m_aListenerMap; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; +}; + +} + +#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX diff --git a/svtools/inc/svtools/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx new file mode 100644 index 000000000000..fb7d69476d92 --- /dev/null +++ b/svtools/inc/svtools/stdmenu.hxx @@ -0,0 +1,244 @@ +/************************************************************************* + * + * 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: stdmenu.hxx,v $ + * $Revision: 1.8 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _STDMENU_HXX +#define _STDMENU_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _MENU_HXX +#include +#endif + +class FontList; +class FontInfo; + +/************************************************************************* + +Beschreibung +============ + +class FontNameMenu + +Beschreibung + +Erlaubt die Auswahl von Fonts. Das Menu wird ueber Fill mit den FontNamen +gefuellt. Fill sortiert automatisch die FontNamen (inkl. aller Umlaute und +sprachabhaengig). Mit SetCurName()/GetCurName() kann der aktuelle Fontname +gesetzt/abgefragt werden. Wenn SetCurName() mit einem leeren String +aufgerufen wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). +Vor dem Selectaufruf wird der ausgewaehlte Name automatisch als aktueller +gesetzt und wuerde beim naechsten Aufruf auch als aktueller Name angezeigt +werden. Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit +SetCurName() der aktuelle Fontname gesetzt werden. + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl eines Namens mitzubekommen. + +In dieses Menu koennen keine weiteren Items eingefuegt werden. + +Spaeter soll auch das Menu die gleichen Bitmaps anzeigen, wie die +FontNameBox. Auf den Systemen, wo Menues nicht automatisch scrollen, +wird spaeter wohl ein A-Z Menu ziwschengeschaltet. Da ein Menu bei vielen +installierten Fonts bisher schon immer lange gebraucht hat, sollte dieses +Menu schon jetzt nur einmal erzeugt werden (da sonst das Kontextmenu bis +zu 10-Sekunden fuer die Erzeugung brauchen koennte). + +Querverweise + +FontList; FontStyleMenu; FontSizeMenu; FontNameBox + +-------------------------------------------------------------------------- + +class FontStyleMenu + +Beschreibung + +Erlaubt die Auswahl eines FontStyles. Mit Fill wird das FontStyleMenu mit +den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden +immer mit eingefuegt (kann sich aber noch aendern, da vielleicht +nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts +umgehen koennen). Mit SetCurStyle()/GetCurStyle() kann der aktuelle Fontstyle +gesetzt/abgefragt werden. Der Stylename muss mit FontList::GetStyleName() +ermittelt werden. Wenn SetCurStyle() mit einem leeren String aufgerufen wird, +wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem Selectaufruf +wird der ausgewaehlte Style automatisch als aktueller gesetzt und wuerde beim +naechsten Aufruf auch als aktueller Style angezeigt werden. Deshalb sollte vor +PopupMenu::Execute() gegebenenfalls mit SetCurStyle() der aktuelle Style +gesetzt werden. Da die Styles vom ausgewaehlten Font abhaengen, sollte +nach einer Aenderung des Fontnamen das Menu mit Fill mit den Styles des +Fonts neu gefuellt werden. + +Mit GetCurStyle() kann der ausgewaehlte Style abgefragt +werden. Mit Check wird der Style gecheckt/uncheckt, welcher aktiv +ist. Der Stylename muss mit FontList::GetStyleName() ermittelt werden. Vor +dem Selectaufruf wird der ausgewaehlte Style automatisch gecheckt. Mit +UncheckAllStyles() koennen alle Fontstyles geuncheckt werden (zum Beispiel +fuer DontKnow). + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl eines Styles mitzubekommen. + +An dieses Menu kann ueber MENU_APPEND weitere Items eingefuegt werden. +Bei Fill werden nur Items entfernt, die die Id zwischen FONTSTYLEMENU_FIRSTID +und FONTSTYLEMENU_LASTID haben. + +Querverweise + +FontList; FontNameMenu; FontSizeMenu; FontStyleBox + +-------------------------------------------------------------------------- + +class FontSizeMenu + +Beschreibung + +Erlaubt die Auswahl von Fontgroessen. Ueber Fill wird das FontSizeMenu +gefuellt und ueber GetCurHeight() kann die ausgewaehlte Fontgroesse +abgefragt werden. Mit SetCurHeight()/GetCurHeight() kann die aktuelle +Fontgroesse gesetzt/abgefragt werden. Wenn SetCurHeight() mit 0 aufgerufen +wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem +Selectaufruf wird die ausgewaehlte Groesse automatisch als aktuelle gesetzt +und wuerde beim naechsten Aufruf auch als aktuelle Groesse angezeigt werden. +Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit SetCurHeight() +die aktuelle Groesse gesetzt werden. Da die Groessen vom ausgewaehlten Font +abhaengen, sollte nach einer Aenderung des Fontnamen das Menu mit Fill mit +den Groessen des Fonts neu gefuellt werden. + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl einer Groesse mitzubekommen. + +Alle Groessen werden in 10tel Point angegeben. + +In dieses Menu koennen keine weiteren Items eingefuegt werden. + +Spaeter soll das Menu je nach System die Groessen anders darstelllen. Zum +Beispiel koennte der Mac spaeter vielleicht einmal die Groessen als Outline +darstellen, die als Bitmap-Fonts vorhanden sind. + +Querverweise + +FontList; FontNameMenu; FontStyleMenu; FontSizeBox + +*************************************************************************/ + +// ---------------- +// - FontNameMenu - +// ---------------- + +class SVT_DLLPUBLIC FontNameMenu : public PopupMenu +{ +private: + XubString maCurName; + Link maSelectHdl; + Link maHighlightHdl; + +public: + FontNameMenu(); + virtual ~FontNameMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const FontList* pList ); + + void SetCurName( const XubString& rName ); + const XubString& GetCurName() const { return maCurName; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +// ----------------- +// - FontStyleMenu - +// ----------------- + +#define FONTSTYLEMENU_FIRSTID 62000 +#define FONTSTYLEMENU_LASTID 62999 + +class SVT_DLLPUBLIC FontStyleMenu : public PopupMenu +{ +private: + XubString maCurStyle; + Link maSelectHdl; + Link maHighlightHdl; + + SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); + +public: + FontStyleMenu(); + virtual ~FontStyleMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const XubString& rName, const FontList* pList ); + void SetCurStyle( const XubString& rStyle ); + const XubString& GetCurStyle() const { return maCurStyle; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +// ---------------- +// - FontSizeMenu - +// ---------------- + +class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu +{ +private: + long* mpHeightAry; + long mnCurHeight; + Link maSelectHdl; + Link maHighlightHdl; + +public: + FontSizeMenu(); + ~FontSizeMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const FontInfo& rInfo, const FontList* pList ); + + void SetCurHeight( long nHeight ); + long GetCurHeight() const { return mnCurHeight; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +#endif // _STDMENU_HXX diff --git a/svtools/inc/svtools/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx new file mode 100644 index 000000000000..2e570dfe2550 --- /dev/null +++ b/svtools/inc/svtools/sychconv.hxx @@ -0,0 +1,50 @@ +/************************************************************************* + * + * 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: sychconv.hxx,v $ + * $Revision: 1.3.136.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SYCHCONV_HXX +#define _SYCHCONV_HXX + +#include +#include + +// ---------------------- +// - CharacterConverter - +// ---------------------- + +class OutputDevice; + +class SymCharConverter +{ +public: + + static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); +}; + +#endif // _CHARCONV_HXX diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx new file mode 100644 index 000000000000..5261697dd8b0 --- /dev/null +++ b/svtools/inc/svtools/tabbar.hxx @@ -0,0 +1,558 @@ +/************************************************************************* + * + * 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: tabbar.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TABBAR_HXX +#define _TABBAR_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +class MouseEvent; +class TrackingEvent; +class DataChangedEvent; +class ImplTabBarList; +class ImplTabButton; +class ImplTabSizer; +class TabBarEdit; + +// ----------------- +// - Dokumentation - +// ----------------- + +/* + +Erlaubte StyleBits +------------------ + +WB_SCROLL - Die Tabs koennen ueber ein Extra-Feld gescrollt werden +WB_MINSCROLL - Die Tabs koennen ueber 2 zusaetzliche Buttons gescrollt werden +WB_RANGESELECT - Zusammenhaengende Bereiche koennen selektiert werden +WB_MULTISELECT - Einzelne Tabs koennen selektiert werden +WB_BORDER - Oben und unten wird ein Strich gezeichnet +WB_TOPBORDER - Oben wird ein Border gezeichnet +WB_3DTAB - Die Tabs und der Border werden in 3D gezeichnet +WB_DRAG - Vom TabBar wird ein StartDrag-Handler gerufen, wenn + Drag and Drop gestartet werden soll. Es wird ausserdem + im TabBar mit EnableDrop() Drag and Drop eingeschaltet. +WB_SIZEABLE - Vom TabBar wird ein Split-Handler gerufen, wenn der Anwender + den TabBar in der Breite aendern will +WB_STDTABBAR - WB_BORDER + +Wenn man den TabBar zum Beispiel als Property-Bar benutzen moechte, sollten +die WinBits WB_TOPBORDER und WB_3DTAB anstatt WB_BORDER gesetzt werden. + + +Erlaubte PageBits +----------------- + +TPB_SPECIAL - Andere Darstellung des TabTextes, zum Beispiel fuer + Szenario-Seiten. + + +Handler +------- + +Select - Wird gerufen, wenn eine Tab selektiert oder + deselektiert wird +DoubleClick - Wird gerufen, wenn ein DoubleClick im TabBar ausgeloest + wurde. Innerhalb des Handlers liefert GetCurPageId() die + angeklickte Tab zurueck oder 0, wenn keine Tab angeklickt + wurde +ActivatePage - Wird gerufen, wenn eine andere Seite aktiviert wird. + GetCurPageId() gibt die aktivierte Seite zurueck. +DeactivatePage - Wird gerufen, wenn eine Seite deaktiviert wird. Wenn + eine andere Seite aktiviert werden darf, muss TRUE + zurueckgegeben werden, wenn eine andere Seite von + der Aktivierung ausgeschlossen werden soll, muss + FALSE zurueckgegeben werden. GetCurPageId() gibt die + zu deaktivierende Seite zurueck. + + + +Drag and Drop +------------- + +Fuer Drag and Drop muss das WinBit WB_DRAG gesetzt werden. Ausserdem +muss der Command-, QueryDrop-Handler und der Drop-Handler ueberlagert +werden. Dabei muss in den Handlern folgendes implementiert werden: + +Command - Wenn in diesem Handler das Dragging gestartet werden + soll, muss StartDrag() gerufen werden. Diese Methode + selektiert dann den entsprechenden Eintrag oder gibt + FALSE zurueck, wenn das Dragging nicht durchgefuhert + werden kann. + +QueryDrop - Dieser Handler wird von StarView immer dann gerufen, wenn + bei einem Drag-Vorgang die Maus ueber das Fenster gezogen + wird (siehe dazu auch SV-Doku). In diesem Handler muss + festgestellt werden, ob ein Drop moeglich ist. Die + Drop-Position kann im TabBar mit ShowDropPos() angezeigt + werden. Beim Aufruf muss die Position vom Event uebergeben + werden. Wenn sich die Position am linken oder rechten + Rand befindet, wird automatisch im TabBar gescrollt. + Diese Methode gibt auch die entsprechende Drop-Position + zurueck, die auch fuer ein Drop gebraucht wird. Wenn das + Fenster beim Drag verlassen wird, kann mit HideDropPos() + die DropPosition wieder weggenommen werden. Es ist dadurch + auch moeglich, ein von ausserhalb des TabBars ausgeloestes + Drag zu verarbeiten. + +Drop - Im Drop-Handler muessen dann die Pages verschoben werden, + oder die neuen Pages eingefuegt werden. Die entsprechende + Drop-Postion kann mit ShowDropPos() ermittelt werden. + +Folgende Methoden werden fuer Drag and Drop gebraucht und muessen von +den Handlern gerufen werden: + +StartDrag - Muss aus dem Commnad-Handler gerufen werden. Als Parameter + muss der CommandEvent uebergeben werden und eine Referenz + auf eine Region. Diese Region muss dann bei ExecuteDrag() + uebergeben werden, wenn der Rueckgabewert sagt, das + ExecuteDrag durchgefuehrt werden soll. Falls der Eintrag + nicht selektiert ist, wird er vorher als aktueller + Eintrag gesetzt. Es ist daher darauf zu achten, das aus + dieser Methode heraus der Select-Handler gerufen werden + kann. + +ShowDropPos - Diese Methode muss vom QueryDrop-Handler gerufen werden, + damit der TabBar anzeigt, wo die Tabs eingefuegt werden. + Diese Methode kann auch im Drop-Handler benutzt werden, + um die Position zu ermitteln wo die Tabs eingefuegt werden + sollen. In der Methode muss die Position vom Event + uebergeben werden. Diese Methode gibt die Position zurueck, + wo die Tabs eingefuegt werden sollen. + +HideDropPos - Diese Methode nimmt die vorher mit ShowDropPos() angezeigte + DropPosition wieder zurueck. Diese Methode sollte dann + gerufen werden, wenn bei QueryDrop() das Fenster verlassen + wird oder der Dragvorgang beendet wurde. + +Folgende Methoden koennen eingesetzt werden, wenn bei D&D die Seiten +umgeschaltet werden sollen: + +SwitchPage - Diese Methode muss vom QueryDrop-Handler gerufen werden, + wenn die Seite ueber der sich der Mousepointer befindet, + umgeschaltet werden soll. Diese Methode sollte jedesmal + gerufen werden, wenn der QueryDrop-Handler gerufen wird. + Das umschalten der Seite passiert zeitverzoegert (500 ms) + und wird automatisch von dieser Methode verwaltet. + In der Methode muss die Position vom Event uebergeben + werden. Diese Methode gibt TRUE zurueck, wenn die Page + umgeschaltet wurde. + +EndSwitchPage - Diese Methode setzt die Daten fuer das umschalten der + Seiten zurueck. Diese Methode sollte dann gerufen werden, + wenn bei QueryDrop() das Fenster verlassen wird oder + der Dragvorgang beendet wurde. + +IsInSwitching - Mit dieser Methode kann im ActivatePage()/DeactivatePage() + abgefragt werden, ob dies durch SwitchPage() veranlasst + wurde. So kann dann beispielsweise in DeactivatePage() + das Umschalten ohne eine Fehlerbox verhindert werden. + + +Fenster-Resize +-------------- + +Wenn das Fenster vom Anwender in der Breite geaendert werden kann, dann +muss das WinBit WB_SIZEABLE gesetzt werden. In diesem Fall muss noch +folgender Handler ueberlagert werden: + +Split - Wenn dieser Handler gerufen wird, sollte das Fenster + auf die Breite angepasst werden, die von GetSplitSize() + zurueckgegeben wird. Dabei wird keine minimale und + maximale Breite beruecksichtig. Eine minimale Breite + kann mit GetMinSize() abgefragt werden und die maximale + Breite muss von der Anwendung selber berechnet werden. + Da nur Online-Resize unterstuetzt wird, muss das Fenster + innerhalb dieses Handlers in der Breite geaendert + werden und eventuell abhaengige Fenster ebenfalls. Fuer + diesen Handler kann auch mit SetSplitHdl() ein + Link gesetzt werden. + +Folgende Methoden liefern beim Splitten weitere Informationen: + +GetSplitSize() - Liefert die Breite des TabBars zurueck, auf die der + Anwender das Fenster resizen will. Dabei wird keine + minimale oder maximale Breite beruecksichtigt. Es wird + jedoch nie eine Breite < 5 zurueckgeliefert. Diese Methode + liefert nur solange richtige Werte, wie Splitten aktiv + ist. + +GetMinSize() - Mit dieser Methode kann eine minimale Fensterbreite + abgefragt werden, so das min. etwas eines Tabs sichtbar + ist. Jedoch kann der TabBar immer noch schmaler gesetzt + werden, als die Breite, die diese Methode zurueckliefert. + Diese Methode kann auch aufgerufen werden, wenn kein + Splitten aktiv ist. + + +Edit-Modus +---------- + +Der Tabbar bietet auch Moeglichkeiten, das der Anwender in den Tabreitern +die Namen aendern kann. + +EnableEditMode - Damit kann eingestellt werden, das bei Alt+LeftClick + StartEditMode() automatisch vom TabBar gerufen wird. + Im StartRenaming()-Handler kann dann das Umbenennen + noch abgelehnt werden. +StartEditMode - Mit dieser Methode wird der EditModus auf einem + Tab gestartet. FALSE wird zurueckgegeben, wenn + der Editmodus schon aktiv ist, mit StartRenaming() + der Modus abgelehnt wurde oder kein Platz zum + Editieren vorhanden ist. +EndEditMode - Mit dieser Methode wird der EditModus beendet. +SetEditText - Mit dieser Methode kann der Text im AllowRenaming()- + Handler noch durch einen anderen Text ersetzt werden. +GetEditText - Mit dieser Methode kann im AllowRenaming()-Handler + der Text abgefragt werden, den der Anwender eingegeben + hat. +IsInEditMode - Mit dieser Methode kann abgefragt werden, ob der + Editmodus aktiv ist. +IsEditModeCanceled - Mit dieser Methode kann im EndRenaming()- + Handler abgefragt werden, ob die Umbenenung + abgebrochen wurde. +GetEditPageId - Mit dieser Methode wird in den Renaming-Handlern + abgefragt, welcher Tab umbenannt wird/wurde. + +StartRenaming() - Dieser Handler wird gerufen, wenn ueber StartEditMode() + der Editmodus gestartet wurde. Mit GetEditPageId() + kann abgefragt werden, welcher Tab umbenannt werden + soll. FALSE sollte zurueckgegeben werden, wenn + der Editmodus nicht gestartet werden soll. +AllowRenaming() - Dieser Handler wird gerufen, wenn der Editmodus + beendet wird (nicht bei Cancel). In diesem Handler + kann dann getestet werden, ob der Text OK ist. + Mit GetEditPageId() kann abgefragt werden, welcher Tab + umbenannt wurde. + Es sollte einer der folgenden Werte zurueckgegeben + werden: + TAB_RENAMING_YES + Der Tab wird umbenannt. + TAB_RENAMING_NO + Der Tab wird nicht umbenannt, der Editmodus bleibt + jedoch aktiv, so das der Anwender den Namen + entsprechent anpassen kann. + TAB_RENAMING_CANCEL + Der Editmodus wird abgebrochen und der alte + Text wieder hergestellt. +EndRenaming() - Dieser Handler wird gerufen, wenn der Editmodus + beendet wurde. Mit GetEditPageId() kann abgefragt + werden, welcher Tab umbenannt wurde. Mit + IsEditModeCanceled() kann abgefragt werden, ob der + Modus abgebrochen wurde und der Name dadurch nicht + geaendert wurde. + + +Maximale Pagebreite +------------------- + +Die Pagebreite der Tabs kann begrenzt werden, damit ein einfacheres +Navigieren ueber diese moeglich ist. Wenn der Text dann nicht komplett +angezeigt werden kann, wird er mit ... abgekuerzt und in der Tip- +oder der aktiven Hilfe (wenn kein Hilfetext gesetzt ist) wird dann der +ganze Text angezeigt. Mit EnableAutoMaxPageWidth() kann eingestellt +werden, ob die maximale Pagebreite sich nach der gerade sichtbaren +Breite richten soll (ist der default). Ansonsten kann auch die +maximale Pagebreite mit SetMaxPageWidth() (in Pixeln) gesetzt werden +(die AutoMaxPageWidth wird dann ignoriert). + + +KontextMenu +----------- + +Wenn ein kontextsensitives PopupMenu anzeigt werden soll, muss der +Command-Handler ueberlagert werden. Mit GetPageId() und bei +Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick +ueber einem bzw. ueber welchem Item durchgefuehrt wurde. +*/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_RANGESELECT ((WinBits)0x00200000) +#define WB_MULTISELECT ((WinBits)0x00400000) +#define WB_TOPBORDER ((WinBits)0x04000000) +#define WB_3DTAB ((WinBits)0x08000000) +#define WB_MINSCROLL ((WinBits)0x20000000) +#define WB_STDTABBAR WB_BORDER + +// ------------------ +// - TabBarPageBits - +// ------------------ + +typedef USHORT TabBarPageBits; + +// ------------------------- +// - Bits fuer TabBarPages - +// ------------------------- + +#define TPB_SPECIAL ((TabBarPageBits)0x0001) + +// ---------------- +// - TabBar-Types - +// ---------------- + +#define TABBAR_APPEND ((USHORT)0xFFFF) +#define TABBAR_PAGE_NOTFOUND ((USHORT)0xFFFF) + +#define TABBAR_RENAMING_YES ((long)TRUE) +#define TABBAR_RENAMING_NO ((long)FALSE) +#define TABBAR_RENAMING_CANCEL ((long)2) + +// ---------- +// - TabBar - +// ---------- +struct TabBar_Impl; + +class SVT_DLLPUBLIC TabBar : public Window +{ + friend class ImplTabButton; + friend class ImplTabSizer; + +private: + ImplTabBarList* mpItemList; + ImplTabButton* mpFirstBtn; + ImplTabButton* mpPrevBtn; + ImplTabButton* mpNextBtn; + ImplTabButton* mpLastBtn; + TabBar_Impl* mpImpl; + TabBarEdit* mpEdit; + XubString maEditText; + Color maSelColor; + Color maSelTextColor; + Size maWinSize; + long mnMaxPageWidth; + long mnCurMaxWidth; + long mnOffX; + long mnOffY; + long mnLastOffX; + long mnSplitSize; + ULONG mnSwitchTime; + WinBits mnWinStyle; + USHORT mnCurPageId; + USHORT mnFirstPos; + USHORT mnDropPos; + USHORT mnSwitchId; + USHORT mnEditId; + BOOL mbFormat; + BOOL mbFirstFormat; + BOOL mbSizeFormat; + BOOL mbAutoMaxWidth; + BOOL mbInSwitching; + BOOL mbAutoEditMode; + BOOL mbEditCanceled; + BOOL mbDropPos; + BOOL mbInSelect; + BOOL mbSelColor; + BOOL mbSelTextColor; + BOOL mbMirrored; + Link maSelectHdl; + Link maDoubleClickHdl; + Link maSplitHdl; + Link maActivatePageHdl; + Link maDeactivatePageHdl; + Link maStartRenamingHdl; + Link maAllowRenamingHdl; + Link maEndRenamingHdl; + + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bBackground ); + SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, + Color& rSelectColor, Color& rSelectTextColor ); + SVT_DLLPRIVATE void ImplShowPage( USHORT nPos ); + SVT_DLLPRIVATE BOOL ImplCalcWidth(); + SVT_DLLPRIVATE void ImplFormat(); + SVT_DLLPRIVATE USHORT ImplGetLastFirstPos(); + SVT_DLLPRIVATE void ImplInitControls(); + SVT_DLLPRIVATE void ImplEnableControls(); + SVT_DLLPRIVATE void ImplSelect(); + SVT_DLLPRIVATE void ImplActivatePage(); + SVT_DLLPRIVATE long ImplDeactivatePage(); + DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* ); + +public: + TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); + virtual ~TabBar(); + + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void Select(); + virtual void DoubleClick(); + virtual void Split(); + virtual void ActivatePage(); + virtual long DeactivatePage(); + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + virtual void Mirror(); + + void InsertPage( USHORT nPageId, const XubString& rText, + TabBarPageBits nBits = 0, + USHORT nPos = TABBAR_APPEND ); + void RemovePage( USHORT nPageId ); + void MovePage( USHORT nPageId, USHORT nNewPos ); + void Clear(); + + void EnablePage( USHORT nPageId, BOOL bEnable = TRUE ); + BOOL IsPageEnabled( USHORT nPageId ) const; + + void SetPageBits( USHORT nPageId, TabBarPageBits nBits = 0 ); + TabBarPageBits GetPageBits( USHORT nPageId ) const; + + USHORT GetPageCount() const; + USHORT GetPageId( USHORT nPos ) const; + USHORT GetPagePos( USHORT nPageId ) const; + USHORT GetPageId( const Point& rPos ) const; + Rectangle GetPageRect( USHORT nPageId ) const; + // returns the rectangle in which page tabs are drawn + Rectangle GetPageArea() const; + + void SetCurPageId( USHORT nPageId ); + USHORT GetCurPageId() const { return mnCurPageId; } + + void SetFirstPageId( USHORT nPageId ); + USHORT GetFirstPageId() const { return GetPageId( mnFirstPos ); } + void MakeVisible( USHORT nPageId ); + + void SelectPage( USHORT nPageId, BOOL bSelect = TRUE ); + void SelectPageRange( BOOL bSelect = FALSE, + USHORT nStartPos = 0, + USHORT nEndPos = TABBAR_APPEND ); + USHORT GetSelectPage( USHORT nSelIndex = 0 ) const; + USHORT GetSelectPageCount() const; + BOOL IsPageSelected( USHORT nPageId ) const; + + void EnableAutoMaxPageWidth( BOOL bEnable = TRUE ) { mbAutoMaxWidth = bEnable; } + BOOL IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } + void SetMaxPageWidth( long nMaxWidth ); + long GetMaxPageWidth() const { return mnMaxPageWidth; } + void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } + BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + + void EnableEditMode( BOOL bEnable = TRUE ) { mbAutoEditMode = bEnable; } + BOOL IsEditModeEnabled() const { return mbAutoEditMode; } + BOOL StartEditMode( USHORT nPageId ); + void EndEditMode( BOOL bCancel = FALSE ); + void SetEditText( const XubString& rText ) { maEditText = rText; } + const XubString& GetEditText() const { return maEditText; } + BOOL IsInEditMode() const { return (mpEdit != NULL); } + BOOL IsEditModeCanceled() const { return mbEditCanceled; } + USHORT GetEditPageId() const { return mnEditId; } + + /** Mirrors the entire control including position of buttons and splitter. + Mirroring is done relative to the current direction of the GUI. + @param bMirrored TRUE = the control will draw itself RTL in LTR GUI, + and vice versa; FALSE = the control behaves according to the + current direction of the GUI. */ + void SetMirrored( BOOL bMirrored = TRUE ); + /** Returns TRUE, if the control is set to mirrored mode (see SetMirrored()). */ + BOOL IsMirrored() const { return mbMirrored; } + + /** Sets the control to LTR or RTL mode regardless of the GUI direction. + @param bRTL FALSE = the control will draw from left to right; + TRUE = the control will draw from right to left. */ + void SetEffectiveRTL( BOOL bRTL ); + /** Returns TRUE, if the control draws from right to left (see SetEffectiveRTL()). */ + BOOL IsEffectiveRTL() const; + + BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + USHORT ShowDropPos( const Point& rPos ); + void HideDropPos(); + BOOL SwitchPage( const Point& rPos ); + void EndSwitchPage(); + BOOL IsInSwitching() { return mbInSwitching; } + + void SetSelectColor(); + void SetSelectColor( const Color& rColor ); + const Color& GetSelectColor() const { return maSelColor; } + BOOL IsSelectColor() const { return mbSelColor; } + void SetSelectTextColor(); + void SetSelectTextColor( const Color& rColor ); + const Color& GetSelectTextColor() const { return maSelTextColor; } + BOOL IsSelectTextColor() const { return mbSelTextColor; } + + void SetPageText( USHORT nPageId, const XubString& rText ); + XubString GetPageText( USHORT nPageId ) const; + void SetHelpText( USHORT nPageId, const XubString& rText ); + XubString GetHelpText( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, ULONG nHelpId ); + ULONG GetHelpId( USHORT nPageId ) const; + + long GetSplitSize() const { return mnSplitSize; } + long GetMinSize() const; + + void SetHelpText( const XubString& rText ) + { Window::SetHelpText( rText ); } + XubString GetHelpText() const + { return Window::GetHelpText(); }; + void SetHelpId( ULONG nId ) + { Window::SetHelpId( nId ); } + ULONG GetHelpId() const + { return Window::GetHelpId(); } + + void SetStyle( WinBits nStyle ); + WinBits GetStyle() const { return mnWinStyle; } + + Size CalcWindowSizePixel() const; + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } + const Link& GetSplitHdl() const { return maSplitHdl; } + void SetActivatePageHdl( const Link& rLink ) { maActivatePageHdl = rLink; } + const Link& GetActivatePageHdl() const { return maActivatePageHdl; } + void SetDeactivatePageHdl( const Link& rLink ) { maDeactivatePageHdl = rLink; } + const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl; } + void SetStartRenamingHdl( const Link& rLink ) { maStartRenamingHdl = rLink; } + const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; } + void SetAllowRenamingHdl( const Link& rLink ) { maAllowRenamingHdl = rLink; } + const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; } + void SetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl = rLink; } + const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; } + + // accessibility + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); +}; + +#endif // _TABBAR_HXX diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx new file mode 100644 index 000000000000..af373749248c --- /dev/null +++ b/svtools/inc/svtools/taskbar.hxx @@ -0,0 +1,493 @@ +/************************************************************************* + * + * 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: taskbar.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TASKBAR_HXX +#define _TASKBAR_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _TOOLS_LIST_HXX +#include +#endif +#include +#include +#include + +class TaskBar; +class TaskStatusFieldItem; +class ImplTaskItemList; +class ImplTaskSBItemList; +class ImplTaskBarFloat; +struct ImplTaskSBFldItem; + +// ----------------- +// - Dokumentation - +// ----------------- + +/* + +TaskToolBox +=========== + +StartUpdateTask()/UpdateTask()/EndUpdateTask() +Diese muessen gerufen werden, wenn die Task upgedatet werden muessen. +Dann muss StartUpdateTask() gerufen werden, dann UpdateTask() fuer alle +Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend +neu angeordnet werden. + +ActivateTask() +Handler der gerufen wird, wenn ein Task aktiviert werden muss. Mit +GetTaskItem() kann abgefragt werden, welcher Task aktiviert werden muss. + +ContextMenu() +Dieser Handler wird gerufen, wenn ein ContextMenu angezeigt werden soll. +Mit GetTaskMode() kann abgefragt werden, ob fuer einen Task oder ein +Item. + +GetTaskItem() +Diese Methode liefert das Item zurueck, welches bei UpdateTask an der +entsprechenden Position eingefuegt wurde. + +GetContextMenuPos() +Liefert die Position zurueck, wo das Contextmenu angezeigt werden soll. + + +TaskStatusBar +============= + +InsertStatusField()/RemoveStatusField() +Fuegt ein Statusfeld ein, wo die aktuelle Uhrzeit angezeigt wird. In +dieses Feld koennen dann mit AddStatusFielItem(), ModifyStatusFielItem() +und RemoveStatusFielItem() Status-Items eingefuegt werden. Bei diesen +muss man ein Image angeben, welches dann angezeigt wird. Ausserdem kann +man bei diesen noch Hilfe-Texte angeben oder sagen, ob sie blinken +sollen und ein Notify-Object, worueber man informiert wird, wenn ein +Kontextmenu angezeigt wird oder das Item angeklickt wird. Am +TaskStatusBar kann auch ein Notify-Object gesetzt werden, wenn man +benachrichtigt werden will, wenn die Uhrzeit oder die TaskStatusBar +angeklickt wird. Wenn der Notify fuer die Uhrzeit kommt, ist die +Id TASKSTATUSBAR_CLOCKID, wenn er fuer die TaskStatusBar kommt, ist +die Id 0. Mit SetFieldFlags() kann am TaskStatusBar auch die Flags +hinterher umgesetzt werden, um zum Beispiel die Uhrzeit ein- und +auszuschalten. + + +TaskBar +======= + +Erlaubte StyleBits +------------------ + +WB_BORDER - Border an der oberen Kante +WB_SIZEABLE - Zwischen TaskToolBox und TaskStatusBar kann der Anwender + die Groesse aendern. + +Wenn WB_SIZEABLE gesetzt ist, kann die Breite des StatusBars gesetzt und +abgefragt werden. Dazu kann man SetStatusSize()/GetStatusSize() aufrufen. +0 steht dabei fuer optimale Groesse, was auch der Default ist. Bei einem +Doppelklick auf den Trenner kann der Anwender auch wieder die optimale +Groesse einstellen. + +Wichtige Methoden +------------------ + +virtual TaskToolBox* TaskBar::CreateButtonBar(); +virtual TaskToolBox* TaskBar::CreateTaskToolBox(); +virtual TaskStatusBar* TaskBar::CreateTaskStatusBar(); + +Diese Methoden muesste man ueberladen, wenn man eine eigene Klasse anlegen +will. + +void TaskBar::ShowStatusText( const String& rText ); +void TaskBar::HideStatusText(); + +Blendet den ButtonBar und die TaskBar ein bzw. aus um den Hilfetexte in der +gesammten Zeile anzuzeigen. +*/ + +// ----------------- +// - TaskButtonBar - +// ----------------- + +class TaskButtonBar : public ToolBox +{ + friend class TaskBar; + +private: + TaskBar* mpNotifyTaskBar; + void* mpDummy1; + void* mpDummy2; + void* mpDummy3; + void* mpDummy4; + +public: + TaskButtonBar( Window* pParent, WinBits nWinStyle = 0 ); + ~TaskButtonBar(); + + virtual void RequestHelp( const HelpEvent& rHEvt ); + + void InsertButton( USHORT nItemId, + const Image& rImage, const String& rText, + USHORT nPos = TOOLBOX_APPEND ) + { InsertItem( nItemId, rImage, rText, TIB_LEFT | TIB_AUTOSIZE, nPos ); } + void RemoveButton( USHORT nItemId ) + { RemoveItem( nItemId ); } +}; + +// --------------------- +// - TaskToolBox-Types - +// --------------------- + +#define TASKTOOLBOX_TASK_NOTFOUND ((USHORT)0xFFFF) + +// --------------- +// - TaskToolBox - +// --------------- + +class SVT_DLLPUBLIC TaskToolBox : public ToolBox +{ + friend class TaskBar; + +private: + ImplTaskItemList* mpItemList; + TaskBar* mpNotifyTaskBar; + Point maContextMenuPos; + ULONG mnOldItemCount; + long mnMaxTextWidth; + long mnDummy1; + USHORT mnUpdatePos; + USHORT mnUpdateNewPos; + USHORT mnActiveItemId; + USHORT mnNewActivePos; + USHORT mnTaskItem; + USHORT mnSmallItem; + USHORT mnDummy2; + BOOL mbMinActivate; + BOOL mbDummy1; + Link maActivateTaskHdl; + Link maContextMenuHdl; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplFormatTaskToolBox(); +#endif + + // Forbidden and not implemented. + TaskToolBox (const TaskToolBox &); + TaskToolBox & operator= (const TaskToolBox &); + +public: + TaskToolBox( Window* pParent, WinBits nWinStyle = 0 ); + ~TaskToolBox(); + + void ActivateTaskItem( USHORT nItemId, + BOOL bMinActivate = FALSE ); + USHORT GetTaskItem( const Point& rPos ) const; + + virtual void ActivateTask(); + virtual void ContextMenu(); + + virtual void Select(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + + void StartUpdateTask(); + void UpdateTask( const Image& rImage, const String& rText, + BOOL bActive = FALSE ); + void EndUpdateTask(); + + const Point& GetContextMenuPos() const { return maContextMenuPos; } + USHORT GetTaskItem() const { return mnTaskItem; } + BOOL IsMinActivate() const { return mbMinActivate; } + + void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; } + const Link& GetActivateTaskHdl() const { return maActivateTaskHdl; } + void SetContextMenuHdl( const Link& rLink ) { maContextMenuHdl = rLink; } + const Link& GetContextMenuHdl() const { return maContextMenuHdl; } +}; + +inline USHORT TaskToolBox::GetTaskItem( const Point& rPos ) const +{ + USHORT nId = GetItemId( rPos ); + if ( nId ) + return nId-1; + else + return TASKTOOLBOX_TASK_NOTFOUND; +} + +// --------------------- +// - ITaskStatusNotify - +// --------------------- + +class ITaskStatusNotify +{ +public: + virtual BOOL MouseButtonDown( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL MouseButtonUp( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL MouseMove( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL Command( USHORT nItemd, const CommandEvent& rCEvt ); + virtual BOOL UpdateHelp( USHORT nItemd ); +}; + +// ----------------------- +// - TaskStatusFieldItem - +// ----------------------- + +#define TASKSTATUSFIELDITEM_FLASH ((USHORT)0x0001) + +class TaskStatusFieldItem +{ +private: + ITaskStatusNotify* mpNotify; + Image maImage; + XubString maQuickHelpText; + XubString maHelpText; + ULONG mnHelpId; + USHORT mnFlags; + +public: + TaskStatusFieldItem(); + TaskStatusFieldItem( const TaskStatusFieldItem& rItem ); + TaskStatusFieldItem( ITaskStatusNotify* pNotify, + const Image& rImage, + const XubString& rQuickHelpText, + const XubString& rHelpText, + USHORT nFlags ); + ~TaskStatusFieldItem(); + + void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } + ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } + void SetImage( const Image& rImage ) { maImage = rImage; } + const Image& GetImage() const { return maImage; } + void SetQuickHelpText( const XubString& rStr ) { maQuickHelpText = rStr; } + const XubString& GetQuickHelpText() const { return maQuickHelpText; } + void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } + const XubString& GetHelpText() const { return maHelpText; } + void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } + ULONG GetHelpId() const { return mnHelpId; } + void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } + USHORT GetFlags() const { return mnFlags; } + + const TaskStatusFieldItem& operator=( const TaskStatusFieldItem& rItem ); +}; + +// ----------------- +// - TaskStatusBar - +// ----------------- + +#define TASKSTATUSBAR_STATUSFIELDID ((USHORT)61000) + +#define TASKSTATUSBAR_CLOCKID ((USHORT)61000) +#define TASKSTATUSFIELD_CLOCK ((USHORT)0x0001) + +class SVT_DLLPUBLIC TaskStatusBar : public StatusBar +{ + friend class TaskBar; + +private: + ImplTaskSBItemList* mpFieldItemList; + TaskBar* mpNotifyTaskBar; + ITaskStatusNotify* mpNotify; + Time maTime; + XubString maTimeText; + AutoTimer maTimer; + long mnClockWidth; + long mnItemWidth; + long mnFieldWidth; + USHORT mnFieldFlags; + USHORT mnDummy1; + BOOL mbFlashItems; + BOOL mbOutInterval; + BOOL mbDummy1; + BOOL mbDummy2; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( USHORT nItemId ) const; + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, BOOL& rFieldRect ) const; + SVT_DLLPRIVATE BOOL ImplUpdateClock(); + SVT_DLLPRIVATE BOOL ImplUpdateFlashItems(); + SVT_DLLPRIVATE void ImplUpdateField( BOOL bItems ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); +#endif + +public: + TaskStatusBar( Window* pParent, WinBits nWinStyle = WB_LEFT ); + ~TaskStatusBar(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + void InsertStatusField( long nOffset = STATUSBAR_OFFSET, + USHORT nPos = STATUSBAR_APPEND, + USHORT nFlags = TASKSTATUSFIELD_CLOCK ); + void RemoveStatusField() + { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } + void SetFieldFlags( USHORT nFlags ); + USHORT GetFieldFlags() const { return mnFieldFlags; } + void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } + ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } + + void AddStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem, + USHORT nPos = 0xFFFF ); + void ModifyStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem ); + void RemoveStatusFieldItem( USHORT nItemId ); + BOOL GetStatusFieldItem( USHORT nItemId, TaskStatusFieldItem& rItem ) const; +}; + +// ----------- +// - TaskBar - +// ----------- + +class SVT_DLLPUBLIC TaskBar : public Window +{ +private: + ImplTaskBarFloat* mpAutoHideBar; + TaskButtonBar* mpButtonBar; + TaskToolBox* mpTaskToolBox; + TaskStatusBar* mpStatusBar; + void* mpDummy1; + void* mpDummy2; + void* mpDummy3; + void* mpDummy4; + String maOldText; + long mnStatusWidth; + long mnMouseOff; + long mnOldStatusWidth; + long mnDummy1; + long mnDummy2; + long mnDummy3; + long mnDummy4; + WinBits mnWinBits; + USHORT mnLines; + BOOL mbStatusText; + BOOL mbShowItems; + BOOL mbAutoHide; + BOOL mbAlignDummy1; + BOOL mbDummy1; + BOOL mbDummy2; + BOOL mbDummy3; + BOOL mbDummy4; + Link maTaskResizeHdl; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplInitSettings(); + SVT_DLLPRIVATE void ImplNewHeight( long nNewHeight ); +#endif + +public: + TaskBar( Window* pParent, WinBits nWinStyle = WB_BORDER | WB_SIZEABLE ); + ~TaskBar(); + + virtual void TaskResize(); + + virtual TaskButtonBar* CreateButtonBar(); + virtual TaskToolBox* CreateTaskToolBox(); + virtual TaskStatusBar* CreateTaskStatusBar(); + + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + void Format(); + + void SetLines( USHORT nLines ); + USHORT GetLines() const { return mnLines; } + void EnableAutoHide( BOOL bAutoHide = TRUE ); + BOOL IsAutoHideEnabled() const { return mbAutoHide; } + + void ShowStatusText( const String& rText ); + void HideStatusText(); + + void SetStatusSize( long nNewSize ) + { mnStatusWidth=nNewSize; Resize(); } + long GetStatusSize() const { return mnStatusWidth; } + + Size CalcWindowSizePixel() const; + + TaskButtonBar* GetButtonBar() const; + TaskToolBox* GetTaskToolBox() const; + TaskStatusBar* GetStatusBar() const; + + void SetTaskResizeHdl( const Link& rLink ) { maTaskResizeHdl = rLink; } + const Link& GetTaskResizeHdl() const { return maTaskResizeHdl; } +}; + +// ----------------------- +// - WindowArrange-Types - +// ----------------------- + +#define WINDOWARRANGE_TILE 1 +#define WINDOWARRANGE_HORZ 2 +#define WINDOWARRANGE_VERT 3 +#define WINDOWARRANGE_CASCADE 4 + +class ImplWindowArrangeList; + +// ----------------------- +// - class WindowArrange - +// ----------------------- + +class SVT_DLLPUBLIC WindowArrange +{ +private: + List* mpWinList; + void* mpDummy; + ULONG mnDummy; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplHorz( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplVert( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplCascade( const Rectangle& rRect ); +#endif + +public: + WindowArrange(); + ~WindowArrange(); + + void AddWindow( Window* pWindow, ULONG nPos = LIST_APPEND ) + { mpWinList->Insert( (void*)pWindow, nPos ); } + void RemoveAllWindows() + { mpWinList->Clear(); } + + void Arrange( USHORT nType, const Rectangle& rRect ); +}; + +#endif // _TASKBAR_HXX diff --git a/svtools/inc/svtools/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx new file mode 100644 index 000000000000..8a6b6d9c1a3a --- /dev/null +++ b/svtools/inc/svtools/templatefoldercache.hxx @@ -0,0 +1,111 @@ +/************************************************************************* + * + * 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: templatefoldercache.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SFX2_TEMPLATEFOLDERCACHE_HXX +#define SFX2_TEMPLATEFOLDERCACHE_HXX + +#include "svtools/svtdllapi.h" +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //===================================================================== + //= TemplateFolderCache + //===================================================================== + class TemplateFolderCacheImpl; + /** allows to cache the state of the template directories of OOo +

    Usually, this class is used together with an instance of a the + DocumentTemplates service. It allows to scan the template folders + of the Office, and updates the configuration so that it reflects the most recent state of the folders.
    + As this is an expensive, the TemplateFolderCache has been introduced. It caches the state of the template + folders, and allows to determine if the DocumentTemplates service needs to be invoked to do the (much more expensive) + update.

    + @example C++ + + TemplateFolderCache aTemplateFolders; + if ( aTemplateFolders.needsUpdate() ) + { + // store the current state + aCache.storeState(); + + // create the DocumentTemplates instance + Reference< XDocumentTemplates > xTemplates = ...; + + // update the templates configuration + xTemplates->update(); + } + + // do anything which relies on a up-to-date template configuration + + */ + class SVT_DLLPUBLIC TemplateFolderCache + { + private: + TemplateFolderCacheImpl* m_pImpl; + + public: + /** ctor. + @param _bAutoStoreState + Set this to if you want the instance to automatically store the state of the template folders upon + destruction.
    + If set to , you would epplicitly need to call storeState to do this.
    + If the current state is not known (e.g. because you did not call needsUpdate, which retrieves it), + it is not retrieved in the dtor, regardless of the _bAutoStoreState flag. + */ + TemplateFolderCache( sal_Bool _bAutoStoreState = sal_False ); + ~TemplateFolderCache( ); + + /** determines whether or not the template configuration needs to be updated + @param _bForceCheck + set this to if you want the object to rescan the template folders in every case. The default () + means that once the information has been retrieved in a first call, every second call returns the same result + as the first one, even if in the meantime the template folders changed. + @return + if the template configuration needs to be updated + */ + sal_Bool needsUpdate( sal_Bool _bForceCheck = sal_False ); + + /** stores the current state of the template folders in the cache + @param _bForceRetrieval + if set to , the current state of the template folders is retrieved again, even if it is already known. + Usually, you set this to : After calling needsUpdate, the state is know and does not + need to be read again. + */ + void storeState( sal_Bool _bForceRetrieval = sal_False ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // SFX2_TEMPLATEFOLDERCACHE_HXX diff --git a/svtools/inc/svtools/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx new file mode 100644 index 000000000000..4b2d644d6f6b --- /dev/null +++ b/svtools/inc/svtools/templdlg.hxx @@ -0,0 +1,95 @@ +/************************************************************************* + * + * 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: templdlg.hxx,v $ + * $Revision: 1.16 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_TEMPLDLG_HXX +#define _SVTOOLS_TEMPLDLG_HXX + +#include "svtools/svtdllapi.h" + +#include +#include +#include +#include + +struct SvtTmplDlg_Impl; + +// class SvtDocumentTemplateDialog --------------------------------------- + +class SvtTemplateWindow; + +class SVT_DLLPUBLIC SvtDocumentTemplateDialog : public ModalDialog +{ +private: + svt::FixedHyperlink aMoreTemplatesLink; + FixedLine aLine; + PushButton aManageBtn; + PushButton aEditBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + + SvtTmplDlg_Impl* pImpl; + + DECL_DLLPRIVATE_LINK( SelectHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* ); + DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, PushButton* ); + DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* ); + DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, svt::FixedHyperlink* ); + +public: + SvtDocumentTemplateDialog( Window* pParent ); + + /** ctor for calling the dialog for selection only, not for opening a document +

    If you use this ctor, the dialog will behave differently in the following areas: +

    • The Edit button will be hidden.
      • +
    • Upon pressing em>Open, the selected file will not be opened. Instead, it's + URL is available (see GetSelectedFileURL).
      • +
    + + */ + struct SelectOnly { }; + SvtDocumentTemplateDialog( Window* _pParent, SelectOnly ); + + ~SvtDocumentTemplateDialog(); + + sal_Bool IsFileSelected( ) const; + String GetSelectedFileURL( ) const; + + void SelectTemplateFolder(); + +private: + SVT_DLLPRIVATE void InitImpl( ); + SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; +}; + +#endif // _SVTOOLS_TEMPLDLG_HXX + diff --git a/svtools/inc/svtools/testtool.hxx b/svtools/inc/svtools/testtool.hxx new file mode 100644 index 000000000000..5d4ec5c6208e --- /dev/null +++ b/svtools/inc/svtools/testtool.hxx @@ -0,0 +1,78 @@ +/************************************************************************* + * + * 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: testtool.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVTOOLS_TESTTOOL_HXX +#define SVTOOLS_TESTTOOL_HXX + +#include +#include +#include + +class Application; +class SvStream; + +class StatementFlow; +class CommunicationManager; +class CommunicationLink; +#if OSL_DEBUG_LEVEL > 1 +class EditWindow; +#endif +class ImplRC; + +class RemoteControl +{ + friend class StatementFlow; + + BOOL m_bIdleInserted; +#if OSL_DEBUG_LEVEL > 1 + EditWindow *m_pDbgWin; +#endif + ImplRC* pImplRC; + +public: + RemoteControl(); + ~RemoteControl(); + BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); + SvStream* GetReturnStream(); + + DECL_LINK( IdleHdl, Application* ); + DECL_LINK( CommandHdl, Application* ); + + DECL_LINK( QueCommandsEvent, CommunicationLink* ); + ULONG nStoredServiceId; + SvStream *pStoredStream; + + void ExecuteURL( String &aURL ); + +protected: + CommunicationManager *pServiceMgr; + SvStream *pRetStream; +}; + +#endif // SVTOOLS_TESTTOOL_HXX diff --git a/svtools/inc/svtools/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx new file mode 100644 index 000000000000..a72a2042a9cc --- /dev/null +++ b/svtools/inc/svtools/tooltiplbox.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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: tooltiplbox.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_TOOLTIPLBOX_HXX +#define SVTOOLS_TOOLTIPLBOX_HXX + +#include "svtools/svtdllapi.h" +#include + +namespace svtools { + +// ============================================================================ + +/** ListBox with tool tips for long entries. */ +class ToolTipListBox : public ListBox +{ +public: + ToolTipListBox( Window* pParent, WinBits nStyle = WB_BORDER ); + ToolTipListBox( Window* pParent, const ResId& rResId ); + +protected: + virtual void RequestHelp( const HelpEvent& rHEvt ); +}; + +// ---------------------------------------------------------------------------- + +/** MultiListBox with tool tips for long entries. */ +class SVT_DLLPUBLIC ToolTipMultiListBox : public MultiListBox +{ +public: + ToolTipMultiListBox( Window* pParent, WinBits nStyle = WB_BORDER ); + ToolTipMultiListBox( Window* pParent, const ResId& rResId ); + +protected: + virtual void RequestHelp( const HelpEvent& rHEvt ); +}; + +// ============================================================================ + +} // namespace svtools + +#endif + diff --git a/svtools/inc/svtools/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx new file mode 100644 index 000000000000..4d4432f782bb --- /dev/null +++ b/svtools/inc/svtools/txtattr.hxx @@ -0,0 +1,238 @@ +/************************************************************************* + * + * 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: txtattr.hxx,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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TXTATTR_HXX +#define _TXTATTR_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include + +class Font; + +#define TEXTATTR_INVALID 0 +#define TEXTATTR_FONTCOLOR 1 +#define TEXTATTR_HYPERLINK 2 +#define TEXTATTR_FONTWEIGHT 3 + +#define TEXTATTR_USER_START 1000 //start id for user defined text attributes +#define TEXTATTR_PROTECTED 4 + + +class SVT_DLLPUBLIC TextAttrib +{ +private: + USHORT mnWhich; + +protected: + TextAttrib( USHORT nWhich ) { mnWhich = nWhich; } + TextAttrib( const TextAttrib& rAttr ) { mnWhich = rAttr.mnWhich; } + +public: + + virtual ~TextAttrib(); + + USHORT Which() const { return mnWhich; } + + virtual void SetFont( Font& rFont ) const = 0; + virtual TextAttrib* Clone() const = 0; + virtual int operator==( const TextAttrib& rAttr ) const = 0; + int operator!=( const TextAttrib& rAttr ) const + { return !(*this == rAttr ); } +}; + + + +class SVT_DLLPUBLIC TextAttribFontColor : public TextAttrib +{ +private: + Color maColor; + +public: + TextAttribFontColor( const Color& rColor ); + TextAttribFontColor( const TextAttribFontColor& rAttr ); + ~TextAttribFontColor(); + + const Color& GetColor() const { return maColor; } + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + +}; + +class SVT_DLLPUBLIC TextAttribFontWeight : public TextAttrib +{ +private: + FontWeight meWeight; + +public: + TextAttribFontWeight( FontWeight eWeight ); + TextAttribFontWeight( const TextAttribFontWeight& rAttr ); + ~TextAttribFontWeight(); + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + + inline FontWeight getFontWeight() const { return meWeight; } +}; + + +class TextAttribHyperLink : public TextAttrib +{ +private: + XubString maURL; + XubString maDescription; + Color maColor; + +public: + TextAttribHyperLink( const XubString& rURL ); + TextAttribHyperLink( const XubString& rURL, const XubString& rDescription ); + TextAttribHyperLink( const TextAttribHyperLink& rAttr ); + ~TextAttribHyperLink(); + + void SetURL( const XubString& rURL ) { maURL = rURL; } + const XubString& GetURL() const { return maURL; } + + void SetDescription( const XubString& rDescr ) { maDescription = rDescr; } + const XubString& GetDescription() const { return maDescription; } + + void SetColor( const Color& rColor ) { maColor = rColor; } + const Color& GetColor() const { return maColor; } + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; +}; + +class SVT_DLLPUBLIC TextAttribProtect : public TextAttrib +{ +public: + TextAttribProtect(); + TextAttribProtect( const TextAttribProtect& rAttr ); + ~TextAttribProtect(); + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + +}; + + +class TextCharAttrib +{ +private: + TextAttrib* mpAttr; + USHORT mnStart; + USHORT mnEnd; + +protected: + +public: + + TextCharAttrib( const TextAttrib& rAttr, USHORT nStart, USHORT nEnd ); + TextCharAttrib( const TextCharAttrib& rTextCharAttrib ); + ~TextCharAttrib(); + + const TextAttrib& GetAttr() const { return *mpAttr; } + + USHORT Which() const { return mpAttr->Which(); } + + USHORT GetStart() const { return mnStart; } + USHORT& GetStart() { return mnStart; } + + USHORT GetEnd() const { return mnEnd; } + USHORT& GetEnd() { return mnEnd; } + + inline USHORT GetLen() const; + + inline void MoveForward( USHORT nDiff ); + inline void MoveBackward( USHORT nDiff ); + + inline void Expand( USHORT nDiff ); + inline void Collaps( USHORT nDiff ); + + inline BOOL IsIn( USHORT nIndex ); + inline BOOL IsInside( USHORT nIndex ); + inline BOOL IsEmpty(); + +}; + +inline USHORT TextCharAttrib::GetLen() const +{ + DBG_ASSERT( mnEnd >= mnStart, "TextCharAttrib: nEnd < nStart!" ); + return mnEnd-mnStart; +} + +inline void TextCharAttrib::MoveForward( USHORT nDiff ) +{ + DBG_ASSERT( ((long)mnEnd + nDiff) <= 0xFFFF, "TextCharAttrib: MoveForward?!" ); + mnStart = mnStart + nDiff; + mnEnd = mnEnd + nDiff; +} + +inline void TextCharAttrib::MoveBackward( USHORT nDiff ) +{ + DBG_ASSERT( ((long)mnStart - nDiff) >= 0, "TextCharAttrib: MoveBackward?!" ); + mnStart = mnStart - nDiff; + mnEnd = mnEnd - nDiff; +} + +inline void TextCharAttrib::Expand( USHORT nDiff ) +{ + DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" ); + mnEnd = mnEnd + nDiff; +} + +inline void TextCharAttrib::Collaps( USHORT nDiff ) +{ + DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" ); + mnEnd = mnEnd - nDiff; +} + +inline BOOL TextCharAttrib::IsIn( USHORT nIndex ) +{ + return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); +} + +inline BOOL TextCharAttrib::IsInside( USHORT nIndex ) +{ + return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); +} + +inline BOOL TextCharAttrib::IsEmpty() +{ + return mnStart == mnEnd; +} + +#endif // _TXTATTR_HXX diff --git a/svtools/inc/svtools/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx new file mode 100644 index 000000000000..e40e578401cb --- /dev/null +++ b/svtools/inc/svtools/txtcmp.hxx @@ -0,0 +1,36 @@ +/************************************************************************* + * + * 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: txtcmp.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _TXTCMP_HXX +#define _TXTCMP_HXX + +#include + +#endif + diff --git a/svtools/inc/svtools/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx new file mode 100644 index 000000000000..e8507722e31b --- /dev/null +++ b/svtools/inc/svtools/unoevent.hxx @@ -0,0 +1,332 @@ +/************************************************************************* + * + * 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: unoevent.hxx,v $ + * $Revision: 1.5.136.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_UNOEVENT_HXX_ +#define _SVTOOLS_UNOEVENT_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include + +class SvxMacroTableDtor; +class SvxMacroItem; +class SvxMacro; + +/** SvEventDescription: Description of a single event. + mnEvent is the id used by SvxMacroItem + mpEventName is the api name for this event + + the last event in an array is indicated by mnEvent && mpEventName == 0 +*/ +struct SvEventDescription +{ + sal_uInt16 mnEvent; + const sal_Char* mpEventName; +}; + +/** + * SvBaseEventDescriptor: Abstract class that implements the basics + * of an XNameReplace that is delivered by the + * XEventsSupplier::getEvents() method. + * + * The functionality this class provides is: + * 1) Which elements are in the XNameReplace? + * 2) Mapping from Api names to item IDs. + * 3) conversion from SvxMacroItem to Any and vice versa. + * + * All details of how to actually get and set SvxMacroItem(s) have to + * be supplied by the base class. + */ +class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 +< + ::com::sun::star::container::XNameReplace, + ::com::sun::star::lang::XServiceInfo +> +{ + const ::rtl::OUString sEventType; + const ::rtl::OUString sMacroName; + const ::rtl::OUString sLibrary; + const ::rtl::OUString sStarBasic; + const ::rtl::OUString sJavaScript; + const ::rtl::OUString sScript; + const ::rtl::OUString sNone; + + + /// name of own service + const ::rtl::OUString sServiceName; + +protected: + const ::rtl::OUString sEmpty; + + /// last element is 0, 0 + const SvEventDescription* mpSupportedMacroItems; + sal_Int16 mnMacroItems; + +public: + + SvBaseEventDescriptor(const SvEventDescription* pSupportedMacroItems); + + virtual ~SvBaseEventDescriptor(); + + + // XNameReplace + /// calls replaceByName(const sal_uInt16, const SvxMacro&) + virtual void SAL_CALL replaceByName( + const ::rtl::OUString& rName, /// API name of event + const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + // XNameAccess (via XNameReplace) + /// calls getByName(sal_uInt16) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( + const ::rtl::OUString& rName ) /// API name of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + // XNameAxcess (via XNameReplace) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + getElementNames() + throw(::com::sun::star::uno::RuntimeException); + + // XNameAccess (via XNameReplace) + virtual sal_Bool SAL_CALL hasByName( + const ::rtl::OUString& rName ) + throw(::com::sun::star::uno::RuntimeException); + + // XElementAccess (via XNameReplace) + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() + throw(::com::sun::star::uno::RuntimeException); + + // XElementAccess (via XNameReplace) + virtual sal_Bool SAL_CALL hasElements() + throw(::com::sun::star::uno::RuntimeException); + + // XServiceInfo + /// must be implemented in subclass + virtual rtl::OUString SAL_CALL getImplementationName(void) + throw( ::com::sun::star::uno::RuntimeException ) = 0; + + // XServiceInfo + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + throw( ::com::sun::star::uno::RuntimeException ); + + // XServiceInfo + virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + getSupportedServiceNames(void) + throw( ::com::sun::star::uno::RuntimeException ); + +protected: + + /// Must be implemented in subclass. + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException) = 0; + + /// Must be implemented in subclass. + virtual void getByName( + SvxMacro& rMacro, + const sal_uInt16 nEvent ) + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException) = 0; + + /// convert an API event name to the event ID as used by SvxMacroItem + sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; + + /// convert an event ID to an API event name + ::rtl::OUString mapEventIDToName(sal_uInt16 nPoolID) const; + + /// get the event ID for the name; return 0 if not supported + sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; + + /// create PropertyValues and Any from macro + void getAnyFromMacro( + ::com::sun::star::uno::Any& aAny, // Any to be filled by Macro values + const SvxMacro& rMacro); + + /// create macro from PropertyValues (in an Any) + void getMacroFromAny( + SvxMacro& aMacro, // reference to be filled by Any + const ::com::sun::star::uno::Any& rAny) + throw ( + ::com::sun::star::lang::IllegalArgumentException); + +}; + + + + +/** + * SvEventDescriptor: Implement the XNameReplace that is delivered by + * the XEventsSupplier::getEvents() method. The SvEventDescriptor has + * to be subclassed to implement the events for a specific + * objects. The subclass has to + * 1) supply the super class constructor with a list of known events (item IDs) + * 2) supply the super class constructor with a reference of it's parent object + * (to prevent destruction) + * 3) implement getItem() and setItem(...) methods. + * + * If no object is available to which the SvEventDescriptor can attach itself, + * the class SvDetachedEventDescriptor should be used. + */ +class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor +{ + /// keep reference to parent to prevent it from being destroyed + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > xParentRef; + +public: + + SvEventDescriptor(::com::sun::star::uno::XInterface& rParent, + const SvEventDescription* pSupportedMacroItems); + + virtual ~SvEventDescriptor(); + + +protected: + + + using SvBaseEventDescriptor::replaceByName; + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + using SvBaseEventDescriptor::getByName; + virtual void getByName( + SvxMacro& rMacros, /// macro to be filled with values + const sal_uInt16 nEvent ) /// item ID of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + + /// Get the SvxMacroItem from the parent. + /// must be implemented by subclass + virtual const SvxMacroItem& getMacroItem() = 0; + + /// Set the SvxMacroItem at the parent. + /// must be implemented by subclass + virtual void setMacroItem(const SvxMacroItem& rItem) = 0; + + /// Get the SvxMacroItem Which Id needed for the current application + /// must be implemented by subclass + virtual sal_uInt16 getMacroItemWhich() const = 0; +}; + + +/** + * SvDetachedEventDescriptor: + */ +class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor +{ + // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] + SvxMacro** aMacros; + + const ::rtl::OUString sImplName; + +public: + + SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); + + virtual ~SvDetachedEventDescriptor(); + + //XServiceInfo + virtual rtl::OUString SAL_CALL getImplementationName(void) + throw( ::com::sun::star::uno::RuntimeException ); + +protected: + + sal_Int16 getIndex(const sal_uInt16 nID) const; + + using SvBaseEventDescriptor::replaceByName; + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + using SvBaseEventDescriptor::getByName; + virtual void getByName( + SvxMacro& rMacro, /// macro to be filled + const sal_uInt16 nEvent ) /// item ID of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + /// do we have an event? + /// return sal_True: we have a macro for the event + /// return sal_False: no macro; getByName() will return an empty macro + /// IllegalArgumentException: the event is not supported + using SvBaseEventDescriptor::hasByName; + virtual sal_Bool hasByName( + const sal_uInt16 nEvent ) const /// item ID of event + throw( + ::com::sun::star::lang::IllegalArgumentException); + +}; + +class SVT_DLLPUBLIC SvMacroTableEventDescriptor : public SvDetachedEventDescriptor +{ +public: + + SvMacroTableEventDescriptor(const SvEventDescription* pSupportedMacroItems); + SvMacroTableEventDescriptor(const SvxMacroTableDtor& aFmt, + const SvEventDescription* pSupportedMacroItems); + + virtual ~SvMacroTableEventDescriptor(); + + void copyMacrosFromTable(const SvxMacroTableDtor& aFmt); + void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); +}; + +#endif diff --git a/svtools/inc/svtools/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx new file mode 100644 index 000000000000..f3a5aae50844 --- /dev/null +++ b/svtools/inc/svtools/unoimap.hxx @@ -0,0 +1,48 @@ +/************************************************************************* + * + * 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: unoimap.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_UNOIMAP_HXX +#define _SVTOOLS_UNOIMAP_HXX + +#include "svtools/svtdllapi.h" +#include + +class ImageMap; +struct SvEventDescription; + +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); + +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap ); + +#endif diff --git a/svtools/inc/svtools/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx new file mode 100644 index 000000000000..7f3e04ce2a8c --- /dev/null +++ b/svtools/inc/svtools/wallitem.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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: wallitem.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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _WALLITEM_HXX +#define _WALLITEM_HXX + +#ifndef SHL_HXX +#include +#endif + +// ----------------------------------------------------------------------------------------- +// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb +// des SVX zu benutzen. Der Link wird im Konstruktor von SvxDialogDll gesetzt. +#ifndef _SFX_BRUSHITEMLINK_DECLARED +#define _SFX_BRUSHITEMLINK_DECLARED +#include + +#ifndef SHL_BRUSHITEM +#define SHL_BRUSHITEM SHL_SHL1 +#endif + +class Window; +class SfxItemSet; + +typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); +typedef USHORT* (*GetSvxBrushTabPageRanges)(); + +class Graphic; +class String; +class SfxBrushItemLink +{ +public: + virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0; + virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0; + virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0; + static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); } + static void Set( SfxBrushItemLink* pLink ); +}; +#endif // _SFX_BRUSHITEMLINK_DECLARED + +#endif // _WALLITEM_HXX + diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx deleted file mode 100644 index 2e570dfe2550..000000000000 --- a/svtools/inc/sychconv.hxx +++ /dev/null @@ -1,50 +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: sychconv.hxx,v $ - * $Revision: 1.3.136.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SYCHCONV_HXX -#define _SYCHCONV_HXX - -#include -#include - -// ---------------------- -// - CharacterConverter - -// ---------------------- - -class OutputDevice; - -class SymCharConverter -{ -public: - - static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); -}; - -#endif // _CHARCONV_HXX diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx deleted file mode 100644 index 5261697dd8b0..000000000000 --- a/svtools/inc/tabbar.hxx +++ /dev/null @@ -1,558 +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: tabbar.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TABBAR_HXX -#define _TABBAR_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -class MouseEvent; -class TrackingEvent; -class DataChangedEvent; -class ImplTabBarList; -class ImplTabButton; -class ImplTabSizer; -class TabBarEdit; - -// ----------------- -// - Dokumentation - -// ----------------- - -/* - -Erlaubte StyleBits ------------------- - -WB_SCROLL - Die Tabs koennen ueber ein Extra-Feld gescrollt werden -WB_MINSCROLL - Die Tabs koennen ueber 2 zusaetzliche Buttons gescrollt werden -WB_RANGESELECT - Zusammenhaengende Bereiche koennen selektiert werden -WB_MULTISELECT - Einzelne Tabs koennen selektiert werden -WB_BORDER - Oben und unten wird ein Strich gezeichnet -WB_TOPBORDER - Oben wird ein Border gezeichnet -WB_3DTAB - Die Tabs und der Border werden in 3D gezeichnet -WB_DRAG - Vom TabBar wird ein StartDrag-Handler gerufen, wenn - Drag and Drop gestartet werden soll. Es wird ausserdem - im TabBar mit EnableDrop() Drag and Drop eingeschaltet. -WB_SIZEABLE - Vom TabBar wird ein Split-Handler gerufen, wenn der Anwender - den TabBar in der Breite aendern will -WB_STDTABBAR - WB_BORDER - -Wenn man den TabBar zum Beispiel als Property-Bar benutzen moechte, sollten -die WinBits WB_TOPBORDER und WB_3DTAB anstatt WB_BORDER gesetzt werden. - - -Erlaubte PageBits ------------------ - -TPB_SPECIAL - Andere Darstellung des TabTextes, zum Beispiel fuer - Szenario-Seiten. - - -Handler -------- - -Select - Wird gerufen, wenn eine Tab selektiert oder - deselektiert wird -DoubleClick - Wird gerufen, wenn ein DoubleClick im TabBar ausgeloest - wurde. Innerhalb des Handlers liefert GetCurPageId() die - angeklickte Tab zurueck oder 0, wenn keine Tab angeklickt - wurde -ActivatePage - Wird gerufen, wenn eine andere Seite aktiviert wird. - GetCurPageId() gibt die aktivierte Seite zurueck. -DeactivatePage - Wird gerufen, wenn eine Seite deaktiviert wird. Wenn - eine andere Seite aktiviert werden darf, muss TRUE - zurueckgegeben werden, wenn eine andere Seite von - der Aktivierung ausgeschlossen werden soll, muss - FALSE zurueckgegeben werden. GetCurPageId() gibt die - zu deaktivierende Seite zurueck. - - - -Drag and Drop -------------- - -Fuer Drag and Drop muss das WinBit WB_DRAG gesetzt werden. Ausserdem -muss der Command-, QueryDrop-Handler und der Drop-Handler ueberlagert -werden. Dabei muss in den Handlern folgendes implementiert werden: - -Command - Wenn in diesem Handler das Dragging gestartet werden - soll, muss StartDrag() gerufen werden. Diese Methode - selektiert dann den entsprechenden Eintrag oder gibt - FALSE zurueck, wenn das Dragging nicht durchgefuhert - werden kann. - -QueryDrop - Dieser Handler wird von StarView immer dann gerufen, wenn - bei einem Drag-Vorgang die Maus ueber das Fenster gezogen - wird (siehe dazu auch SV-Doku). In diesem Handler muss - festgestellt werden, ob ein Drop moeglich ist. Die - Drop-Position kann im TabBar mit ShowDropPos() angezeigt - werden. Beim Aufruf muss die Position vom Event uebergeben - werden. Wenn sich die Position am linken oder rechten - Rand befindet, wird automatisch im TabBar gescrollt. - Diese Methode gibt auch die entsprechende Drop-Position - zurueck, die auch fuer ein Drop gebraucht wird. Wenn das - Fenster beim Drag verlassen wird, kann mit HideDropPos() - die DropPosition wieder weggenommen werden. Es ist dadurch - auch moeglich, ein von ausserhalb des TabBars ausgeloestes - Drag zu verarbeiten. - -Drop - Im Drop-Handler muessen dann die Pages verschoben werden, - oder die neuen Pages eingefuegt werden. Die entsprechende - Drop-Postion kann mit ShowDropPos() ermittelt werden. - -Folgende Methoden werden fuer Drag and Drop gebraucht und muessen von -den Handlern gerufen werden: - -StartDrag - Muss aus dem Commnad-Handler gerufen werden. Als Parameter - muss der CommandEvent uebergeben werden und eine Referenz - auf eine Region. Diese Region muss dann bei ExecuteDrag() - uebergeben werden, wenn der Rueckgabewert sagt, das - ExecuteDrag durchgefuehrt werden soll. Falls der Eintrag - nicht selektiert ist, wird er vorher als aktueller - Eintrag gesetzt. Es ist daher darauf zu achten, das aus - dieser Methode heraus der Select-Handler gerufen werden - kann. - -ShowDropPos - Diese Methode muss vom QueryDrop-Handler gerufen werden, - damit der TabBar anzeigt, wo die Tabs eingefuegt werden. - Diese Methode kann auch im Drop-Handler benutzt werden, - um die Position zu ermitteln wo die Tabs eingefuegt werden - sollen. In der Methode muss die Position vom Event - uebergeben werden. Diese Methode gibt die Position zurueck, - wo die Tabs eingefuegt werden sollen. - -HideDropPos - Diese Methode nimmt die vorher mit ShowDropPos() angezeigte - DropPosition wieder zurueck. Diese Methode sollte dann - gerufen werden, wenn bei QueryDrop() das Fenster verlassen - wird oder der Dragvorgang beendet wurde. - -Folgende Methoden koennen eingesetzt werden, wenn bei D&D die Seiten -umgeschaltet werden sollen: - -SwitchPage - Diese Methode muss vom QueryDrop-Handler gerufen werden, - wenn die Seite ueber der sich der Mousepointer befindet, - umgeschaltet werden soll. Diese Methode sollte jedesmal - gerufen werden, wenn der QueryDrop-Handler gerufen wird. - Das umschalten der Seite passiert zeitverzoegert (500 ms) - und wird automatisch von dieser Methode verwaltet. - In der Methode muss die Position vom Event uebergeben - werden. Diese Methode gibt TRUE zurueck, wenn die Page - umgeschaltet wurde. - -EndSwitchPage - Diese Methode setzt die Daten fuer das umschalten der - Seiten zurueck. Diese Methode sollte dann gerufen werden, - wenn bei QueryDrop() das Fenster verlassen wird oder - der Dragvorgang beendet wurde. - -IsInSwitching - Mit dieser Methode kann im ActivatePage()/DeactivatePage() - abgefragt werden, ob dies durch SwitchPage() veranlasst - wurde. So kann dann beispielsweise in DeactivatePage() - das Umschalten ohne eine Fehlerbox verhindert werden. - - -Fenster-Resize --------------- - -Wenn das Fenster vom Anwender in der Breite geaendert werden kann, dann -muss das WinBit WB_SIZEABLE gesetzt werden. In diesem Fall muss noch -folgender Handler ueberlagert werden: - -Split - Wenn dieser Handler gerufen wird, sollte das Fenster - auf die Breite angepasst werden, die von GetSplitSize() - zurueckgegeben wird. Dabei wird keine minimale und - maximale Breite beruecksichtig. Eine minimale Breite - kann mit GetMinSize() abgefragt werden und die maximale - Breite muss von der Anwendung selber berechnet werden. - Da nur Online-Resize unterstuetzt wird, muss das Fenster - innerhalb dieses Handlers in der Breite geaendert - werden und eventuell abhaengige Fenster ebenfalls. Fuer - diesen Handler kann auch mit SetSplitHdl() ein - Link gesetzt werden. - -Folgende Methoden liefern beim Splitten weitere Informationen: - -GetSplitSize() - Liefert die Breite des TabBars zurueck, auf die der - Anwender das Fenster resizen will. Dabei wird keine - minimale oder maximale Breite beruecksichtigt. Es wird - jedoch nie eine Breite < 5 zurueckgeliefert. Diese Methode - liefert nur solange richtige Werte, wie Splitten aktiv - ist. - -GetMinSize() - Mit dieser Methode kann eine minimale Fensterbreite - abgefragt werden, so das min. etwas eines Tabs sichtbar - ist. Jedoch kann der TabBar immer noch schmaler gesetzt - werden, als die Breite, die diese Methode zurueckliefert. - Diese Methode kann auch aufgerufen werden, wenn kein - Splitten aktiv ist. - - -Edit-Modus ----------- - -Der Tabbar bietet auch Moeglichkeiten, das der Anwender in den Tabreitern -die Namen aendern kann. - -EnableEditMode - Damit kann eingestellt werden, das bei Alt+LeftClick - StartEditMode() automatisch vom TabBar gerufen wird. - Im StartRenaming()-Handler kann dann das Umbenennen - noch abgelehnt werden. -StartEditMode - Mit dieser Methode wird der EditModus auf einem - Tab gestartet. FALSE wird zurueckgegeben, wenn - der Editmodus schon aktiv ist, mit StartRenaming() - der Modus abgelehnt wurde oder kein Platz zum - Editieren vorhanden ist. -EndEditMode - Mit dieser Methode wird der EditModus beendet. -SetEditText - Mit dieser Methode kann der Text im AllowRenaming()- - Handler noch durch einen anderen Text ersetzt werden. -GetEditText - Mit dieser Methode kann im AllowRenaming()-Handler - der Text abgefragt werden, den der Anwender eingegeben - hat. -IsInEditMode - Mit dieser Methode kann abgefragt werden, ob der - Editmodus aktiv ist. -IsEditModeCanceled - Mit dieser Methode kann im EndRenaming()- - Handler abgefragt werden, ob die Umbenenung - abgebrochen wurde. -GetEditPageId - Mit dieser Methode wird in den Renaming-Handlern - abgefragt, welcher Tab umbenannt wird/wurde. - -StartRenaming() - Dieser Handler wird gerufen, wenn ueber StartEditMode() - der Editmodus gestartet wurde. Mit GetEditPageId() - kann abgefragt werden, welcher Tab umbenannt werden - soll. FALSE sollte zurueckgegeben werden, wenn - der Editmodus nicht gestartet werden soll. -AllowRenaming() - Dieser Handler wird gerufen, wenn der Editmodus - beendet wird (nicht bei Cancel). In diesem Handler - kann dann getestet werden, ob der Text OK ist. - Mit GetEditPageId() kann abgefragt werden, welcher Tab - umbenannt wurde. - Es sollte einer der folgenden Werte zurueckgegeben - werden: - TAB_RENAMING_YES - Der Tab wird umbenannt. - TAB_RENAMING_NO - Der Tab wird nicht umbenannt, der Editmodus bleibt - jedoch aktiv, so das der Anwender den Namen - entsprechent anpassen kann. - TAB_RENAMING_CANCEL - Der Editmodus wird abgebrochen und der alte - Text wieder hergestellt. -EndRenaming() - Dieser Handler wird gerufen, wenn der Editmodus - beendet wurde. Mit GetEditPageId() kann abgefragt - werden, welcher Tab umbenannt wurde. Mit - IsEditModeCanceled() kann abgefragt werden, ob der - Modus abgebrochen wurde und der Name dadurch nicht - geaendert wurde. - - -Maximale Pagebreite -------------------- - -Die Pagebreite der Tabs kann begrenzt werden, damit ein einfacheres -Navigieren ueber diese moeglich ist. Wenn der Text dann nicht komplett -angezeigt werden kann, wird er mit ... abgekuerzt und in der Tip- -oder der aktiven Hilfe (wenn kein Hilfetext gesetzt ist) wird dann der -ganze Text angezeigt. Mit EnableAutoMaxPageWidth() kann eingestellt -werden, ob die maximale Pagebreite sich nach der gerade sichtbaren -Breite richten soll (ist der default). Ansonsten kann auch die -maximale Pagebreite mit SetMaxPageWidth() (in Pixeln) gesetzt werden -(die AutoMaxPageWidth wird dann ignoriert). - - -KontextMenu ------------ - -Wenn ein kontextsensitives PopupMenu anzeigt werden soll, muss der -Command-Handler ueberlagert werden. Mit GetPageId() und bei -Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick -ueber einem bzw. ueber welchem Item durchgefuehrt wurde. -*/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_RANGESELECT ((WinBits)0x00200000) -#define WB_MULTISELECT ((WinBits)0x00400000) -#define WB_TOPBORDER ((WinBits)0x04000000) -#define WB_3DTAB ((WinBits)0x08000000) -#define WB_MINSCROLL ((WinBits)0x20000000) -#define WB_STDTABBAR WB_BORDER - -// ------------------ -// - TabBarPageBits - -// ------------------ - -typedef USHORT TabBarPageBits; - -// ------------------------- -// - Bits fuer TabBarPages - -// ------------------------- - -#define TPB_SPECIAL ((TabBarPageBits)0x0001) - -// ---------------- -// - TabBar-Types - -// ---------------- - -#define TABBAR_APPEND ((USHORT)0xFFFF) -#define TABBAR_PAGE_NOTFOUND ((USHORT)0xFFFF) - -#define TABBAR_RENAMING_YES ((long)TRUE) -#define TABBAR_RENAMING_NO ((long)FALSE) -#define TABBAR_RENAMING_CANCEL ((long)2) - -// ---------- -// - TabBar - -// ---------- -struct TabBar_Impl; - -class SVT_DLLPUBLIC TabBar : public Window -{ - friend class ImplTabButton; - friend class ImplTabSizer; - -private: - ImplTabBarList* mpItemList; - ImplTabButton* mpFirstBtn; - ImplTabButton* mpPrevBtn; - ImplTabButton* mpNextBtn; - ImplTabButton* mpLastBtn; - TabBar_Impl* mpImpl; - TabBarEdit* mpEdit; - XubString maEditText; - Color maSelColor; - Color maSelTextColor; - Size maWinSize; - long mnMaxPageWidth; - long mnCurMaxWidth; - long mnOffX; - long mnOffY; - long mnLastOffX; - long mnSplitSize; - ULONG mnSwitchTime; - WinBits mnWinStyle; - USHORT mnCurPageId; - USHORT mnFirstPos; - USHORT mnDropPos; - USHORT mnSwitchId; - USHORT mnEditId; - BOOL mbFormat; - BOOL mbFirstFormat; - BOOL mbSizeFormat; - BOOL mbAutoMaxWidth; - BOOL mbInSwitching; - BOOL mbAutoEditMode; - BOOL mbEditCanceled; - BOOL mbDropPos; - BOOL mbInSelect; - BOOL mbSelColor; - BOOL mbSelTextColor; - BOOL mbMirrored; - Link maSelectHdl; - Link maDoubleClickHdl; - Link maSplitHdl; - Link maActivatePageHdl; - Link maDeactivatePageHdl; - Link maStartRenamingHdl; - Link maAllowRenamingHdl; - Link maEndRenamingHdl; - - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bBackground ); - SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, - Color& rSelectColor, Color& rSelectTextColor ); - SVT_DLLPRIVATE void ImplShowPage( USHORT nPos ); - SVT_DLLPRIVATE BOOL ImplCalcWidth(); - SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE USHORT ImplGetLastFirstPos(); - SVT_DLLPRIVATE void ImplInitControls(); - SVT_DLLPRIVATE void ImplEnableControls(); - SVT_DLLPRIVATE void ImplSelect(); - SVT_DLLPRIVATE void ImplActivatePage(); - SVT_DLLPRIVATE long ImplDeactivatePage(); - DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* ); - -public: - TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); - virtual ~TabBar(); - - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void Select(); - virtual void DoubleClick(); - virtual void Split(); - virtual void ActivatePage(); - virtual long DeactivatePage(); - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - virtual void Mirror(); - - void InsertPage( USHORT nPageId, const XubString& rText, - TabBarPageBits nBits = 0, - USHORT nPos = TABBAR_APPEND ); - void RemovePage( USHORT nPageId ); - void MovePage( USHORT nPageId, USHORT nNewPos ); - void Clear(); - - void EnablePage( USHORT nPageId, BOOL bEnable = TRUE ); - BOOL IsPageEnabled( USHORT nPageId ) const; - - void SetPageBits( USHORT nPageId, TabBarPageBits nBits = 0 ); - TabBarPageBits GetPageBits( USHORT nPageId ) const; - - USHORT GetPageCount() const; - USHORT GetPageId( USHORT nPos ) const; - USHORT GetPagePos( USHORT nPageId ) const; - USHORT GetPageId( const Point& rPos ) const; - Rectangle GetPageRect( USHORT nPageId ) const; - // returns the rectangle in which page tabs are drawn - Rectangle GetPageArea() const; - - void SetCurPageId( USHORT nPageId ); - USHORT GetCurPageId() const { return mnCurPageId; } - - void SetFirstPageId( USHORT nPageId ); - USHORT GetFirstPageId() const { return GetPageId( mnFirstPos ); } - void MakeVisible( USHORT nPageId ); - - void SelectPage( USHORT nPageId, BOOL bSelect = TRUE ); - void SelectPageRange( BOOL bSelect = FALSE, - USHORT nStartPos = 0, - USHORT nEndPos = TABBAR_APPEND ); - USHORT GetSelectPage( USHORT nSelIndex = 0 ) const; - USHORT GetSelectPageCount() const; - BOOL IsPageSelected( USHORT nPageId ) const; - - void EnableAutoMaxPageWidth( BOOL bEnable = TRUE ) { mbAutoMaxWidth = bEnable; } - BOOL IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } - void SetMaxPageWidth( long nMaxWidth ); - long GetMaxPageWidth() const { return mnMaxPageWidth; } - void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } - - void EnableEditMode( BOOL bEnable = TRUE ) { mbAutoEditMode = bEnable; } - BOOL IsEditModeEnabled() const { return mbAutoEditMode; } - BOOL StartEditMode( USHORT nPageId ); - void EndEditMode( BOOL bCancel = FALSE ); - void SetEditText( const XubString& rText ) { maEditText = rText; } - const XubString& GetEditText() const { return maEditText; } - BOOL IsInEditMode() const { return (mpEdit != NULL); } - BOOL IsEditModeCanceled() const { return mbEditCanceled; } - USHORT GetEditPageId() const { return mnEditId; } - - /** Mirrors the entire control including position of buttons and splitter. - Mirroring is done relative to the current direction of the GUI. - @param bMirrored TRUE = the control will draw itself RTL in LTR GUI, - and vice versa; FALSE = the control behaves according to the - current direction of the GUI. */ - void SetMirrored( BOOL bMirrored = TRUE ); - /** Returns TRUE, if the control is set to mirrored mode (see SetMirrored()). */ - BOOL IsMirrored() const { return mbMirrored; } - - /** Sets the control to LTR or RTL mode regardless of the GUI direction. - @param bRTL FALSE = the control will draw from left to right; - TRUE = the control will draw from right to left. */ - void SetEffectiveRTL( BOOL bRTL ); - /** Returns TRUE, if the control draws from right to left (see SetEffectiveRTL()). */ - BOOL IsEffectiveRTL() const; - - BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); - USHORT ShowDropPos( const Point& rPos ); - void HideDropPos(); - BOOL SwitchPage( const Point& rPos ); - void EndSwitchPage(); - BOOL IsInSwitching() { return mbInSwitching; } - - void SetSelectColor(); - void SetSelectColor( const Color& rColor ); - const Color& GetSelectColor() const { return maSelColor; } - BOOL IsSelectColor() const { return mbSelColor; } - void SetSelectTextColor(); - void SetSelectTextColor( const Color& rColor ); - const Color& GetSelectTextColor() const { return maSelTextColor; } - BOOL IsSelectTextColor() const { return mbSelTextColor; } - - void SetPageText( USHORT nPageId, const XubString& rText ); - XubString GetPageText( USHORT nPageId ) const; - void SetHelpText( USHORT nPageId, const XubString& rText ); - XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; - - long GetSplitSize() const { return mnSplitSize; } - long GetMinSize() const; - - void SetHelpText( const XubString& rText ) - { Window::SetHelpText( rText ); } - XubString GetHelpText() const - { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const - { return Window::GetHelpId(); } - - void SetStyle( WinBits nStyle ); - WinBits GetStyle() const { return mnWinStyle; } - - Size CalcWindowSizePixel() const; - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - const Link& GetSplitHdl() const { return maSplitHdl; } - void SetActivatePageHdl( const Link& rLink ) { maActivatePageHdl = rLink; } - const Link& GetActivatePageHdl() const { return maActivatePageHdl; } - void SetDeactivatePageHdl( const Link& rLink ) { maDeactivatePageHdl = rLink; } - const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl; } - void SetStartRenamingHdl( const Link& rLink ) { maStartRenamingHdl = rLink; } - const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; } - void SetAllowRenamingHdl( const Link& rLink ) { maAllowRenamingHdl = rLink; } - const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; } - void SetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl = rLink; } - const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; } - - // accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); -}; - -#endif // _TABBAR_HXX diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx deleted file mode 100644 index af373749248c..000000000000 --- a/svtools/inc/taskbar.hxx +++ /dev/null @@ -1,493 +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: taskbar.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TASKBAR_HXX -#define _TASKBAR_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _TOOLS_LIST_HXX -#include -#endif -#include -#include -#include - -class TaskBar; -class TaskStatusFieldItem; -class ImplTaskItemList; -class ImplTaskSBItemList; -class ImplTaskBarFloat; -struct ImplTaskSBFldItem; - -// ----------------- -// - Dokumentation - -// ----------------- - -/* - -TaskToolBox -=========== - -StartUpdateTask()/UpdateTask()/EndUpdateTask() -Diese muessen gerufen werden, wenn die Task upgedatet werden muessen. -Dann muss StartUpdateTask() gerufen werden, dann UpdateTask() fuer alle -Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend -neu angeordnet werden. - -ActivateTask() -Handler der gerufen wird, wenn ein Task aktiviert werden muss. Mit -GetTaskItem() kann abgefragt werden, welcher Task aktiviert werden muss. - -ContextMenu() -Dieser Handler wird gerufen, wenn ein ContextMenu angezeigt werden soll. -Mit GetTaskMode() kann abgefragt werden, ob fuer einen Task oder ein -Item. - -GetTaskItem() -Diese Methode liefert das Item zurueck, welches bei UpdateTask an der -entsprechenden Position eingefuegt wurde. - -GetContextMenuPos() -Liefert die Position zurueck, wo das Contextmenu angezeigt werden soll. - - -TaskStatusBar -============= - -InsertStatusField()/RemoveStatusField() -Fuegt ein Statusfeld ein, wo die aktuelle Uhrzeit angezeigt wird. In -dieses Feld koennen dann mit AddStatusFielItem(), ModifyStatusFielItem() -und RemoveStatusFielItem() Status-Items eingefuegt werden. Bei diesen -muss man ein Image angeben, welches dann angezeigt wird. Ausserdem kann -man bei diesen noch Hilfe-Texte angeben oder sagen, ob sie blinken -sollen und ein Notify-Object, worueber man informiert wird, wenn ein -Kontextmenu angezeigt wird oder das Item angeklickt wird. Am -TaskStatusBar kann auch ein Notify-Object gesetzt werden, wenn man -benachrichtigt werden will, wenn die Uhrzeit oder die TaskStatusBar -angeklickt wird. Wenn der Notify fuer die Uhrzeit kommt, ist die -Id TASKSTATUSBAR_CLOCKID, wenn er fuer die TaskStatusBar kommt, ist -die Id 0. Mit SetFieldFlags() kann am TaskStatusBar auch die Flags -hinterher umgesetzt werden, um zum Beispiel die Uhrzeit ein- und -auszuschalten. - - -TaskBar -======= - -Erlaubte StyleBits ------------------- - -WB_BORDER - Border an der oberen Kante -WB_SIZEABLE - Zwischen TaskToolBox und TaskStatusBar kann der Anwender - die Groesse aendern. - -Wenn WB_SIZEABLE gesetzt ist, kann die Breite des StatusBars gesetzt und -abgefragt werden. Dazu kann man SetStatusSize()/GetStatusSize() aufrufen. -0 steht dabei fuer optimale Groesse, was auch der Default ist. Bei einem -Doppelklick auf den Trenner kann der Anwender auch wieder die optimale -Groesse einstellen. - -Wichtige Methoden ------------------- - -virtual TaskToolBox* TaskBar::CreateButtonBar(); -virtual TaskToolBox* TaskBar::CreateTaskToolBox(); -virtual TaskStatusBar* TaskBar::CreateTaskStatusBar(); - -Diese Methoden muesste man ueberladen, wenn man eine eigene Klasse anlegen -will. - -void TaskBar::ShowStatusText( const String& rText ); -void TaskBar::HideStatusText(); - -Blendet den ButtonBar und die TaskBar ein bzw. aus um den Hilfetexte in der -gesammten Zeile anzuzeigen. -*/ - -// ----------------- -// - TaskButtonBar - -// ----------------- - -class TaskButtonBar : public ToolBox -{ - friend class TaskBar; - -private: - TaskBar* mpNotifyTaskBar; - void* mpDummy1; - void* mpDummy2; - void* mpDummy3; - void* mpDummy4; - -public: - TaskButtonBar( Window* pParent, WinBits nWinStyle = 0 ); - ~TaskButtonBar(); - - virtual void RequestHelp( const HelpEvent& rHEvt ); - - void InsertButton( USHORT nItemId, - const Image& rImage, const String& rText, - USHORT nPos = TOOLBOX_APPEND ) - { InsertItem( nItemId, rImage, rText, TIB_LEFT | TIB_AUTOSIZE, nPos ); } - void RemoveButton( USHORT nItemId ) - { RemoveItem( nItemId ); } -}; - -// --------------------- -// - TaskToolBox-Types - -// --------------------- - -#define TASKTOOLBOX_TASK_NOTFOUND ((USHORT)0xFFFF) - -// --------------- -// - TaskToolBox - -// --------------- - -class SVT_DLLPUBLIC TaskToolBox : public ToolBox -{ - friend class TaskBar; - -private: - ImplTaskItemList* mpItemList; - TaskBar* mpNotifyTaskBar; - Point maContextMenuPos; - ULONG mnOldItemCount; - long mnMaxTextWidth; - long mnDummy1; - USHORT mnUpdatePos; - USHORT mnUpdateNewPos; - USHORT mnActiveItemId; - USHORT mnNewActivePos; - USHORT mnTaskItem; - USHORT mnSmallItem; - USHORT mnDummy2; - BOOL mbMinActivate; - BOOL mbDummy1; - Link maActivateTaskHdl; - Link maContextMenuHdl; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplFormatTaskToolBox(); -#endif - - // Forbidden and not implemented. - TaskToolBox (const TaskToolBox &); - TaskToolBox & operator= (const TaskToolBox &); - -public: - TaskToolBox( Window* pParent, WinBits nWinStyle = 0 ); - ~TaskToolBox(); - - void ActivateTaskItem( USHORT nItemId, - BOOL bMinActivate = FALSE ); - USHORT GetTaskItem( const Point& rPos ) const; - - virtual void ActivateTask(); - virtual void ContextMenu(); - - virtual void Select(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - - void StartUpdateTask(); - void UpdateTask( const Image& rImage, const String& rText, - BOOL bActive = FALSE ); - void EndUpdateTask(); - - const Point& GetContextMenuPos() const { return maContextMenuPos; } - USHORT GetTaskItem() const { return mnTaskItem; } - BOOL IsMinActivate() const { return mbMinActivate; } - - void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; } - const Link& GetActivateTaskHdl() const { return maActivateTaskHdl; } - void SetContextMenuHdl( const Link& rLink ) { maContextMenuHdl = rLink; } - const Link& GetContextMenuHdl() const { return maContextMenuHdl; } -}; - -inline USHORT TaskToolBox::GetTaskItem( const Point& rPos ) const -{ - USHORT nId = GetItemId( rPos ); - if ( nId ) - return nId-1; - else - return TASKTOOLBOX_TASK_NOTFOUND; -} - -// --------------------- -// - ITaskStatusNotify - -// --------------------- - -class ITaskStatusNotify -{ -public: - virtual BOOL MouseButtonDown( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseButtonUp( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseMove( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL Command( USHORT nItemd, const CommandEvent& rCEvt ); - virtual BOOL UpdateHelp( USHORT nItemd ); -}; - -// ----------------------- -// - TaskStatusFieldItem - -// ----------------------- - -#define TASKSTATUSFIELDITEM_FLASH ((USHORT)0x0001) - -class TaskStatusFieldItem -{ -private: - ITaskStatusNotify* mpNotify; - Image maImage; - XubString maQuickHelpText; - XubString maHelpText; - ULONG mnHelpId; - USHORT mnFlags; - -public: - TaskStatusFieldItem(); - TaskStatusFieldItem( const TaskStatusFieldItem& rItem ); - TaskStatusFieldItem( ITaskStatusNotify* pNotify, - const Image& rImage, - const XubString& rQuickHelpText, - const XubString& rHelpText, - USHORT nFlags ); - ~TaskStatusFieldItem(); - - void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } - ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } - void SetImage( const Image& rImage ) { maImage = rImage; } - const Image& GetImage() const { return maImage; } - void SetQuickHelpText( const XubString& rStr ) { maQuickHelpText = rStr; } - const XubString& GetQuickHelpText() const { return maQuickHelpText; } - void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } - const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } - void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } - USHORT GetFlags() const { return mnFlags; } - - const TaskStatusFieldItem& operator=( const TaskStatusFieldItem& rItem ); -}; - -// ----------------- -// - TaskStatusBar - -// ----------------- - -#define TASKSTATUSBAR_STATUSFIELDID ((USHORT)61000) - -#define TASKSTATUSBAR_CLOCKID ((USHORT)61000) -#define TASKSTATUSFIELD_CLOCK ((USHORT)0x0001) - -class SVT_DLLPUBLIC TaskStatusBar : public StatusBar -{ - friend class TaskBar; - -private: - ImplTaskSBItemList* mpFieldItemList; - TaskBar* mpNotifyTaskBar; - ITaskStatusNotify* mpNotify; - Time maTime; - XubString maTimeText; - AutoTimer maTimer; - long mnClockWidth; - long mnItemWidth; - long mnFieldWidth; - USHORT mnFieldFlags; - USHORT mnDummy1; - BOOL mbFlashItems; - BOOL mbOutInterval; - BOOL mbDummy1; - BOOL mbDummy2; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( USHORT nItemId ) const; - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, BOOL& rFieldRect ) const; - SVT_DLLPRIVATE BOOL ImplUpdateClock(); - SVT_DLLPRIVATE BOOL ImplUpdateFlashItems(); - SVT_DLLPRIVATE void ImplUpdateField( BOOL bItems ); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); -#endif - -public: - TaskStatusBar( Window* pParent, WinBits nWinStyle = WB_LEFT ); - ~TaskStatusBar(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - void InsertStatusField( long nOffset = STATUSBAR_OFFSET, - USHORT nPos = STATUSBAR_APPEND, - USHORT nFlags = TASKSTATUSFIELD_CLOCK ); - void RemoveStatusField() - { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } - void SetFieldFlags( USHORT nFlags ); - USHORT GetFieldFlags() const { return mnFieldFlags; } - void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } - ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } - - void AddStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem, - USHORT nPos = 0xFFFF ); - void ModifyStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem ); - void RemoveStatusFieldItem( USHORT nItemId ); - BOOL GetStatusFieldItem( USHORT nItemId, TaskStatusFieldItem& rItem ) const; -}; - -// ----------- -// - TaskBar - -// ----------- - -class SVT_DLLPUBLIC TaskBar : public Window -{ -private: - ImplTaskBarFloat* mpAutoHideBar; - TaskButtonBar* mpButtonBar; - TaskToolBox* mpTaskToolBox; - TaskStatusBar* mpStatusBar; - void* mpDummy1; - void* mpDummy2; - void* mpDummy3; - void* mpDummy4; - String maOldText; - long mnStatusWidth; - long mnMouseOff; - long mnOldStatusWidth; - long mnDummy1; - long mnDummy2; - long mnDummy3; - long mnDummy4; - WinBits mnWinBits; - USHORT mnLines; - BOOL mbStatusText; - BOOL mbShowItems; - BOOL mbAutoHide; - BOOL mbAlignDummy1; - BOOL mbDummy1; - BOOL mbDummy2; - BOOL mbDummy3; - BOOL mbDummy4; - Link maTaskResizeHdl; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplInitSettings(); - SVT_DLLPRIVATE void ImplNewHeight( long nNewHeight ); -#endif - -public: - TaskBar( Window* pParent, WinBits nWinStyle = WB_BORDER | WB_SIZEABLE ); - ~TaskBar(); - - virtual void TaskResize(); - - virtual TaskButtonBar* CreateButtonBar(); - virtual TaskToolBox* CreateTaskToolBox(); - virtual TaskStatusBar* CreateTaskStatusBar(); - - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void Format(); - - void SetLines( USHORT nLines ); - USHORT GetLines() const { return mnLines; } - void EnableAutoHide( BOOL bAutoHide = TRUE ); - BOOL IsAutoHideEnabled() const { return mbAutoHide; } - - void ShowStatusText( const String& rText ); - void HideStatusText(); - - void SetStatusSize( long nNewSize ) - { mnStatusWidth=nNewSize; Resize(); } - long GetStatusSize() const { return mnStatusWidth; } - - Size CalcWindowSizePixel() const; - - TaskButtonBar* GetButtonBar() const; - TaskToolBox* GetTaskToolBox() const; - TaskStatusBar* GetStatusBar() const; - - void SetTaskResizeHdl( const Link& rLink ) { maTaskResizeHdl = rLink; } - const Link& GetTaskResizeHdl() const { return maTaskResizeHdl; } -}; - -// ----------------------- -// - WindowArrange-Types - -// ----------------------- - -#define WINDOWARRANGE_TILE 1 -#define WINDOWARRANGE_HORZ 2 -#define WINDOWARRANGE_VERT 3 -#define WINDOWARRANGE_CASCADE 4 - -class ImplWindowArrangeList; - -// ----------------------- -// - class WindowArrange - -// ----------------------- - -class SVT_DLLPUBLIC WindowArrange -{ -private: - List* mpWinList; - void* mpDummy; - ULONG mnDummy; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplHorz( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplVert( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplCascade( const Rectangle& rRect ); -#endif - -public: - WindowArrange(); - ~WindowArrange(); - - void AddWindow( Window* pWindow, ULONG nPos = LIST_APPEND ) - { mpWinList->Insert( (void*)pWindow, nPos ); } - void RemoveAllWindows() - { mpWinList->Clear(); } - - void Arrange( USHORT nType, const Rectangle& rRect ); -}; - -#endif // _TASKBAR_HXX diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/templatefoldercache.hxx deleted file mode 100644 index 8a6b6d9c1a3a..000000000000 --- a/svtools/inc/templatefoldercache.hxx +++ /dev/null @@ -1,111 +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: templatefoldercache.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SFX2_TEMPLATEFOLDERCACHE_HXX -#define SFX2_TEMPLATEFOLDERCACHE_HXX - -#include "svtools/svtdllapi.h" -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //===================================================================== - //= TemplateFolderCache - //===================================================================== - class TemplateFolderCacheImpl; - /** allows to cache the state of the template directories of OOo -

    Usually, this class is used together with an instance of a the - DocumentTemplates service. It allows to scan the template folders - of the Office, and updates the configuration so that it reflects the most recent state of the folders.
    - As this is an expensive, the TemplateFolderCache has been introduced. It caches the state of the template - folders, and allows to determine if the DocumentTemplates service needs to be invoked to do the (much more expensive) - update.

    - @example C++ - - TemplateFolderCache aTemplateFolders; - if ( aTemplateFolders.needsUpdate() ) - { - // store the current state - aCache.storeState(); - - // create the DocumentTemplates instance - Reference< XDocumentTemplates > xTemplates = ...; - - // update the templates configuration - xTemplates->update(); - } - - // do anything which relies on a up-to-date template configuration - - */ - class SVT_DLLPUBLIC TemplateFolderCache - { - private: - TemplateFolderCacheImpl* m_pImpl; - - public: - /** ctor. - @param _bAutoStoreState - Set this to if you want the instance to automatically store the state of the template folders upon - destruction.
    - If set to , you would epplicitly need to call storeState to do this.
    - If the current state is not known (e.g. because you did not call needsUpdate, which retrieves it), - it is not retrieved in the dtor, regardless of the _bAutoStoreState flag. - */ - TemplateFolderCache( sal_Bool _bAutoStoreState = sal_False ); - ~TemplateFolderCache( ); - - /** determines whether or not the template configuration needs to be updated - @param _bForceCheck - set this to if you want the object to rescan the template folders in every case. The default () - means that once the information has been retrieved in a first call, every second call returns the same result - as the first one, even if in the meantime the template folders changed. - @return - if the template configuration needs to be updated - */ - sal_Bool needsUpdate( sal_Bool _bForceCheck = sal_False ); - - /** stores the current state of the template folders in the cache - @param _bForceRetrieval - if set to , the current state of the template folders is retrieved again, even if it is already known. - Usually, you set this to : After calling needsUpdate, the state is know and does not - need to be read again. - */ - void storeState( sal_Bool _bForceRetrieval = sal_False ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SFX2_TEMPLATEFOLDERCACHE_HXX diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/templdlg.hxx deleted file mode 100644 index 4b2d644d6f6b..000000000000 --- a/svtools/inc/templdlg.hxx +++ /dev/null @@ -1,95 +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: templdlg.hxx,v $ - * $Revision: 1.16 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_TEMPLDLG_HXX -#define _SVTOOLS_TEMPLDLG_HXX - -#include "svtools/svtdllapi.h" - -#include -#include -#include -#include - -struct SvtTmplDlg_Impl; - -// class SvtDocumentTemplateDialog --------------------------------------- - -class SvtTemplateWindow; - -class SVT_DLLPUBLIC SvtDocumentTemplateDialog : public ModalDialog -{ -private: - svt::FixedHyperlink aMoreTemplatesLink; - FixedLine aLine; - PushButton aManageBtn; - PushButton aEditBtn; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - - SvtTmplDlg_Impl* pImpl; - - DECL_DLLPRIVATE_LINK( SelectHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* ); - DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, svt::FixedHyperlink* ); - -public: - SvtDocumentTemplateDialog( Window* pParent ); - - /** ctor for calling the dialog for selection only, not for opening a document -

    If you use this ctor, the dialog will behave differently in the following areas: -

    • The Edit button will be hidden.
      • -
    • Upon pressing em>Open, the selected file will not be opened. Instead, it's - URL is available (see GetSelectedFileURL).
      • -
    - - */ - struct SelectOnly { }; - SvtDocumentTemplateDialog( Window* _pParent, SelectOnly ); - - ~SvtDocumentTemplateDialog(); - - sal_Bool IsFileSelected( ) const; - String GetSelectedFileURL( ) const; - - void SelectTemplateFolder(); - -private: - SVT_DLLPRIVATE void InitImpl( ); - SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; -}; - -#endif // _SVTOOLS_TEMPLDLG_HXX - diff --git a/svtools/inc/testtool.hxx b/svtools/inc/testtool.hxx deleted file mode 100644 index 5d4ec5c6208e..000000000000 --- a/svtools/inc/testtool.hxx +++ /dev/null @@ -1,78 +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: testtool.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVTOOLS_TESTTOOL_HXX -#define SVTOOLS_TESTTOOL_HXX - -#include -#include -#include - -class Application; -class SvStream; - -class StatementFlow; -class CommunicationManager; -class CommunicationLink; -#if OSL_DEBUG_LEVEL > 1 -class EditWindow; -#endif -class ImplRC; - -class RemoteControl -{ - friend class StatementFlow; - - BOOL m_bIdleInserted; -#if OSL_DEBUG_LEVEL > 1 - EditWindow *m_pDbgWin; -#endif - ImplRC* pImplRC; - -public: - RemoteControl(); - ~RemoteControl(); - BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); - SvStream* GetReturnStream(); - - DECL_LINK( IdleHdl, Application* ); - DECL_LINK( CommandHdl, Application* ); - - DECL_LINK( QueCommandsEvent, CommunicationLink* ); - ULONG nStoredServiceId; - SvStream *pStoredStream; - - void ExecuteURL( String &aURL ); - -protected: - CommunicationManager *pServiceMgr; - SvStream *pRetStream; -}; - -#endif // SVTOOLS_TESTTOOL_HXX diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/tooltiplbox.hxx deleted file mode 100644 index a72a2042a9cc..000000000000 --- a/svtools/inc/tooltiplbox.hxx +++ /dev/null @@ -1,70 +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: tooltiplbox.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_TOOLTIPLBOX_HXX -#define SVTOOLS_TOOLTIPLBOX_HXX - -#include "svtools/svtdllapi.h" -#include - -namespace svtools { - -// ============================================================================ - -/** ListBox with tool tips for long entries. */ -class ToolTipListBox : public ListBox -{ -public: - ToolTipListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - ToolTipListBox( Window* pParent, const ResId& rResId ); - -protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); -}; - -// ---------------------------------------------------------------------------- - -/** MultiListBox with tool tips for long entries. */ -class SVT_DLLPUBLIC ToolTipMultiListBox : public MultiListBox -{ -public: - ToolTipMultiListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - ToolTipMultiListBox( Window* pParent, const ResId& rResId ); - -protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); -}; - -// ============================================================================ - -} // namespace svtools - -#endif - diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/txtattr.hxx deleted file mode 100644 index 4d4432f782bb..000000000000 --- a/svtools/inc/txtattr.hxx +++ /dev/null @@ -1,238 +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: txtattr.hxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TXTATTR_HXX -#define _TXTATTR_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include - -class Font; - -#define TEXTATTR_INVALID 0 -#define TEXTATTR_FONTCOLOR 1 -#define TEXTATTR_HYPERLINK 2 -#define TEXTATTR_FONTWEIGHT 3 - -#define TEXTATTR_USER_START 1000 //start id for user defined text attributes -#define TEXTATTR_PROTECTED 4 - - -class SVT_DLLPUBLIC TextAttrib -{ -private: - USHORT mnWhich; - -protected: - TextAttrib( USHORT nWhich ) { mnWhich = nWhich; } - TextAttrib( const TextAttrib& rAttr ) { mnWhich = rAttr.mnWhich; } - -public: - - virtual ~TextAttrib(); - - USHORT Which() const { return mnWhich; } - - virtual void SetFont( Font& rFont ) const = 0; - virtual TextAttrib* Clone() const = 0; - virtual int operator==( const TextAttrib& rAttr ) const = 0; - int operator!=( const TextAttrib& rAttr ) const - { return !(*this == rAttr ); } -}; - - - -class SVT_DLLPUBLIC TextAttribFontColor : public TextAttrib -{ -private: - Color maColor; - -public: - TextAttribFontColor( const Color& rColor ); - TextAttribFontColor( const TextAttribFontColor& rAttr ); - ~TextAttribFontColor(); - - const Color& GetColor() const { return maColor; } - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - -}; - -class SVT_DLLPUBLIC TextAttribFontWeight : public TextAttrib -{ -private: - FontWeight meWeight; - -public: - TextAttribFontWeight( FontWeight eWeight ); - TextAttribFontWeight( const TextAttribFontWeight& rAttr ); - ~TextAttribFontWeight(); - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - - inline FontWeight getFontWeight() const { return meWeight; } -}; - - -class TextAttribHyperLink : public TextAttrib -{ -private: - XubString maURL; - XubString maDescription; - Color maColor; - -public: - TextAttribHyperLink( const XubString& rURL ); - TextAttribHyperLink( const XubString& rURL, const XubString& rDescription ); - TextAttribHyperLink( const TextAttribHyperLink& rAttr ); - ~TextAttribHyperLink(); - - void SetURL( const XubString& rURL ) { maURL = rURL; } - const XubString& GetURL() const { return maURL; } - - void SetDescription( const XubString& rDescr ) { maDescription = rDescr; } - const XubString& GetDescription() const { return maDescription; } - - void SetColor( const Color& rColor ) { maColor = rColor; } - const Color& GetColor() const { return maColor; } - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; -}; - -class SVT_DLLPUBLIC TextAttribProtect : public TextAttrib -{ -public: - TextAttribProtect(); - TextAttribProtect( const TextAttribProtect& rAttr ); - ~TextAttribProtect(); - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - -}; - - -class TextCharAttrib -{ -private: - TextAttrib* mpAttr; - USHORT mnStart; - USHORT mnEnd; - -protected: - -public: - - TextCharAttrib( const TextAttrib& rAttr, USHORT nStart, USHORT nEnd ); - TextCharAttrib( const TextCharAttrib& rTextCharAttrib ); - ~TextCharAttrib(); - - const TextAttrib& GetAttr() const { return *mpAttr; } - - USHORT Which() const { return mpAttr->Which(); } - - USHORT GetStart() const { return mnStart; } - USHORT& GetStart() { return mnStart; } - - USHORT GetEnd() const { return mnEnd; } - USHORT& GetEnd() { return mnEnd; } - - inline USHORT GetLen() const; - - inline void MoveForward( USHORT nDiff ); - inline void MoveBackward( USHORT nDiff ); - - inline void Expand( USHORT nDiff ); - inline void Collaps( USHORT nDiff ); - - inline BOOL IsIn( USHORT nIndex ); - inline BOOL IsInside( USHORT nIndex ); - inline BOOL IsEmpty(); - -}; - -inline USHORT TextCharAttrib::GetLen() const -{ - DBG_ASSERT( mnEnd >= mnStart, "TextCharAttrib: nEnd < nStart!" ); - return mnEnd-mnStart; -} - -inline void TextCharAttrib::MoveForward( USHORT nDiff ) -{ - DBG_ASSERT( ((long)mnEnd + nDiff) <= 0xFFFF, "TextCharAttrib: MoveForward?!" ); - mnStart = mnStart + nDiff; - mnEnd = mnEnd + nDiff; -} - -inline void TextCharAttrib::MoveBackward( USHORT nDiff ) -{ - DBG_ASSERT( ((long)mnStart - nDiff) >= 0, "TextCharAttrib: MoveBackward?!" ); - mnStart = mnStart - nDiff; - mnEnd = mnEnd - nDiff; -} - -inline void TextCharAttrib::Expand( USHORT nDiff ) -{ - DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" ); - mnEnd = mnEnd + nDiff; -} - -inline void TextCharAttrib::Collaps( USHORT nDiff ) -{ - DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" ); - mnEnd = mnEnd - nDiff; -} - -inline BOOL TextCharAttrib::IsIn( USHORT nIndex ) -{ - return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); -} - -inline BOOL TextCharAttrib::IsInside( USHORT nIndex ) -{ - return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); -} - -inline BOOL TextCharAttrib::IsEmpty() -{ - return mnStart == mnEnd; -} - -#endif // _TXTATTR_HXX diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/txtcmp.hxx deleted file mode 100644 index e40e578401cb..000000000000 --- a/svtools/inc/txtcmp.hxx +++ /dev/null @@ -1,36 +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: txtcmp.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _TXTCMP_HXX -#define _TXTCMP_HXX - -#include - -#endif - diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx deleted file mode 100644 index e8507722e31b..000000000000 --- a/svtools/inc/unoevent.hxx +++ /dev/null @@ -1,332 +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: unoevent.hxx,v $ - * $Revision: 1.5.136.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_UNOEVENT_HXX_ -#define _SVTOOLS_UNOEVENT_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include - -class SvxMacroTableDtor; -class SvxMacroItem; -class SvxMacro; - -/** SvEventDescription: Description of a single event. - mnEvent is the id used by SvxMacroItem - mpEventName is the api name for this event - - the last event in an array is indicated by mnEvent && mpEventName == 0 -*/ -struct SvEventDescription -{ - sal_uInt16 mnEvent; - const sal_Char* mpEventName; -}; - -/** - * SvBaseEventDescriptor: Abstract class that implements the basics - * of an XNameReplace that is delivered by the - * XEventsSupplier::getEvents() method. - * - * The functionality this class provides is: - * 1) Which elements are in the XNameReplace? - * 2) Mapping from Api names to item IDs. - * 3) conversion from SvxMacroItem to Any and vice versa. - * - * All details of how to actually get and set SvxMacroItem(s) have to - * be supplied by the base class. - */ -class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 -< - ::com::sun::star::container::XNameReplace, - ::com::sun::star::lang::XServiceInfo -> -{ - const ::rtl::OUString sEventType; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sJavaScript; - const ::rtl::OUString sScript; - const ::rtl::OUString sNone; - - - /// name of own service - const ::rtl::OUString sServiceName; - -protected: - const ::rtl::OUString sEmpty; - - /// last element is 0, 0 - const SvEventDescription* mpSupportedMacroItems; - sal_Int16 mnMacroItems; - -public: - - SvBaseEventDescriptor(const SvEventDescription* pSupportedMacroItems); - - virtual ~SvBaseEventDescriptor(); - - - // XNameReplace - /// calls replaceByName(const sal_uInt16, const SvxMacro&) - virtual void SAL_CALL replaceByName( - const ::rtl::OUString& rName, /// API name of event - const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XNameAccess (via XNameReplace) - /// calls getByName(sal_uInt16) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName ) /// API name of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XNameAxcess (via XNameReplace) - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getElementNames() - throw(::com::sun::star::uno::RuntimeException); - - // XNameAccess (via XNameReplace) - virtual sal_Bool SAL_CALL hasByName( - const ::rtl::OUString& rName ) - throw(::com::sun::star::uno::RuntimeException); - - // XElementAccess (via XNameReplace) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); - - // XElementAccess (via XNameReplace) - virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException); - - // XServiceInfo - /// must be implemented in subclass - virtual rtl::OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ) = 0; - - // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); - - // XServiceInfo - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); - -protected: - - /// Must be implemented in subclass. - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; - - /// Must be implemented in subclass. - virtual void getByName( - SvxMacro& rMacro, - const sal_uInt16 nEvent ) - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; - - /// convert an API event name to the event ID as used by SvxMacroItem - sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; - - /// convert an event ID to an API event name - ::rtl::OUString mapEventIDToName(sal_uInt16 nPoolID) const; - - /// get the event ID for the name; return 0 if not supported - sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; - - /// create PropertyValues and Any from macro - void getAnyFromMacro( - ::com::sun::star::uno::Any& aAny, // Any to be filled by Macro values - const SvxMacro& rMacro); - - /// create macro from PropertyValues (in an Any) - void getMacroFromAny( - SvxMacro& aMacro, // reference to be filled by Any - const ::com::sun::star::uno::Any& rAny) - throw ( - ::com::sun::star::lang::IllegalArgumentException); - -}; - - - - -/** - * SvEventDescriptor: Implement the XNameReplace that is delivered by - * the XEventsSupplier::getEvents() method. The SvEventDescriptor has - * to be subclassed to implement the events for a specific - * objects. The subclass has to - * 1) supply the super class constructor with a list of known events (item IDs) - * 2) supply the super class constructor with a reference of it's parent object - * (to prevent destruction) - * 3) implement getItem() and setItem(...) methods. - * - * If no object is available to which the SvEventDescriptor can attach itself, - * the class SvDetachedEventDescriptor should be used. - */ -class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor -{ - /// keep reference to parent to prevent it from being destroyed - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > xParentRef; - -public: - - SvEventDescriptor(::com::sun::star::uno::XInterface& rParent, - const SvEventDescription* pSupportedMacroItems); - - virtual ~SvEventDescriptor(); - - -protected: - - - using SvBaseEventDescriptor::replaceByName; - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - using SvBaseEventDescriptor::getByName; - virtual void getByName( - SvxMacro& rMacros, /// macro to be filled with values - const sal_uInt16 nEvent ) /// item ID of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - - /// Get the SvxMacroItem from the parent. - /// must be implemented by subclass - virtual const SvxMacroItem& getMacroItem() = 0; - - /// Set the SvxMacroItem at the parent. - /// must be implemented by subclass - virtual void setMacroItem(const SvxMacroItem& rItem) = 0; - - /// Get the SvxMacroItem Which Id needed for the current application - /// must be implemented by subclass - virtual sal_uInt16 getMacroItemWhich() const = 0; -}; - - -/** - * SvDetachedEventDescriptor: - */ -class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor -{ - // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] - SvxMacro** aMacros; - - const ::rtl::OUString sImplName; - -public: - - SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); - - virtual ~SvDetachedEventDescriptor(); - - //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); - -protected: - - sal_Int16 getIndex(const sal_uInt16 nID) const; - - using SvBaseEventDescriptor::replaceByName; - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - using SvBaseEventDescriptor::getByName; - virtual void getByName( - SvxMacro& rMacro, /// macro to be filled - const sal_uInt16 nEvent ) /// item ID of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - /// do we have an event? - /// return sal_True: we have a macro for the event - /// return sal_False: no macro; getByName() will return an empty macro - /// IllegalArgumentException: the event is not supported - using SvBaseEventDescriptor::hasByName; - virtual sal_Bool hasByName( - const sal_uInt16 nEvent ) const /// item ID of event - throw( - ::com::sun::star::lang::IllegalArgumentException); - -}; - -class SVT_DLLPUBLIC SvMacroTableEventDescriptor : public SvDetachedEventDescriptor -{ -public: - - SvMacroTableEventDescriptor(const SvEventDescription* pSupportedMacroItems); - SvMacroTableEventDescriptor(const SvxMacroTableDtor& aFmt, - const SvEventDescription* pSupportedMacroItems); - - virtual ~SvMacroTableEventDescriptor(); - - void copyMacrosFromTable(const SvxMacroTableDtor& aFmt); - void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); -}; - -#endif diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/unoimap.hxx deleted file mode 100644 index f3a5aae50844..000000000000 --- a/svtools/inc/unoimap.hxx +++ /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: unoimap.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_UNOIMAP_HXX -#define _SVTOOLS_UNOIMAP_HXX - -#include "svtools/svtdllapi.h" -#include - -class ImageMap; -struct SvEventDescription; - -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); - -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap ); - -#endif diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx deleted file mode 100644 index 7f3e04ce2a8c..000000000000 --- a/svtools/inc/wallitem.hxx +++ /dev/null @@ -1,68 +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: wallitem.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _WALLITEM_HXX -#define _WALLITEM_HXX - -#ifndef SHL_HXX -#include -#endif - -// ----------------------------------------------------------------------------------------- -// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb -// des SVX zu benutzen. Der Link wird im Konstruktor von SvxDialogDll gesetzt. -#ifndef _SFX_BRUSHITEMLINK_DECLARED -#define _SFX_BRUSHITEMLINK_DECLARED -#include - -#ifndef SHL_BRUSHITEM -#define SHL_BRUSHITEM SHL_SHL1 -#endif - -class Window; -class SfxItemSet; - -typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetSvxBrushTabPageRanges)(); - -class Graphic; -class String; -class SfxBrushItemLink -{ -public: - virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0; - virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0; - virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0; - static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); } - static void Set( SfxBrushItemLink* pLink ); -}; -#endif // _SFX_BRUSHITEMLINK_DECLARED - -#endif // _WALLITEM_HXX - diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 0d4865ee563e..e8024598563c 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "apearcfg.hxx" +#include #include "com/sun/star/uno/Any.hxx" #include "tools/debug.hxx" diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 89bf41ac9f58..184dc8a70b3e 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "extcolorcfg.hxx" +#include #include #include #include diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index dc9bfa64e6d4..1feb1dafc44f 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "fontsubstconfig.hxx" +#include #include #include #include diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 759fabbee686..4c399b51e530 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -39,10 +39,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index af6861a5104f..d489a820a292 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -48,7 +48,7 @@ #include #include "itemholder2.hxx" -#include +#include #include //_________________________________________________________________________________________________________________ diff --git a/svtools/source/contnr/cont_pch.cxx b/svtools/source/contnr/cont_pch.cxx deleted file mode 100644 index fb711ff12e7d..000000000000 --- a/svtools/source/contnr/cont_pch.cxx +++ /dev/null @@ -1,44 +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: cont_pch.cxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#include -#include -#include -#include -#include -#include "svimpbox.hxx" -#include "svimpicn.hxx" -#include -#include - - diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index a0e6b353dfb6..7f6b82a41812 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -33,7 +33,7 @@ #include "contentenumeration.hxx" #include #include -#include "imagemgr.hxx" +#include /** === begin UNO includes === **/ #include diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 7fddf18ee266..89cc14f4506c 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -31,12 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "fileview.hxx" +#include #include -#include "imagemgr.hxx" +#include #include #include - #include #include "fileview.hrc" #include "contentenumeration.hxx" @@ -57,7 +56,6 @@ #include #include #include - #include #include #include @@ -67,9 +65,7 @@ #include #include #include -#ifndef INCLUDED_RTL_MATH_H #include -#endif #include #include #include diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index d443beb7fff9..653b6e97b513 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -44,7 +44,7 @@ #include -#include "ivctrl.hxx" +#include #include class IcnCursor_Impl; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 954c8a7ca179..bdd41c1687ca 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -43,7 +43,7 @@ #include #include -#include "ivctrl.hxx" +#include #include "imivctl.hxx" #include diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 916738af70ae..73cd8bb2962a 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -31,10 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef GCC -#endif - -#include "ivctrl.hxx" +#include #include "imivctl.hxx" #include #include diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index f2674279f4df..52d775f23310 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -32,15 +32,10 @@ #include "precompiled_svtools.hxx" #include #include - -#ifndef _HELP_HXX #include -#endif -#include +#include -#ifndef _STACK_ #include -#endif #define _SVTREEBX_CXX #include @@ -48,10 +43,7 @@ #include #include #include - -#ifndef _SVTOOLS_HRC #include -#endif // #102891# -------------------- #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 06de35ba19aa..4634d9130b3f 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -31,31 +31,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include "templwin.hxx" -#include "templdlg.hxx" +#include #include #include #include #include #include #include -#include "imagemgr.hxx" +#include #include -#include "templatefoldercache.hxx" -#include "imgdef.hxx" -#include "txtattr.hxx" -#ifndef _SVTOOLS_HRC +#include +#include +#include #include -#endif -#ifndef _SVTOOLS_TEMPLWIN_HRC #include "templwin.hrc" -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include - #include "unotools/configmgr.hxx" #include #include @@ -90,7 +83,7 @@ #include #include #include -#include "DocumentInfoPreview.hxx" +#include #include #include diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index 050ba7ab6739..3f38b814cba5 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -35,8 +35,8 @@ #include #include #include -#include "fileview.hxx" -#include "ivctrl.hxx" +#include +#include #include #include #include diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index f7f42b7e176b..bfb39fa2f2ef 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -31,7 +31,7 @@ // includes ------------------------------------------------------------------ #include "templwin.hrc" -#include "controldims.hrc" +#include #include #include diff --git a/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx index f33b7e4c24ea..067c63acdea3 100644 --- a/svtools/source/contnr/tooltiplbox.cxx +++ b/svtools/source/contnr/tooltiplbox.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "tooltiplbox.hxx" +#include #include // ============================================================================ diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 1e47c71de5d4..4296920d5c02 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 481f6f2ceeae..99b4a453cb54 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -31,30 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _APP_HXX #include -#endif -#ifndef _TABLE_HXX #include -#endif -#ifndef _HELP_HXX #include -#endif -#ifndef _MENU_HXX #include -#endif -#ifndef _DECOVIEW_HXX #include -#endif -#ifndef _FLOATWIN_HXX #include -#endif -#ifndef _BUTTON_HXX #include -#endif -#ifndef _FIXED_HXX #include -#endif #include #include #include @@ -64,7 +48,7 @@ #define _SV_CALENDAR_CXX #include #include -#include +#include // ======================================================================= diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index c976d7442bc0..be8615ec7995 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -33,9 +33,7 @@ #include "precompiled_svtools.hxx" #include #include - - -#include +#include // ------------------------------------------------------------------------- // diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index b0d20bf7ce30..ef1a8289980a 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -33,19 +33,15 @@ #define _CTRLBOX_CXX #include -#ifndef _APP_HXX #include -#endif -#ifndef _FIELD_HXX #include -#endif #include #include #include #include -#include -#include +#include +#include #include diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 1573ed531662..3c3bee6e240e 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -35,19 +35,14 @@ #include -#ifndef TOOLS_DEBUG_HXX #include -#endif #include -#ifndef _VCL_WINDOW_HXX #include -#endif #include #include - #include #include -#include +#include // ======================================================================= diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index d820dce097ed..0f58f4ae595a 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -34,13 +34,8 @@ #define _SV_FIELCTRL_CXX #include #include -#include -#ifndef _SV_FILECTRL_HRC +#include #include -#endif - -#ifndef GCC -#endif // ======================================================================= diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index 0ea28fbf96bd..22ad930215c1 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling -#include +#include #include #include #include diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index f69e9b34e5ea..820eca0f8c85 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -33,9 +33,7 @@ #include "precompiled_svtools.hxx" #include #include - - -#include +#include // ------------------------------------------------------------------------- // diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index b4904afee418..11d6fefe5f6a 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -36,7 +36,6 @@ #include #endif - #include #include #include @@ -44,27 +43,16 @@ #include #include #include - -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_ #include -#endif #include #include #include #include #include - -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif - #include -#ifndef _VOS_THREAD_HXX //autogen #include -#endif -#ifndef _VOS_MUTEX_HXX //autogen #include -#endif #include #include #include @@ -80,9 +68,8 @@ #include #include #include - #include "iodlg.hrc" -#include +#include #include #include diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx index b6702e93af4d..164744f2b7d3 100644 --- a/svtools/source/control/prgsbar.cxx +++ b/svtools/source/control/prgsbar.cxx @@ -33,13 +33,9 @@ #define _SV_PRGSBAR_CXX -#ifndef _TOOLS_DEBUGS_HXX #include -#endif -#ifndef _VCL_STATUS_HXX #include -#endif -#include +#include // ======================================================================= diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 693bca733813..f2bcdcb4603d 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -30,23 +30,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #ifndef _STRING_HXX #define _STRING_HXX #endif -#ifndef __SGI_STL_VECTOR #include -#endif - #include #include #include - -#ifndef _RTL_USTRING_HXX_ -#include -#endif #include #define ROADMAP_INDENT_X 4 diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index c3f10f1866aa..489e43732489 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -35,11 +35,10 @@ #include #include #include - #include #define _SV_RULER_CXX -#include +#include // ======================================================================= diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 04f3d55c35b0..540c18a16702 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -30,11 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "scriptedtext.hxx" - -#ifndef __SGI_STL_VECTOR +#include #include -#endif #include #include #include diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 162f23948385..18387bda989c 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" #define _SVT_SCRWIN_CXX -#include +#include //=================================================================== diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 35250753de1e..f60370428e2e 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -32,15 +32,10 @@ #include "precompiled_svtools.hxx" #include - -#ifndef _APP_HXX #include -#endif - #include - -#include -#include +#include +#include // ======================================================================== diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index ed1abbe53a2a..6259433951f4 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "tabbar.hxx" +#include #include #include #include diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx index 146fa4933af3..45b6c36cf3a0 100644 --- a/svtools/source/control/taskbar.cxx +++ b/svtools/source/control/taskbar.cxx @@ -33,16 +33,11 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include - -#ifndef _VCL_FLOATWIN_HXX #include -#endif -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index 72a7345f1660..4633e509f40c 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -33,14 +33,11 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include #include - -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index bada5926d639..c86702ed5554 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -33,13 +33,10 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include - -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 82165a711285..6ec8680c6bfe 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -33,18 +33,15 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include #include #include #include #include - #include -#include +#include // ======================================================================= diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index aa18a3683916..09e9e9bb0ab0 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,18 +32,10 @@ #include "precompiled_svtools.hxx" #include - - -#include "addresstemplate.hxx" -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ +#include #include "addresstemplate.hrc" -#endif -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include @@ -52,9 +44,7 @@ #include #include #include -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include -#endif #include #include #include @@ -68,12 +58,9 @@ #include #include #include -#include "localresaccess.hxx" -#ifndef SVTOOLS_FILENOTATION_HXX_ +#include #include "svl/filenotation.hxx" -#endif #include - #include // ....................................................................... diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 63c0e6475597..56e5fcef3d40 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -28,15 +28,9 @@ * ************************************************************************/ -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ #include "addresstemplate.hrc" -#endif -#ifndef _SVT_CONTROLDIMS_HRC_ -#include "controldims.hrc" -#endif +#include #define FIELD_ROW_HEIGHT 17 diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx index b543aa895a8e..f8d686022393 100644 --- a/svtools/source/dialogs/filedlg.cxx +++ b/svtools/source/dialogs/filedlg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include PathDialog::PathDialog( Window* _pParent, WinBits nStyle, BOOL bCreateDir ) : diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 5a03ab3885b5..bd1f82223719 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -31,17 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_BUTTON_HXX //autogen #include -#endif #include #include #include #include - #include -#include -#include +#include +#include #include #include #include diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src index ecbabc79941b..dd73536dfc83 100644 --- a/svtools/source/dialogs/filedlg2.src +++ b/svtools/source/dialogs/filedlg2.src @@ -28,7 +28,8 @@ * ************************************************************************/ -#include +#include + String STR_FILEDLG_SELECT { Text [ en-US ] = "Select Directory" ; diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index a3a738a705fb..7117229e77e4 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "sores.hxx" +#include String STR_FORMAT_STRING { diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index a1bbbd9b9edb..757c04a59f60 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -36,7 +36,7 @@ // include --------------------------------------------------------------- #include -#include "sores.hxx" +#include #include #include diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx index 791e373086af..a0f56da986f2 100644 --- a/svtools/source/dialogs/logindlg.cxx +++ b/svtools/source/dialogs/logindlg.cxx @@ -30,16 +30,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include - -#ifndef _SVTOOLS_LOGINDLG_HRC_ #include "logindlg.hrc" -#endif -#ifndef _SVTOOLS_HRC #include -#endif #include #ifdef UNX diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index a006f209af18..a58b98daec6c 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -31,26 +31,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_APP_HXX #include -#endif -#ifndef _VCL_PRINT_HXX #include -#endif #include #include #include - #include "printdlg.hrc" -#include "controldims.hrc" +#include #include #include #include -#include +#include #include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx deleted file mode 100644 index 40fd55fb1586..000000000000 --- a/svtools/source/dialogs/propctrl.cxx +++ /dev/null @@ -1,506 +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: propctrl.cxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - - -#ifndef _USR_INTROSP_HXX -#include -#endif -#ifndef _USR_SERINFO_HXX -#include -#endif -#ifndef _USR_INTROSP_HXX -#include -#endif - -#include -#include - - -// Controller-Implementation -class PropertyEditorControler_Impl : public SvPropertyDataControl -{ - XIntrospectionAccessRef mxUnoAccess; - PropertySequence mPropSeq; - XPropertyEditorRef mxEditor; - SvPropertyBox* mpPropBox; - UsrAny maUnoObj; - -public: - // Provisorisch direkt Window mitgeben - PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ ); - //SimplePropertyEditor_Impl( void ); - - // Objekt zum Editieren setzen, dies loest das Eintragen - // der Properties in die PropertyBox aus - void setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj, - /* HACK fuer History-Interface*/String aPath, BOOL bBack=FALSE, BOOL bForward=FALSE ); - - /* SPAETER - SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); - - // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); - */ - - // Methoden von SvPropertyDataControl - virtual void Modified( const String& aName, - const String& aVal, - void* pData); - - virtual void Clicked( const String& aName, - const String& aVal, - void* pData); - - virtual void Commit( const String& aName, - const String& aVal, - void* pData); - - virtual void Select( const String& aName, - void* pData); - - virtual void LinkClicked(const String& aName, - void* pData); - - // TODO: Das muss raus, sehr unglueckliche Schnittstelle - // PropertyBox erzwingt Zustand des Controllers - virtual String GetTheCorrectProperty() const; -}; - -// Methoden von XPropertyEditor -PropertyEditorControler_Impl::PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ ) -{ - mpPropBox = pPropBox_; -} - -void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj, - /* HACK fuer History-Interface*/ String aPath, BOOL bBack, BOOL bForward ) -{ - static XIntrospectionRef xIntrospection; - - // Ohne Fenster laeuft gar nix - if( !mpPropBox ) - return; - - // Fenster aufraeumen - mpPropBox->ClearAll(); - - // Editor und Objekt übernehmen - mxEditor = xEditor_; - maUnoObj = aToEditObj; - - if( !xIntrospection.is() ) - { - // Introspection-Service holen - XServiceManagerRef xServiceManager = getGlobalServiceManager(); - XServiceProviderRef xProv = xServiceManager->getServiceProvider - ( "com.sun.star.beans.Introspection", UikSequence(), UikSequence() ); - xIntrospection = (XIntrospection *)xProv->newInstance() - ->queryInterface( XIntrospection::getSmartUik() ); - } - if( !xIntrospection.is() ) - return; - - // und unspecten - mxUnoAccess = xIntrospection->inspect( maUnoObj ); - if( !mxUnoAccess.Is() ) - return; - - // Uns als Controler anmelden - mpPropBox->SetController( this ); - - // Properties anlegen - mPropSeq = mxUnoAccess->getProperties(); - UINT32 nPropCount = mPropSeq.getLen(); - const Property* pProps = mPropSeq.getConstArray(); - - // 1. Seite anlegen - USHORT nPropPageId = mpPropBox->AppendPage("Properties"); - - // Beim Eintragen solls nicht flimmern - mpPropBox->DisableUpdate(); - - // Dummy-Properties fuer Path und Navigation - SvPropertyData aProperty; - if( aPath.Len() ) - { - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = FALSE; - aProperty.bIsLocked = TRUE; - aProperty.bHasVisibleXButton = FALSE; - aProperty.eKind = KOC_EDIT; - aProperty.pControl = NULL; - aProperty.pDataPtr = NULL; - aProperty.aName = "Path"; - aProperty.aValue = aPath; - mpPropBox->InsertEntry( aProperty ); - } - if( bBack || bForward ) - { - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = TRUE; - aProperty.bIsLocked = TRUE; - // HACK, solange Hyperlink nicht funktioniert - aProperty.bHasVisibleXButton = aProperty.bIsHyperLink; - aProperty.eKind = KOC_EDIT; - UINT32 iHandle; - aProperty.pControl = NULL; - if( bBack ) - { - iHandle = 1000001; - aProperty.pDataPtr = (void*)iHandle; - aProperty.aName = "<-"; - aProperty.aValue = "Back"; - mpPropBox->InsertEntry( aProperty ); - } - if( bForward ) - { - iHandle = 1000000; - aProperty.pDataPtr = (void*)iHandle; - aProperty.aName = "->"; - aProperty.aValue = "Forward"; - mpPropBox->InsertEntry( aProperty ); - } - } - - // Properties eintragen - // TODO: Wo kommen die Strings her - UINT32 i; - for( i = 0 ; i < nPropCount ; i++ ) - { - const Property& rProp = pProps[ i ]; - - // TypeClass des Property ermitteln - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = ( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT ); - aProperty.bIsLocked = ((rProp.Attributes & PROPERTY_READONLY) != 0 ); - - // HACK, solange Hyperlink nicht funktioniert - aProperty.bHasVisibleXButton = aProperty.bIsHyperLink; - - // Wert holen und in String wandeln - UsrAny aVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, i ); - String aStrVal = AnyToString( aVal ); - - // Properties reinbraten - aProperty.eKind = KOC_EDIT; - aProperty.aName = rProp.Name; - aProperty.aValue = aStrVal; - aProperty.pDataPtr = (void*)i; - aProperty.pControl = NULL; - //aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("2"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count()); - mpPropBox->InsertEntry( aProperty ); - } - - // 2. Seite fuer Listener - // TODO: Wo kommen die Eintraege her - USHORT nListenerPageId = mpPropBox->AppendPage("Listener"); - - XIdlClassSequence aSupportedListenerSeq = mxUnoAccess->getSupportedListeners(); - const XIdlClassRef* pListenerArray = aSupportedListenerSeq.getConstArray(); - UINT32 nIfaceCount = aSupportedListenerSeq.getLen(); - - // Property-Data vorfuellen - aProperty.eKind = KOC_EDIT; - //aProperty.eKind = KOC_UNDEFINED; - aProperty.aValue = "Listener-Value"; - aProperty.bHasVisibleXButton = TRUE; - // TEST - //aProperty.bIsHyperLink = TRUE; - aProperty.bIsHyperLink = FALSE; - aProperty.bIsLocked = TRUE; - //aProperty.bIsLocked = FALSE; - aProperty.pDataPtr = NULL; - aProperty.pControl = NULL; - - for( UINT32 j = 0 ; j < nIfaceCount ; j++ ) - { - const XIdlClassRef& rxIfaceClass = pListenerArray[j]; - aProperty.aName = rxIfaceClass->getName(); - mpPropBox->InsertEntry( aProperty ); - } - mpPropBox->EnableUpdate(); - mpPropBox->SetPage( nPropPageId ); -} - -void PropertyEditorControler_Impl::Modified -( const String& aName, const String& aVal, void* pData) -{ -} - -void PropertyEditorControler_Impl::Clicked -( const String& aName, const String& aVal, void* pData) -{ - // HACK, solange LinkClicked nicht funktioniert - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - { - // Spezial-IDs fuer forward/back? - BOOL bForward = (iPos == 1000000); - BOOL bBack = (iPos == 1000001); - if( bForward || bBack ) - { - // Unterstuetzt der PropertyEditor das? - XPropertyEditorNavigationRef xPropEdNav = (XPropertyEditorNavigation*) - mxEditor->queryInterface( XPropertyEditorNavigation::getSmartUik() ); - if( xPropEdNav.is() ) - { - if( bForward ) - xPropEdNav->forward(); - else - xPropEdNav->back(); - } - } - return; - } - - const Property* pProps = mPropSeq.getConstArray(); - const Property& rProp = pProps[ iPos ]; - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - if( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT ) - LinkClicked( aName, pData ); -} - -void PropertyEditorControler_Impl::Commit -( const String& aName, const String& aVal, void* pData) -{ - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - return; - - // String in Property-Typ wandeln - const Property* pProps = mPropSeq.getConstArray(); - const Property& rProp = pProps[ iPos ]; - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - UsrAny aValue = StringToAny( aVal, eType ); - - // Wert setzen - mxUnoAccess->setPropertyValueByIndex( maUnoObj, iPos, aValue ); - - // Wert neu holen und ggf. neu setzen - UsrAny aNewVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos ); - String aNewStrVal = AnyToString( aNewVal ); - if( aNewStrVal != aVal ) - mpPropBox->SetPropertyValue( aName, aNewStrVal ); -} - -void PropertyEditorControler_Impl::Select -( const String& aName, void* pData) -{ -} - -void PropertyEditorControler_Impl::LinkClicked(const String& aName, void* pData) -{ - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - return; - - // Wert holen und an Master-Controller zurueckgeben - UsrAny aNewObj = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos ); - mxEditor->setObject( aNewObj, aName ); -} - - -// TODO: Das muss raus, sehr unglueckliche Schnittstelle -// PropertyBox erzwingt Zustand des Controllers -String PropertyEditorControler_Impl::GetTheCorrectProperty() const -{ - return String(); -} - - -SMART_UNO_IMPLEMENTATION(SimplePropertyEditor_Impl,UsrObject); - -// Methoden von XInterface -XInterface * SimplePropertyEditor_Impl::queryInterface( Uik aUik ) -{ - if( aUik == XPropertyEditor::getSmartUik() ) - return (XPropertyEditor *)this; - if( aUik == XPropertyEditorNavigation::getSmartUik() ) - return (XPropertyEditorNavigation *)this; - return UsrObject::queryInterface( aUik ); -} - -XIdlClassRef SimplePropertyEditor_Impl::getIdlClass() -{ - // TODO: Unterstuetzen - return NULL; -} - - -// Methoden von SimplePropertyEditor_Impl -SimplePropertyEditor_Impl::SimplePropertyEditor_Impl( Window *pParent ) - : maHistorySeq( 10 ), maHistoryNames( 10 ), bSimpleHistory( FALSE ) -{ - //XVCLComponent xC = pParent->getVCLComponent - //xC->addVCLComponentListener( MyListener ) - - pActiveControler = NULL; - mpPropBox = new SvPropertyBox( pParent ); - mpPropBox->Show(); - - long cxOut = pParent->GetOutputSizePixel().Width(); - long cyOut = pParent->GetOutputSizePixel().Height(); - Size aSize( cxOut, cyOut ); - mpPropBox->SetPosSizePixel( Point( 0, 0 ), aSize ); - - mnHistoryCount = 0; - mnActualHistoryLevel = -1; -} - -SimplePropertyEditor_Impl::~SimplePropertyEditor_Impl() -{ - delete mpPropBox; - if( pActiveControler ) - delete pActiveControler; -} - -// Private Methode zum Anlegen/Aktivieren der Controller -void SimplePropertyEditor_Impl::showObject( const UsrAny& aToShowObj ) -{ - if( pActiveControler ) - delete pActiveControler; - - // Neuen Controller auf der Wiese anlegen (TODO: Controller cachen?) - pActiveControler = new PropertyEditorControler_Impl( mpPropBox ); - - XPropertyEditorRef xThis = (XPropertyEditor *)this; - pActiveControler->setObject( xThis, aToShowObj, - /*aPath*/bSimpleHistory ? getPath() : String(), - /*bBack*/bSimpleHistory && mnActualHistoryLevel > 0, - /*bForward*/bSimpleHistory && (INT32)mnHistoryCount > mnActualHistoryLevel ); -} - -String SimplePropertyEditor_Impl::getPath( void ) -{ - String aRetStr; - const String* pStr = maHistoryNames.getConstArray(); - for( INT32 i = 0 ; i <= mnActualHistoryLevel ; i++ ) - { - String aName = pStr[i]; - - // Root speziell behandeln - if( i == 0 ) - { - aRetStr += aName; - } - else - { - // Ist es ein Index? - long l = (long)aName; - String aNumStr( l ); - if( aNumStr == aName ) - { - aRetStr += '['; - aRetStr += aName; - aRetStr += ']'; - } - else - { - aRetStr += '.'; - aRetStr += aName; - } - } - } - return aRetStr; -} - -// Methoden von XPropertyEditor -void SimplePropertyEditor_Impl::setObject( const UsrAny& aToEditObj, const XubString& aObjName ) -{ - // History pflegen - mnActualHistoryLevel++; - mnHistoryCount = (UINT32)mnActualHistoryLevel; - UINT32 iHistorySize = maHistorySeq.getLen(); - if( mnHistoryCount > iHistorySize ) - { - maHistorySeq.realloc( iHistorySize + 10 ); - maHistoryNames.realloc( iHistorySize + 10 ); - } - - // Neues Object eintragen - maHistorySeq.getArray()[ mnHistoryCount ] = aToEditObj; - maHistoryNames.getArray()[ mnHistoryCount ] = aObjName; - - // Object anzeigen - showObject( aToEditObj ); -} - -// Methoden von PropertyEditorNavigation -void SimplePropertyEditor_Impl::forward(void) -{ - if( (INT32)mnHistoryCount > mnActualHistoryLevel ) - { - // Naechstes Object darstellen - mnActualHistoryLevel++; - showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] ); - } -} - -void SimplePropertyEditor_Impl::back(void) -{ - if( mnActualHistoryLevel > 0 ) - { - // Voriges Object darstellen - mnActualHistoryLevel--; - showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] ); - } -} - - diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx deleted file mode 100644 index 59019fc21b90..000000000000 --- a/svtools/source/dialogs/propctrl.hxx +++ /dev/null @@ -1,118 +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: propctrl.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* -#include -#include -#include "sbx.hxx" -#include "sbxbase.hxx" -#include "sbxres.hxx" -#include - */ - - -#ifndef __PROPED_HXX__ -#include -#endif -#ifndef _UNO_HXX -#include -#endif -#ifndef _USR_SEQU_HXX -#include -#endif -#ifndef __TOOLSIDL_HXX__ -#include -#endif - -/* -class XPropertyEditor - : public XInterface -{ -public: - - virtual void setObject(const UsrAny& aToInspectObj) = 0; - - static Uik getSmartUik() { return(385); } -}; -*/ - -class PropertyEditorControler_Impl; -class SvPropertyBox; -class Window; - -class SimplePropertyEditor_Impl : - public XPropertyEditor, - public XPropertyEditorNavigation, - public UsrObject -{ - PropertyEditorControler_Impl* pActiveControler; - SvPropertyBox* mpPropBox; - UsrAny maStartUnoObj; - UsrAny maActiveUnoObj; - - // History der Objekte speichern - AnySequence maHistorySeq; - WSStringSequence maHistoryNames; - UINT32 mnHistoryCount; - INT32 mnActualHistoryLevel; - - // Einfache History via Dummy-Properties - BOOL bSimpleHistory; - - // Methode zum Anlegen/Aktivieren der Controller - void showObject( const UsrAny& aToShowObj ); - String getPath( void ); - -public: - // Provisorischer Ctor mit Parent-Window - SimplePropertyEditor_Impl( Window *pParent ); - ~SimplePropertyEditor_Impl(); - - // HACK fuer History-Test - void enableSimpleHistory( BOOL bHistory_ ) { bSimpleHistory = bHistory_; } - - SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); - - // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); - - // Methoden von XPropertyEditor - virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName); - - // Methoden von PropertyEditorNavigation - virtual void forward(void); - virtual void back(void); - -}; - - - - diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c7473e446986..746121104a0a 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "roadmap.hxx" +#include #include #include diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index c99b917d891e..219bb8edd9ae 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.src @@ -28,10 +28,11 @@ * ************************************************************************/ -#include "sores.hxx" +#include "svtools/sores.hxx" #define __RSC -#include "soerr.hxx" +#include #define S_MAX 0x7fff + Resource RID_SO_ERROR_HANDLER { String ERRCODE_SO_GENERALERROR&S_MAX diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 990e3041d903..ea5c31d35a03 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "../../inc/txtattr.hxx" +#include MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx index 0a394207d051..e68307d01a57 100644 --- a/svtools/source/edit/sychconv.cxx +++ b/svtools/source/edit/sychconv.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "sychconv.hxx" +#include #include BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev ) diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index 09fd6b36fdb2..cca29b2fe0d0 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -30,7 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" - #include #include diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index b940bb6f4da7..397394cdf736 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx index e860a3a0cfd4..90785a366b62 100644 --- a/svtools/source/edit/txtattr.cxx +++ b/svtools/source/edit/txtattr.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 306307a0bf91..8c184ae10697 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -98,10 +98,6 @@ #endif -// Compilerfehler, wenn Optimierung bei WNT & MSC -#ifdef _MSC_VER -#pragma optimize( "", off ) -#endif // ----------- // - statics - diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx deleted file mode 100644 index d13767f494ef..000000000000 --- a/svtools/source/filter.vcl/filter/gradwrap.cxx +++ /dev/null @@ -1,573 +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: gradwrap.cxx,v $ - * $Revision: 1.8 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#include -#include -#include -#include - -// ------------------- -// - GradientWrapper - -// ------------------- - -GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl, - const Link& rDrawPolyPolyRecordHdl, - const Link& rSetFillInBrushRecordHdl) : - aDrawPolyRecordHdl (rDrawPolyRecordHdl), - aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), - aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl) -{ -} - -// ------------------------------------------------------------------------ - -GradientWrapper::~GradientWrapper() -{ -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteLinearGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - - Rectangle aRect = rRect; - aRect.Left()--; - aRect.Top()--; - aRect.Right()++; - aRect.Bottom()++; - - // rotiertes BoundRect ausrechnen - double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800; - double fWidth = aRect.GetWidth(); - double fHeight = aRect.GetHeight(); - double fDX = fWidth * fabs( cos( fAngle ) ) + - fHeight * fabs( sin( fAngle ) ); - double fDY = fHeight * fabs( cos( fAngle ) ) + - fWidth * fabs( sin( fAngle ) ); - fDX = (fDX - fWidth) * 0.5 + 0.5; - fDY = (fDY - fHeight) * 0.5 + 0.5; - aRect.Left() -= (long)fDX; - aRect.Right() += (long)fDX; - aRect.Top() -= (long)fDY; - aRect.Bottom() += (long)fDY; - - // Rand berechnen und Rechteck neu setzen - Point aCenter = rRect.Center(); - Rectangle aFullRect = aRect; - long nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100; - BOOL bLinear; - - // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf - if ( rGradient.GetStyle() == GRADIENT_LINEAR ) - { - bLinear = TRUE; - aRect.Top() += nBorder; - } - // Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf - else - { - bLinear = FALSE; - nBorder >>= 1; - - aRect.Top() += nBorder; - aRect.Bottom() -= nBorder; - } - - // Top darf nicht groesser als Bottom sein - aRect.Top() = Min( aRect.Top(), (long)(aRect.Bottom() - 1) ); - - long nMinRect = aRect.GetHeight(); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Falls axialer Farbverlauf, muss die Schrittanzahl ungerade sein - if ( !bLinear && !(nSteps & 1) ) - nSteps++; - - // Berechnung ueber Double-Addition wegen Genauigkeit - double fScanLine = aRect.Top(); - double fScanInc = (double)aRect.GetHeight() / (double)nSteps; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - long nSteps2; - - if ( bLinear ) - { - // Um 1 erhoeht, um die Border innerhalb der Schleife - // zeichnen zu koennen - nSteps2 = nSteps + 1; - } - else - { - nStepRed <<= 1; - nStepGreen <<= 1; - nStepBlue <<= 1; - nRed = nEndRed; - nGreen = nEndGreen; - nBlue = nEndBlue; - - // Um 2 erhoeht, um die Border innerhalb der Schleife - // zeichnen zu koennen - nSteps2 = nSteps + 2; - } - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Startpolygon erzeugen (== Borderpolygon) - Polygon aPoly( 4 ); - Polygon aTempPoly( 2 ); - aPoly[0] = aFullRect.TopLeft(); - aPoly[1] = aFullRect.TopRight(); - aPoly[2] = aRect.TopRight(); - aPoly[3] = aRect.TopLeft(); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - // Schleife, um rotierten Verlauf zu fuellen - for ( long i = 0; i < nSteps2; i++ ) - { - Polygon aTempPoly = aPoly; - aTempPoly.Clip( rRect ); - aDrawPolyRecordHdl.Call(&aTempPoly); - aTempPoly.SetSize( 2 ); - - // neues Polygon berechnen - aRect.Top() = (long)(fScanLine += fScanInc); - - // unteren Rand komplett fuellen - if ( i == nSteps ) - { - aTempPoly[0] = aFullRect.BottomLeft(); - aTempPoly[1] = aFullRect.BottomRight(); - } - else - { - aTempPoly[0] = aRect.TopLeft(); - aTempPoly[1] = aRect.TopRight(); - } - aTempPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPoly[0] = aPoly[3]; - aPoly[1] = aPoly[2]; - aPoly[2] = aTempPoly[1]; - aPoly[3] = aTempPoly[0]; - - // Farbintensitaeten aendern... - // fuer lineare FV - if ( bLinear ) - { - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - } - // fuer radiale FV - else - { - if ( i <= (nSteps >> 1) ) - { - nRed -= nStepRed; - nGreen -= nStepGreen; - nBlue -= nStepBlue; - } - // genau die Mitte und hoeher - else - { - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - } - } - - nRed = MinMax( nRed, 0, 255 ); - nGreen = MinMax( nGreen, 0, 255 ); - nBlue = MinMax( nBlue, 0, 255 ); - - // fuer lineare FV ganz normale Bestimmung der Farbe - if ( bLinear || (i <= nSteps) ) - { - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - } - // fuer axiale FV muss die letzte Farbe der ersten - // Farbe entsprechen - else - { - aCol = Color( (BYTE) nEndRed, (BYTE) nEndGreen, (BYTE) nEndBlue ); - } - - aSetFillInBrushRecordHdl.Call(&aCol); - } -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - Rectangle aClipRect = rRect; - Rectangle aRect = rRect; - long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; - long nZHeight= aRect.GetHeight() * (long)rGradient.GetOfsY() / 100; - Size aSize = aRect.GetSize(); - Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight ); - - // Radien-Berechnung fuer Kreisausgabe (Kreis schliesst Rechteck ein) - if ( rGradient.GetStyle() == GRADIENT_RADIAL ) - { - aSize.Width() = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() + - (double)aSize.Height()*(double)aSize.Height())); - aSize.Height() = aSize.Width(); - } - // Radien-Berechnung fuer Ellipse - else - { - aSize.Width() = (long)(0.5 + (double)aSize.Width() * 1.4142); - aSize.Height() = (long)(0.5 + (double)aSize.Height() * 1.4142); - } - - long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100; - long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100; - aSize.Width() -= nBorderX; - aSize.Height() -= nBorderY; - aRect.Left() = aCenter.X() - (aSize.Width() >> 1); - aRect.Top() = aCenter.Y() - (aSize.Height() >> 1); - aRect.SetSize( aSize ); - - long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() ); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen - double fScanLeft = aRect.Left(); - double fScanTop = aRect.Top(); - double fScanRight = aRect.Right(); - double fScanBottom = aRect.Bottom(); - double fScanInc = (double)nMinRect / (double)nSteps * 0.5; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Recteck erstmal ausgeben - PolyPolygon aPolyPoly( 2 ); - Polygon aPoly( rRect ); - - aPolyPoly.Insert( aPoly ); - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - aPolyPoly.Insert( aPoly ); - - // erstes Polygon zeichnen (entspricht Rechteck) - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - for ( long i = 0; i < nSteps; i++ ) - { - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - // neues Polygon berechnen - aRect.Left() = (long)(fScanLeft += fScanInc); - aRect.Top() = (long)(fScanTop += fScanInc); - aRect.Right() = (long)(fScanRight -= fScanInc); - aRect.Bottom() = (long)(fScanBottom -= fScanInc); - - if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) ) - break; - - aPoly = Polygon( aRect.Center(), - aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 ); - aPolyPoly.Replace( aPoly, 1 ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Farbe entsprechend anpassen - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - - nRed = MinMax( nRed, 0, 0xFF ); - nGreen = MinMax( nGreen, 0, 0xFF ); - nBlue = MinMax( nBlue, 0, 0xFF ); - } - - // Falls PolyPolygon-Ausgabe, muessen wir noch ein letztes - // inneres Polygon zeichnen - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - aPoly = aPolyPoly.GetObject( 1 ); - if ( !aPoly.GetBoundRect().IsEmpty() ) - { - aPoly.Clip( aClipRect ); - aDrawPolyRecordHdl.Call(&aPoly); - } -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteRectGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - Rectangle aClipRect = rRect; - Rectangle aRect = rRect; - - aRect.Left()--; - aRect.Top()--; - aRect.Right()++; - aRect.Bottom()++; - - // rotiertes BoundRect ausrechnen - double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800; - double fWidth = aRect.GetWidth(); - double fHeight = aRect.GetHeight(); - double fDX = fWidth * fabs( cos( fAngle ) ) + - fHeight * fabs( sin( fAngle ) ); - double fDY = fHeight * fabs( cos( fAngle ) ) + - fWidth * fabs( sin( fAngle ) ); - fDX = (fDX - fWidth) * 0.5 + 0.5; - fDY = (fDY - fHeight) * 0.5 + 0.5; - aRect.Left() -= (long)fDX; - aRect.Right() += (long)fDX; - aRect.Top() -= (long)fDY; - aRect.Bottom() += (long)fDY; - - // Quadratisch machen, wenn angefordert; - Size aSize = aRect.GetSize(); - if ( rGradient.GetStyle() == GRADIENT_SQUARE ) - { - if ( aSize.Width() > aSize.Height() ) - aSize.Height() = aSize.Width(); - else - aSize.Width() = aSize.Height(); - } - - // neue Mittelpunkte berechnen - long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; - long nZHeight = aRect.GetHeight() * (long)rGradient.GetOfsY() / 100; - long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100; - long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100; - Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight ); - - // Rand beruecksichtigen - aSize.Width() -= nBorderX; - aSize.Height() -= nBorderY; - - // Ausgaberechteck neu setzen - aRect.Left() = aCenter.X() - (aSize.Width() >> 1); - aRect.Top() = aCenter.Y() - (aSize.Height() >> 1); - aRect.SetSize( aSize ); - - long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() ); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen - double fScanLeft = aRect.Left(); - double fScanTop = aRect.Top(); - double fScanRight = aRect.Right(); - double fScanBottom = aRect.Bottom(); - double fScanInc = (double)nMinRect / (double)nSteps * 0.5; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Recteck erstmal ausgeben - PolyPolygon aPolyPoly( 2 ); - Polygon aPoly( rRect ); - - aPolyPoly.Insert( aPoly ); - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - aPolyPoly.Insert( aPoly ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Schleife, um nacheinander die Polygone/PolyPolygone auszugeben - for ( long i = 0; i < nSteps; i++ ) - { - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - // neues Polygon berechnen - aRect.Left() = (long)(fScanLeft += fScanInc); - aRect.Top() = (long)(fScanTop += fScanInc); - aRect.Right() = (long)(fScanRight -= fScanInc); - aRect.Bottom() = (long)(fScanBottom-= fScanInc); - - if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) ) - break; - - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 ); - aPolyPoly.Replace( aPoly, 1 ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Farben aendern - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - - nRed = MinMax( nRed, 0, 0xFF ); - nGreen = MinMax( nGreen, 0, 0xFF ); - nBlue = MinMax( nBlue, 0, 0xFF ); - } - - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - aPoly = aPolyPoly.GetObject( 1 ); - if ( !aPoly.GetBoundRect().IsEmpty() ) - { - aPoly.Clip( aClipRect ); - aDrawPolyRecordHdl.Call(&aPoly); - } -} diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk index 9d9679644685..e8e85db2185d 100644 --- a/svtools/source/java/makefile.mk +++ b/svtools/source/java/makefile.mk @@ -45,10 +45,6 @@ ENABLE_EXCEPTIONS=TRUE SRS1NAME= javaerror SRC1FILES= javaerror.src -SRS2NAME= patchjavaerror -SRC2FILES= patchjavaerror.src - - SLOFILES= \ $(SLO)$/javainteractionhandler.obj \ $(SLO)$/javacontext.obj diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src deleted file mode 100644 index 2d2ad06a9592..000000000000 --- a/svtools/source/java/patchjavaerror.src +++ /dev/null @@ -1,96 +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: patchjavaerror.src,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - -WarningBox WARNINGBOX_JAVANOTFOUND -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; -}; - -WarningBox WARNINGBOX_INVALIDJAVASETTINGS -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Java, select the Java runtime environment you want to have used by %PRODUCTNAME."; -}; - -QueryBox QBX_JAVADISABLED -{ - Buttons = WB_YES_NO_CANCEL ; - DefButton = WB_DEF_YES ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?"; -}; - -ErrorBox ERRORBOX_JVMCREATIONFAILED -{ - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; -}; - -ErrorBox ERRORBOX_RESTARTREQUIRED -{ - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now."; -}; - - - -String STR_WARNING_JAVANOTFOUND -{ - Text[ en-US ] = "JRE Required" ; -}; - -String STR_WARNING_INVALIDJAVASETTINGS -{ - Text[ en-US ] = "Select JRE"; -}; - -String STR_ERROR_RESTARTREQUIRED -{ - Text[ en-US ] = "Restart Required"; -}; - -String STR_QUESTION_JAVADISABLED -{ - Text[ en-US ] = "Enable JRE" ; -}; - - -String STR_ERROR_JVMCREATIONFAILED -{ - Text[ en-US ] = "JRE is Defective" ; -}; - - diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 16bc8339a0d9..e352d79ab3bf 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "acceleratorexecute.hxx" +#include //=============================================== // includes diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index c8c6428233e8..6f656bc5760e 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -37,7 +37,7 @@ #include #include -#include "cliplistener.hxx" +#include #include using namespace ::com::sun::star; diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 582d2bbf4879..4bc7cff4e3bd 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include "precompiled_svtools.hxx" -#include "dialogclosedlistener.hxx" +#include //......................................................................... namespace svt diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index d461e5898227..bbfa47f00145 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "dialogcontrolling.hxx" +#include #include #include diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 4084aa47bc80..36bf73c27903 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -46,7 +46,7 @@ #include #include #include -#include "sfxecode.hxx" +#include //========================================================================= diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src index 5267d13765c3..50487f398785 100644 --- a/svtools/source/misc/ehdl.src +++ b/svtools/source/misc/ehdl.src @@ -30,7 +30,8 @@ #define __RSC #include -#include "sfxecode.hxx" +#include + // pragma ---------------------------------------------------------------- String STR_ERR_HDLMESS diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src index 3ab58ef92dbf..306ccf7f164d 100644 --- a/svtools/source/misc/errtxt.src +++ b/svtools/source/misc/errtxt.src @@ -30,7 +30,7 @@ #define __RSC #include -#include "sfxecode.hxx" +#include "svtools/sfxecode.hxx" // pragma ---------------------------------------------------------------- Resource RID_ERRCTX { diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 51cd7ebfb740..7f35e516212c 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -30,20 +30,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "helpagentwindow.hxx" +#include #include -#ifndef _SV_BUTTON_HXX #include -#endif #include #include - -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #define WB_AGENT_STYLE 0 diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 76752b27354e..9ced32d82535 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -33,7 +33,7 @@ // includes -------------------------------------------------------------- -#include "imagemgr.hxx" +#include #include #include #include @@ -42,9 +42,7 @@ #include #include #include -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include #include @@ -54,9 +52,8 @@ #include #include #include - #include -#include "imagemgr.hrc" +#include #include #include diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index e082398beaa1..3797698e01f6 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -30,7 +30,7 @@ // includes ****************************************************************** #include -#include "imagemgr.hrc" +#include // images ******************************************************************** diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index b27bf6fa0174..219e3a8dda29 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -31,9 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef SVTOOLS_SOURCE_MISC_IMAGERESOURCEACCESS_HXX -#include "imageresourceaccess.hxx" -#endif +#include /** === begin UNO includes === **/ #include diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 9db70f852d30..a7b939ebd3ca 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "itemdel.hxx" +#include #include #include #include diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 348a9638399b..a3505f50a426 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "templatefoldercache.hxx" +#include #include #include #include diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 4a814637e1af..4f2d1593326a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -45,12 +45,8 @@ #include #include #include -#ifndef DEBUG_HXX #include -#endif -#ifndef URLOBJ_HXX #include -#endif #include #include #include @@ -63,21 +59,15 @@ #include #include #include - #include #include #include -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPE_HPP_ #include -#endif #include #include - #include "svl/urlbmk.hxx" -#include "inetimg.hxx" +#include #include #include #include diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 027dbc31572d..c18d40426409 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef DEBUG_HXX #include -#endif -#ifndef URLOBJ_HXX #include -#endif #include #include #include @@ -46,12 +42,9 @@ #include #include #include -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DROPTARGETDRAGCONTEXT_HPP_ #include -#endif - #include "svl/urlbmk.hxx" -#include "inetimg.hxx" +#include #include #include diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx index 6ceb414db003..f3b4d2daf0a3 100644 --- a/svtools/source/misc/wallitem.cxx +++ b/svtools/source/misc/wallitem.cxx @@ -51,7 +51,7 @@ #include #include -#include "wallitem.hxx" +#include #include // ----------------------------------------------------------------------- diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx deleted file mode 100644 index 7ae43194c2c9..000000000000 --- a/svtools/source/plugapp/commtest.cxx +++ /dev/null @@ -1,264 +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: commtest.cxx,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include -#include -#include - - -#include -#include "communi.hxx" -#include "brooker.hxx" -//#include - -#include "commtest.hrc" - - - -#define TCP_PORT 17612 - -#define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) ) - - -class PacketSender : public Timer -{ - SvStream* mpData; - CommunicationLinkRef mxCL; - -public: - PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL ); - virtual void Timeout(); -}; - -PacketSender::PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL ) -: mpData( pData ) -, mxCL( pCL ) -{ - SetTimeout( nDelay ); - Start(); -} - -void PacketSender::Timeout() -{ - mxCL->TransferDataStream( mpData ); - delete mpData; - delete this; -} - - - -class DelayedDeleter : public Timer -{ - CommunicationManager *mpManager; - -public: - DelayedDeleter( ULONG nDelay, CommunicationManager *pManager ); - virtual void Timeout(); -}; - -DelayedDeleter::DelayedDeleter( ULONG nDelay, CommunicationManager *pManager ) -: mpManager( pManager ) -{ - SetTimeout( nDelay ); - Start(); -} - -void DelayedDeleter::Timeout() -{ - delete mpManager; - delete this; -} - - - - -class CommunicationTester : public Application -{ - DECL_LINK( TBClick, ToolBox* ); - DECL_LINK( DataReceived, CommunicationLink* ); - DECL_LINK( ConnectionOpened, CommunicationLink* ); - DECL_LINK( ConnectionClosed, CommunicationLink* ); - - - CommunicationManager *pClientTcp, *pServerTcp; - InformationBroadcaster *pBCSTSend; - InformationBroadcaster *pBCSTListen; - InformationBrooker *pBCSTBrooker; -public: - CommunicationTester(); - - virtual void Main(); -}; - -CommunicationTester IchSelber; - -CommunicationTester::CommunicationTester() -: pClientTcp( NULL ) -, pServerTcp( NULL ) -, pBCSTSend( NULL ) -, pBCSTListen( NULL ) -, pBCSTBrooker( NULL ) -{} - -void CommunicationTester::Main() -{ - ResMgr *pRes = ResMgr::CreateResMgr( "commtest" ); - Resource::SetResManager( pRes ); - WorkWindow aWW( NULL, WB_APP | WB_STDWORK ); - aWW.Show(); - ToolBox aTB( &aWW, ResId( TBMenu ) ); - aTB.Show(); - aTB.RecalcItems(); - aTB.SetFloatingMode( TRUE ); - aTB.SetFloatingMode( FALSE ); - aTB.SetClickHdl( LINK( this, CommunicationTester, TBClick ) ); - - Execute(); -} - -#define SWITCH( pManager, ManagerClass ) \ -{ \ - if ( pManager ) \ - { \ - pManager->StopCommunication(); \ - new DelayedDeleter( 1000, pManager ); \ - pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK ); \ - pManager = NULL; \ - } \ - else \ - { \ - pManager = new ManagerClass; \ - pManager->SetConnectionOpenedHdl( LINK( this, CommunicationTester, ConnectionOpened ) );\ - pManager->SetConnectionClosedHdl( LINK( this, CommunicationTester, ConnectionClosed ) );\ - pManager->SetDataReceivedHdl( LINK( this, CommunicationTester, DataReceived ) );\ - pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK ); \ - } \ -} - - -IMPL_LINK( CommunicationTester, TBClick, ToolBox*, pTB ) -{ - switch ( pTB->GetCurItemId() ) - { - case SERVER_TCP: - { - SWITCH( pServerTcp, CommunicationManagerServerViaSocket( TCP_PORT, (USHORT) 32000 ) ); - if ( pServerTcp ) - pServerTcp->StartCommunication(); // Am Port horchen - } - break; - case CLIENT_TCP: - { - SWITCH( pClientTcp, CommunicationManagerClientViaSocket( "localhost", TCP_PORT ) ); - if ( pClientTcp ) - pClientTcp->StartCommunication(); // Eine Verbindung aufbauen - } - break; - case BCST_BROOKER: - { - if ( pBCSTBrooker ) - { - delete pBCSTBrooker; - pBCSTBrooker = NULL; - } - else - { - pBCSTBrooker = new InformationBrooker(); - } - } - break; - case BCST_LISTEN: - { - if ( pBCSTListen ) - { - delete pBCSTListen; - pBCSTListen = NULL; - } - else - { - pBCSTListen = new InformationBroadcaster(); - } - } - case BCST_SEND: - { - if ( pBCSTSend ) - { - pBCSTSend->Broadcast( BCST_CAT_PL2X, "Message: BCST_CAT_PL2X" ); - pBCSTSend->Broadcast( BCST_CAT_MINORCOPY, "Message: BCST_CAT_MINORCOPY" ); - pBCSTSend->Broadcast( BCST_CAT_DELIVER, "Message: BCST_CAT_DELIVER" ); - pBCSTSend->Broadcast( BCST_CAT_ALL, "Message: BCST_CAT_ALL" ); - } - else - { - pBCSTSend = new InformationBroadcaster(); - } - } - break; - } - return 0; -} - -IMPL_LINK( CommunicationTester, ConnectionOpened, CommunicationLink*, pCL ) -{ - SvStream *pData = pCL->GetBestCommunicationStream(); - while ( pData->Tell() < 70 ) *pData << 123; - - pCL->TransferDataStream( pData ); - return 0; -} - -IMPL_LINK( CommunicationTester, ConnectionClosed, CommunicationLink*, pCL ) -{ - return 0; -} - -IMPL_LINK( CommunicationTester, DataReceived, CommunicationLink*, pCL ) -{ - // Find Manager - CommunicationManager* pManager; - if ( pClientTcp && pClientTcp->IsLinkValid( pCL ) ) - { - pManager = pClientTcp; - } - if ( pServerTcp && pServerTcp->IsLinkValid( pCL ) ) - { - DBG_ASSERT( !pManager, "CommunicationLink bei mehreren Managern eingetragen"); - pManager = pServerTcp; - } - DBG_ASSERT( pCL->GetCommunicationManager() == pManager, "Manager des Link != Manager bei dem der Link Valid ist"); - - // Send Data Back (Echo) - new PacketSender( 1000, pCL->GetServiceData(), pCL ); - - return 0; -} - diff --git a/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc deleted file mode 100644 index c2e1db262e6a..000000000000 --- a/svtools/source/plugapp/commtest.hrc +++ /dev/null @@ -1,37 +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: commtest.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define TBMenu 256 - - -#define SERVER_TCP 1 -#define CLIENT_TCP 2 -#define BCST_BROOKER 3 -#define BCST_LISTEN 4 -#define BCST_SEND 5 diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src deleted file mode 100644 index beb9be750eb1..000000000000 --- a/svtools/source/plugapp/commtest.src +++ /dev/null @@ -1,63 +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: commtest.src,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "commtest.hrc" - -ToolBox TBMenu { - Border = TRUE; - SVLook = TRUE; - Dockable = TRUE; - Pos = MAP_APPFONT( 0, 0 ); - Size = MAP_APPFONT( 100, 20 ); - LineCount = 2; -// FloatingLines = 2; - ItemList = { - ToolBoxItem { - Identifier = SERVER_TCP; - Text = "Server TCP"; - }; - ToolBoxItem { - Identifier = CLIENT_TCP; - Text = "Client TCP"; - }; - ToolBoxItem { - Identifier = BCST_BROOKER; - Text = "BroadcastBrooker"; - }; - ToolBoxItem { - Identifier = BCST_SEND; - Text = "BroadcastClientSend"; - }; - ToolBoxItem { - Identifier = BCST_LISTEN; - Text = "BroadcastClientListen"; - }; - }; - Scroll = TRUE; -}; diff --git a/svtools/source/plugapp/makefile.mk b/svtools/source/plugapp/makefile.mk index d37e374917ac..dc4bbaed7a05 100644 --- a/svtools/source/plugapp/makefile.mk +++ b/svtools/source/plugapp/makefile.mk @@ -52,12 +52,6 @@ SRC2FILES= testtool.src LIB1TARGET= $(SLB)$/plugapp.lib LIB1OBJFILES= $(SLOFILES) -######## Testapplikation ######### - -SRC1FILES= commtest.src -SRS1NAME= commtest - -######## Ende Testapplikation ######### # --- Tagets ------------------------------------------------------- diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index 052b10d2c564..d2ffe5a784e1 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -37,8 +37,8 @@ #include #include -#include "htmlkywd.hxx" -#include "htmltokn.h" +#include +#include // die Tabelle muss noch sortiert werden struct HTML_TokenEntry diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 5bb26367075e..735e8eaf434d 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -39,7 +39,7 @@ #include #include -#include "htmlkywd.hxx" +#include #include #include #include diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index 9103161afb51..e4ef79accf22 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -40,8 +40,8 @@ #endif #include -#include "htmltokn.h" -#include "htmlkywd.hxx" +#include +#include /* */ diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index b4eb6c05cffd..b25e6a8cb328 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -51,8 +51,8 @@ #include #include -#include "htmltokn.h" -#include "htmlkywd.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index cb40b1d1f4e9..4b6b637fc073 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -37,8 +37,8 @@ #include #include #include -#include "rtftoken.h" -#include "rtfkeywd.hxx" +#include +#include #include const int MAX_STRING_LEN = 1024; diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx deleted file mode 100644 index 5c4e1039d92c..000000000000 --- a/svtools/source/svrtf/rtfkey2.cxx +++ /dev/null @@ -1,1162 +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: rtfkey2.cxx,v $ - * $Revision: 1.14.134.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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ - -#include "rtfkeywd.hxx" - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEXCHAR, "\\'" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IGNORE, "\\*" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPTHYPH, "\\-" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBENTRY, "\\:" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSH, "\\absh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSW, "\\absw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALT, "\\alt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTATION, "\\annotation" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSI, "\\ansi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNID, "\\atnid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUTHOR, "\\author" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_B, "\\b" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGBDIAG, "\\bgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGCROSS, "\\bgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDCROSS, "\\bgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKBDIAG, "\\bgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKCROSS, "\\bgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKDCROSS, "\\bgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKFDIAG, "\\bgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKHORIZ, "\\bgdkhoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKVERT, "\\bgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGFDIAG, "\\bgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGHORIZ, "\\bghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGVERT, "\\bgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BIN, "\\bin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINFSXN, "\\binfsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINSXN, "\\binsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLF, "\\bkmkcolf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLL, "\\bkmkcoll" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKEND, "\\bkmkend" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKSTART, "\\bkmkstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLUE, "\\blue" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BOX, "\\box" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRB, "\\brdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBAR, "\\brdrbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBTW, "\\brdrbtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRCF, "\\brdrcf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDB, "\\brdrdb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDOT, "\\brdrdot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRHAIR, "\\brdrhair" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRL, "\\brdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRR, "\\brdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRS, "\\brdrs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRSH, "\\brdrsh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRT, "\\brdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTH, "\\brdrth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRW, "\\brdrw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRSP, "\\brsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BULLET, "\\bullet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BUPTIM, "\\buptim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BXE, "\\bxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CAPS, "\\caps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CB, "\\cb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CBPAT, "\\cbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELL, "\\cell" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELLX, "\\cellx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CF, "\\cf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CFPAT, "\\cfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHATN, "\\chatn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDATE, "\\chdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPA, "\\chdpa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPL, "\\chdpl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTN, "\\chftn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEP, "\\chftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEPC, "\\chftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHPGN, "\\chpgn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHTIME, "\\chtime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGBDIAG, "\\clbgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGCROSS, "\\clbgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDCROSS, "\\clbgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKBDIAG, "\\clbgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKCROSS, "\\clbgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKDCROSS, "\\clbgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKFDIAG, "\\clbgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKHOR, "\\clbgdkhor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKVERT, "\\clbgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGFDIAG, "\\clbgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGHORIZ, "\\clbghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGVERT, "\\clbgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRB, "\\clbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRL, "\\clbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRR, "\\clbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRT, "\\clbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCBPAT, "\\clcbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCFPAT, "\\clcfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMGF, "\\clmgf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMRG, "\\clmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLSHDNG, "\\clshdng" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLNO, "\\colno" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLORTBL, "\\colortbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLS, "\\cols" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSR, "\\colsr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSX, "\\colsx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLUMN, "\\column" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLW, "\\colw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMMENT, "\\comment" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CREATIM, "\\creatim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CTRL, "\\ctrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFF, "\\deff" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFFORMAT, "\\defformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANG, "\\deflang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFTAB, "\\deftab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DELETED, "\\deleted" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTX, "\\dfrmtxtx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTY, "\\dfrmtxty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DIBITMAP, "\\dibitmap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DN, "\\dn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCCOMM, "\\doccomm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTEMP, "\\doctemp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPLI, "\\dropcapli" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPT, "\\dropcapt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSNOOVRLP, "\\absnoovrlp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DXFRTEXT, "\\dxfrtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DY, "\\dy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EDMINS, "\\edmins" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMDASH, "\\emdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDASH, "\\endash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDDOC, "\\enddoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNHERE, "\\endnhere" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNOTES, "\\endnotes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPND, "\\expnd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPNDTW, "\\expndtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_F, "\\f" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACINGP, "\\facingp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACPGSXN, "\\facpgsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FALT, "\\falt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FCHARSET, "\\fcharset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FDECOR, "\\fdecor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FI, "\\fi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FIELD, "\\field" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDDIRTY, "\\flddirty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDEDIT, "\\fldedit" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDINST, "\\fldinst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDLOCK, "\\fldlock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDPRIV, "\\fldpriv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDRSLT, "\\fldrslt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FMODERN, "\\fmodern" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FN, "\\fn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNIL, "\\fnil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTTBL, "\\fonttbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTER, "\\footer" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERF, "\\footerf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERL, "\\footerl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERR, "\\footerr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERY, "\\footery" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTNOTE, "\\footnote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FPRQ, "\\fprq" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRACWIDTH, "\\fracwidth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMAN, "\\froman" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FS, "\\fs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSCRIPT, "\\fscript" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSWISS, "\\fswiss" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTECH, "\\ftech" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNBJ, "\\ftnbj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNCN, "\\ftncn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRESTART, "\\ftnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEP, "\\ftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEPC, "\\ftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSTART, "\\ftnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNTJ, "\\ftntj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GREEN, "\\green" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTER, "\\gutter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTERSXN, "\\guttersxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADER, "\\header" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERF, "\\headerf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERL, "\\headerl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERR, "\\headerr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERY, "\\headery" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HR, "\\hr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHHOTZ, "\\hyphhotz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_I, "\\i" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ID, "\\id" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INFO, "\\info" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INTBL, "\\intbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IXE, "\\ixe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEP, "\\keep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEPN, "\\keepn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KERNING, "\\kerning" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYCODE, "\\keycode" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYWORDS, "\\keywords" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANDSCAPE, "\\landscape" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANG, "\\lang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LDBLQUOTE, "\\ldblquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVEL, "\\level" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LI, "\\li" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIN, "\\lin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINE, "\\line" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEBETCOL, "\\linebetcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINECONT, "\\linecont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEMOD, "\\linemod" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEPPAGE, "\\lineppage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINERESTART, "\\linerestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTART, "\\linestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTARTS, "\\linestarts" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEX, "\\linex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LNDSCPSXN, "\\lndscpsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LQUOTE, "\\lquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAC, "\\mac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MACPICT, "\\macpict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAKEBACKUP, "\\makebackup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGB, "\\margb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGBSXN, "\\margbsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGL, "\\margl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGLSXN, "\\marglsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGMIRROR, "\\margmirror" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGR, "\\margr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGRSXN, "\\margrsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGT, "\\margt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGTSXN, "\\margtsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MIN, "\\min" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MO, "\\mo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTCSET, "\\nextcset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTFILE, "\\nextfile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARS, "\\nofchars" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFPAGES, "\\nofpages" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFWORDS, "\\nofwords" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLINE, "\\noline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSUPERSUB, "\\nosupersub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWRAP, "\\nowrap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPERATOR, "\\operator" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTL, "\\outl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGE, "\\page" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGEBB, "\\pagebb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERH, "\\paperh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERW, "\\paperw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAR, "\\par" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PARD, "\\pard" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PC, "\\pc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PCA, "\\pca" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGHSXN, "\\pghsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCONT, "\\pgncont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDEC, "\\pgndec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCLTR, "\\pgnlcltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCRM, "\\pgnlcrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNRESTART, "\\pgnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTART, "\\pgnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTARTS, "\\pgnstarts" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCLTR, "\\pgnucltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCRM, "\\pgnucrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNX, "\\pgnx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNY, "\\pgny" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGWSXN, "\\pgwsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHCOL, "\\phcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHMRG, "\\phmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHPG, "\\phpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPB, "\\piccropb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPL, "\\piccropl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPR, "\\piccropr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPT, "\\piccropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICH, "\\pich" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICHGOAL, "\\pichgoal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALED, "\\picscaled" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEX, "\\picscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEY, "\\picscaley" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICT, "\\pict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICW, "\\picw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICWGOAL, "\\picwgoal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PLAIN, "\\plain" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PMMETAFILE, "\\pmmetafile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGX, "\\posnegx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGY, "\\posnegy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSX, "\\posx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXC, "\\posxc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXI, "\\posxi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXL, "\\posxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXO, "\\posxo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXR, "\\posxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSY, "\\posy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYB, "\\posyb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYC, "\\posyc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIL, "\\posyil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYT, "\\posyt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTIM, "\\printim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSOVER, "\\psover" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVMRG, "\\pvmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPARA, "\\pvpara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPG, "\\pvpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QC, "\\qc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QJ, "\\qj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QL, "\\ql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QR, "\\qr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RDBLQUOTE, "\\rdblquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RED, "\\red" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVBAR, "\\revbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISED, "\\revised" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISIONS, "\\revisions" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROP, "\\revprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTIM, "\\revtim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RI, "\\ri" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RIN, "\\rin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ROW, "\\row" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RQUOTE, "\\rquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTF, "\\rtf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RXE, "\\rxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_S, "\\s" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SA, "\\sa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SB, "\\sb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBASEDON, "\\sbasedon" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKCOL, "\\sbkcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKEVEN, "\\sbkeven" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKNONE, "\\sbknone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKODD, "\\sbkodd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKPAGE, "\\sbkpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBYS, "\\sbys" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SCAPS, "\\scaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECT, "\\sect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTD, "\\sectd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHAD, "\\shad" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADING, "\\shading" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIFT, "\\shift" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SL, "\\sl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SNEXT, "\\snext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKE, "\\strike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STYLESHEET, "\\stylesheet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUB, "\\sub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBJECT, "\\subject" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUPER, "\\super" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TAB, "\\tab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TB, "\\tb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TC, "\\tc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCF, "\\tcf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCL, "\\tcl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TEMPLATE, "\\template" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLE, "\\title" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLEPG, "\\titlepg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLDOT, "\\tldot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLEQ, "\\tleq" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLHYPH, "\\tlhyph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLTH, "\\tlth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLUL, "\\tlul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQC, "\\tqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQDEC, "\\tqdec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQR, "\\tqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQL, "\\tql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRGAPH, "\\trgaph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRLEFT, "\\trleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TROWD, "\\trowd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQC, "\\trqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQL, "\\trql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQR, "\\trqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRRH, "\\trrh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TX, "\\tx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TXE, "\\txe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UL, "\\ul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULD, "\\uld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDB, "\\uldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULNONE, "\\ulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULW, "\\ulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UP, "\\up" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_V, "\\v" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERN, "\\vern" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERSION, "\\version" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALB, "\\vertalb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALC, "\\vertalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALJ, "\\vertalj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALT, "\\vertalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBITMAP, "\\wbitmap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMBITSPIXEL, "\\wbmbitspixel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMPLANES, "\\wbmplanes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMWIDTHBYTES, "\\wbmwidthbytes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDOWCTRL, "\\widowctrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WMETAFILE, "\\wmetafile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XE, "\\xe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YR, "\\yr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBRKHYPH, "\\_" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMULA, "\\|" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBREAK, "\\~" ); - - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AB, "\\ab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACAPS, "\\acaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACF, "\\acf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADDITIVE, "\\additive" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADN, "\\adn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDDOC, "\\aenddoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDNOTES, "\\aendnotes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AEXPND, "\\aexpnd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AF, "\\af" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFS, "\\afs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNBJ, "\\aftnbj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNCN, "\\aftncn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNALC, "\\aftnnalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAR, "\\aftnnar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAUC, "\\aftnnauc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHI, "\\aftnnchi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRLC, "\\aftnnrlc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRUC, "\\aftnnruc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRESTART, "\\aftnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRSTCONT, "\\aftnrstcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEP, "\\aftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEPC, "\\aftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSTART, "\\aftnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNTJ, "\\aftntj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AI, "\\ai" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALANG, "\\alang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALLPROT, "\\allprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTPROT, "\\annotprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AOUTL, "\\aoutl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASCAPS, "\\ascaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASHAD, "\\ashad" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASTRIKE, "\\astrike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNAUTHOR, "\\atnauthor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNICN, "\\atnicn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNREF, "\\atnref" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNTIME, "\\atntime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFEND, "\\atrfend" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFSTART, "\\atrfstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUL, "\\aul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULD, "\\auld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULDB, "\\auldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULNONE, "\\aulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULW, "\\aulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUP, "\\aup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKPUB, "\\bkmkpub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASH, "\\brdrdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRKFRM, "\\brkfrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CCHS, "\\cchs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CPG, "\\cpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CS, "\\cs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CVMME, "\\cvmme" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATAFIELD, "\\datafield" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DO, "\\do" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXCOLUMN, "\\dobxcolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXMARGIN, "\\dobxmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXPAGE, "\\dobxpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYMARGIN, "\\dobymargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPAGE, "\\dobypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPARA, "\\dobypara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DODHGT, "\\dodhgt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOLOCK, "\\dolock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDHOL, "\\dpaendhol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDL, "\\dpaendl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDSOL, "\\dpaendsol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDW, "\\dpaendw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARC, "\\dparc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPX, "\\dparcflipx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPY, "\\dparcflipy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTHOL, "\\dpastarthol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTL, "\\dpastartl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTSOL, "\\dpastartsol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTW, "\\dpastartw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCALLOUT, "\\dpcallout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOA, "\\dpcoa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOACCENT, "\\dpcoaccent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBESTFIT, "\\dpcobestfit" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBORDER, "\\dpcoborder" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODABS, "\\dpcodabs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODBOTTOM, "\\dpcodbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODCENTER, "\\dpcodcenter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODTOP, "\\dpcodtop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOLENGTH, "\\dpcolength" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSX, "\\dpcominusx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSY, "\\dpcominusy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOOFFSET, "\\dpcooffset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOSMARTA, "\\dpcosmarta" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTDOUBLE, "\\dpcotdouble" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTRIGHT, "\\dpcotright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTSINGLE, "\\dpcotsingle" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTTRIPLE, "\\dpcottriple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOUNT, "\\dpcount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPELLIPSE, "\\dpellipse" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPENDGROUP, "\\dpendgroup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCB, "\\dpfillbgcb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCG, "\\dpfillbgcg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCR, "\\dpfillbgcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGGRAY, "\\dpfillbggray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGPAL, "\\dpfillbgpal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCB, "\\dpfillfgcb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCG, "\\dpfillfgcg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCR, "\\dpfillfgcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGGRAY, "\\dpfillfggray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGPAL, "\\dpfillfgpal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLPAT, "\\dpfillpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPGROUP, "\\dpgroup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINE, "\\dpline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOB, "\\dplinecob" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOG, "\\dplinecog" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOR, "\\dplinecor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADO, "\\dplinedado" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADODO, "\\dplinedadodo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDASH, "\\dplinedash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDOT, "\\dplinedot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEGRAY, "\\dplinegray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEHOLLOW, "\\dplinehollow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEPAL, "\\dplinepal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINESOLID, "\\dplinesolid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEW, "\\dplinew" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYCOUNT, "\\dppolycount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYGON, "\\dppolygon" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYLINE, "\\dppolyline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTX, "\\dpptx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTY, "\\dppty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPRECT, "\\dprect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPROUNDR, "\\dproundr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADOW, "\\dpshadow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADX, "\\dpshadx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADY, "\\dpshady" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBX, "\\dptxbx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXMAR, "\\dptxbxmar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXTEXT, "\\dptxbxtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPX, "\\dpx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPXSIZE, "\\dpxsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPY, "\\dpy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPYSIZE, "\\dpysize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DS, "\\ds" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMSPACE, "\\emspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENSPACE, "\\enspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIDI, "\\fbidi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FET, "\\fet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FID, "\\fid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILE, "\\file" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILETBL, "\\filetbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDALT, "\\fldalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNETWORK, "\\fnetwork" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTEMB, "\\fontemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTFILE, "\\fontfile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMDISP, "\\formdisp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMPROT, "\\formprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMSHADE, "\\formshade" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOSNUM, "\\fosnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRELATIVE, "\\frelative" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNALT, "\\ftnalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNIL, "\\ftnil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNALC, "\\ftnnalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAR, "\\ftnnar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAUC, "\\ftnnauc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHI, "\\ftnnchi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRLC, "\\ftnnrlc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRUC, "\\ftnnruc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTCONT, "\\ftnrstcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTPG, "\\ftnrstpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTTRUETYPE, "\\fttruetype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDDOS, "\\fvaliddos" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDHPFS, "\\fvalidhpfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDMAC, "\\fvalidmac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDNTFS, "\\fvalidntfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHAUTO, "\\hyphauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCAPS, "\\hyphcaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCONSEC, "\\hyphconsec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHPAR, "\\hyphpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSELF, "\\linkself" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSTYLES, "\\linkstyles" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRCH, "\\ltrch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRDOC, "\\ltrdoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRMARK, "\\ltrmark" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRPAR, "\\ltrpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRROW, "\\ltrrow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRSECT, "\\ltrsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCOLBAL, "\\nocolbal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOEXTRASPRL, "\\noextrasprl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOTABIND, "\\notabind" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWIDCTLPAR, "\\nowidctlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIAS, "\\objalias" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIGN, "\\objalign" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJAUTLINK, "\\objautlink" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCLASS, "\\objclass" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPB, "\\objcropb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPL, "\\objcropl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPR, "\\objcropr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPT, "\\objcropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJDATA, "\\objdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJECT, "\\object" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJEMB, "\\objemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJH, "\\objh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJICEMB, "\\objicemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLINK, "\\objlink" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLOCK, "\\objlock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJNAME, "\\objname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJPUB, "\\objpub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEX, "\\objscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEY, "\\objscaley" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSECT, "\\objsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSETSIZE, "\\objsetsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSUB, "\\objsub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTIME, "\\objtime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTRANSY, "\\objtransy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJUPDATE, "\\objupdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJW, "\\objw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OTBLRUL, "\\otblrul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHN, "\\pgnhn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSC, "\\pgnhnsc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSH, "\\pgnhnsh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSM, "\\pgnhnsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSN, "\\pgnhnsn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSP, "\\pgnhnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBMP, "\\picbmp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBPP, "\\picbpp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PN, "\\pn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNACROSS, "\\pnacross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNB, "\\pnb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCAPS, "\\pncaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCARD, "\\pncard" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCF, "\\pncf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDEC, "\\pndec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNF, "\\pnf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNFS, "\\pnfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNHANG, "\\pnhang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNI, "\\pni" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNINDENT, "\\pnindent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCLTR, "\\pnlcltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCRM, "\\pnlcrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVL, "\\pnlvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBLT, "\\pnlvlblt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBODY, "\\pnlvlbody" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLCONT, "\\pnlvlcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNNUMONCE, "\\pnnumonce" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORD, "\\pnord" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORDT, "\\pnordt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNPREV, "\\pnprev" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQC, "\\pnqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQL, "\\pnql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQR, "\\pnqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRESTART, "\\pnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSCAPS, "\\pnscaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSECLVL, "\\pnseclvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSP, "\\pnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTART, "\\pnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTRIKE, "\\pnstrike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTEXT, "\\pntext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTA, "\\pntxta" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTB, "\\pntxtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCLTR, "\\pnucltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCRM, "\\pnucrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUL, "\\pnul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULD, "\\pnuld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULDB, "\\pnuldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULNONE, "\\pnulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULW, "\\pnulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRCOLBL, "\\prcolbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTDATA, "\\printdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSZ, "\\psz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PUBAUTO, "\\pubauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RESULT, "\\result" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTH, "\\revauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTM, "\\revdttm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROT, "\\revprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTBL, "\\revtbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTBMP, "\\rsltbmp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTMERGE, "\\rsltmerge" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTPICT, "\\rsltpict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTRTF, "\\rsltrtf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTTXT, "\\rslttxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLCH, "\\rtlch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLDOC, "\\rtldoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLMARK, "\\rtlmark" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLPAR, "\\rtlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLROW, "\\rtlrow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLSECT, "\\rtlsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SEC, "\\sec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTNUM, "\\sectnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTUNLOCKED, "\\sectunlocked" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SLMULT, "\\slmult" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTCOL, "\\softcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLHEIGHT, "\\softlheight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLINE, "\\softline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTPAGE, "\\softpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSSPBF, "\\sprsspbf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSP, "\\sprstsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBDOCUMENT, "\\subdocument" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SWPBDR, "\\swpbdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCN, "\\tcn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRANSMF, "\\transmf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRB, "\\trbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRH, "\\trbrdrh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRL, "\\trbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRR, "\\trbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRT, "\\trbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRV, "\\trbrdrv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRHDR, "\\trhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRKEEP, "\\trkeep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDB, "\\trpaddb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDL, "\\trpaddl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDR, "\\trpaddr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDT, "\\trpaddt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFB, "\\trpaddfb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFL, "\\trpaddfl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFR, "\\trpaddfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFT, "\\trpaddft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WRAPTRSP, "\\wraptrsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XEF, "\\xef" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWJ, "\\zwj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWNJ, "\\zwnj" ); - -// neue Tokens zur 1.5 -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSLOCK, "\\abslock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADJUSTRIGHT, "\\adjustright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHOSUNG, "\\aftnnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCNUM, "\\aftnncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBAR, "\\aftnndbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUM, "\\aftnndbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMD, "\\aftnndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMK, "\\aftnndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMT, "\\aftnndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGANADA, "\\aftnnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUM, "\\aftnngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMD, "\\aftnngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMK, "\\aftnngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUML, "\\aftnngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIAC, "\\aftnnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACD, "\\aftnnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACL, "\\aftnnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANIMTEXT, "\\animtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSICPG, "\\ansicpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BACKGROUND, "\\background" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BDBFHDR, "\\bdbfhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPTAG, "\\bliptag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUID, "\\blipuid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUPI, "\\blipupi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRART, "\\brdrart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHD, "\\brdrdashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDD, "\\brdrdashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDOTSTR, "\\brdrdashdotstr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHSM, "\\brdrdashsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDREMBOSS, "\\brdremboss" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRENGRAVE, "\\brdrengrave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRFRAME, "\\brdrframe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNLG, "\\brdrthtnlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNMG, "\\brdrthtnmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNSG, "\\brdrthtnsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHLG, "\\brdrtnthlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHMG, "\\brdrtnthmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHSG, "\\brdrtnthsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNLG, "\\brdrtnthtnlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNMG, "\\brdrtnthtnmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNSG, "\\brdrtnthtnsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTRIPLE, "\\brdrtriple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVY, "\\brdrwavy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVYDB, "\\brdrwavydb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CATEGORY, "\\category" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CGRID, "\\cgrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHARSCALEX, "\\charscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGBDIAG, "\\chbgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGCROSS, "\\chbgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDCROSS, "\\chbgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKBDIAG, "\\chbgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKCROSS, "\\chbgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKDCROSS, "\\chbgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKFDIAG, "\\chbgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKHORIZ, "\\chbgdkhoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKVERT, "\\chbgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGFDIAG, "\\chbgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGHORIZ, "\\chbghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGVERT, "\\chbgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBRDR, "\\chbrdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCBPAT, "\\chcbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCFPAT, "\\chcfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHSHDNG, "\\chshdng" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADL, "\\clpadl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADT, "\\clpadt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADB, "\\clpadb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADR, "\\clpadr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFL, "\\clpadfl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFT, "\\clpadft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFB, "\\clpadfb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFR, "\\clpadfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTB, "\\cltxlrtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRL, "\\cltxtbrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALB, "\\clvertalb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALC, "\\clvertalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALT, "\\clvertalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMGF, "\\clvmgf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMRG, "\\clvmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRLV, "\\cltxtbrlv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXBTLR, "\\cltxbtlr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTBV, "\\cltxlrtbv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMPANY, "\\company" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRAUTH, "\\crauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRDATE, "\\crdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATE, "\\date" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANGFE, "\\deflangfe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRAUTH, "\\dfrauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRDATE, "\\dfrdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTART, "\\dfrstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTOP, "\\dfrstop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRXST, "\\dfrxst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DGMARGIN, "\\dgmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DNTBLNSBDB, "\\dntblnsbdb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTYPE, "\\doctype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCVAR, "\\docvar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODESCENT, "\\dpcodescent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMBO, "\\embo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMFBLIP, "\\emfblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPSHRTN, "\\expshrtn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAAUTO, "\\faauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIAS, "\\fbias" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFRES, "\\ffdefres" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFTEXT, "\\ffdeftext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFENTRYMCR, "\\ffentrymcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFEXITMCR, "\\ffexitmcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFFORMAT, "\\ffformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHASLISTBOX, "\\ffhaslistbox" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHELPTEXT, "\\ffhelptext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHPS, "\\ffhps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFL, "\\ffl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFMAXLEN, "\\ffmaxlen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFNAME, "\\ffname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNHELP, "\\ffownhelp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNSTAT, "\\ffownstat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFPROT, "\\ffprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRECALC, "\\ffrecalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRES, "\\ffres" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSIZE, "\\ffsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSTATTEXT, "\\ffstattext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPE, "\\fftype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPETXT, "\\fftypetxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDTYPE, "\\fldtype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNAME, "\\fname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMFIELD, "\\formfield" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMTEXT, "\\fromtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHOSUNG, "\\ftnnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCNUM, "\\ftnncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBAR, "\\ftnndbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUM, "\\ftnndbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMD, "\\ftnndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMK, "\\ftnndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMT, "\\ftnndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGANADA, "\\ftnnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUM, "\\ftnngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMD, "\\ftnngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMK, "\\ftnngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUML, "\\ftnngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIAC, "\\ftnnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACD, "\\ftnnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACL, "\\ftnnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_G, "\\g" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GCW, "\\gcw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRIDTBL, "\\gridtbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HIGHLIGHT, "\\highlight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLFR, "\\hlfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLINKBASE, "\\hlinkbase" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLLOC, "\\hlloc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLSRC, "\\hlsrc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ILVL, "\\ilvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IMPR, "\\impr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_JPEGBLIP, "\\jpegblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELFOLLOW, "\\levelfollow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELINDENT, "\\levelindent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELJC, "\\leveljc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELLEGAL, "\\levellegal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNFC, "\\levelnfc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNORESTART, "\\levelnorestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNUMBERS, "\\levelnumbers" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELOLD, "\\levelold" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREV, "\\levelprev" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREVSPACE, "\\levelprevspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSPACE, "\\levelspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSTARTAT, "\\levelstartat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELTEXT, "\\leveltext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKVAL, "\\linkval" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIST, "\\list" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTID, "\\listid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTLEVEL, "\\listlevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTNAME, "\\listname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDE, "\\listoverride" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDECOUNT, "\\listoverridecount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDEFORMAT, "\\listoverrideformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDESTART, "\\listoverridestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDETABLE, "\\listoverridetable" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTRESTARTHDN, "\\listrestarthdn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTSIMPLE, "\\listsimple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTABLE, "\\listtable" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEMPLATEID, "\\listtemplateid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEXT, "\\listtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LS, "\\ls" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTEXCTTP, "\\lytexcttp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTPRTMET, "\\lytprtmet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MANAGER, "\\manager" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MSMCAP, "\\msmcap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARSWS, "\\nofcharsws" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLEAD, "\\nolead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NONSHPPICT, "\\nonshppict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSECTEXPAND, "\\nosectexpand" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSNAPLINEGRID, "\\nosnaplinegrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSPACEFORUL, "\\nospaceforul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOULTRLSPC, "\\noultrlspc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOXLATTOYEN, "\\noxlattoyen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJATTPH, "\\objattph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJHTML, "\\objhtml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJOCX, "\\objocx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDLINEWRAP, "\\oldlinewrap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTLINELEVEL, "\\outlinelevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OVERLAY, "\\overlay" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PANOSE, "\\panose" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRB, "\\pgbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRFOOT, "\\pgbrdrfoot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRHEAD, "\\pgbrdrhead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRL, "\\pgbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDROPT, "\\pgbrdropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRR, "\\pgbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRSNAP, "\\pgbrdrsnap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRT, "\\pgbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCHOSUNG, "\\pgnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCNUM, "\\pgncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMK, "\\pgndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMT, "\\pgndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGANADA, "\\pgnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUM, "\\pgngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMD, "\\pgngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMK, "\\pgngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUML, "\\pgngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIAC, "\\pgnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACD, "\\pgnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACL, "\\pgnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICPROP, "\\picprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEO, "\\pnaiueo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEOD, "\\pnaiueod" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCHOSUNG, "\\pnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMD, "\\pndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMK, "\\pndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUML, "\\pndbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMT, "\\pndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGANADA, "\\pnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBLIP, "\\pngblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUM, "\\pngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMD, "\\pngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMK, "\\pngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUML, "\\pngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRAUTH, "\\pnrauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRDATE, "\\pnrdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNFC, "\\pnrnfc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNOT, "\\pnrnot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRPNBR, "\\pnrpnbr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRRGB, "\\pnrrgb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTART, "\\pnrstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTOP, "\\pnrstop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRXST, "\\pnrxst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIAC, "\\pnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACD, "\\pnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACL, "\\pnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LFOLEVEL, "\\lfolevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIN, "\\posyin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYOUT, "\\posyout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRIVATE, "\\private" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPNAME, "\\propname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPTYPE, "\\proptype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTHDEL, "\\revauthdel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTMDEL, "\\revdttmdel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SAUTOUPD, "\\sautoupd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTDEFAULTCL, "\\sectdefaultcl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTEXPAND, "\\sectexpand" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTLINEGRID, "\\sectlinegrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYCL, "\\sectspecifycl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYL, "\\sectspecifyl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIDDEN, "\\shidden" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXCOLUMN, "\\shpbxcolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXMARGIN, "\\shpbxmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXPAGE, "\\shpbxpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYMARGIN, "\\shpbymargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPAGE, "\\shpbypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPARA, "\\shpbypara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFBLWTXT, "\\shpfblwtxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFHDR, "\\shpfhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPGRP, "\\shpgrp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLID, "\\shplid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLOCKANCHOR, "\\shplockanchor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPPICT, "\\shppict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRSLT, "\\shprslt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTXT, "\\shptxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWRK, "\\shpwrk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWR, "\\shpwr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPZ, "\\shpz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSBSP, "\\sprsbsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSLNSP, "\\sprslnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSM, "\\sprstsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STATICVAL, "\\staticval" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STEXTFLOW, "\\stextflow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKED, "\\striked" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBFONTBYSIZE, "\\subfontbysize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCELLD, "\\tcelld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TIME, "\\time" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRUNCATEFONTHEIGHT, "\\truncatefontheight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UC, "\\uc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UD, "\\ud" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASH, "\\uldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHD, "\\uldashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHDD, "\\uldashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTH, "\\ulth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULWAVE, "\\ulwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULC, "\\ulc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_U, "\\u" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPR, "\\upr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_USERPROPS, "\\userprops" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWKIND, "\\viewkind" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWSCALE, "\\viewscale" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWZK, "\\viewzk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDCTLPAR, "\\widctlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WINDOWCAPTION, "\\windowcaption" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPEQN, "\\wpeqn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPJST, "\\wpjst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPSP, "\\wpsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YXE, "\\yxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTB, "\\frmtxlrtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRL, "\\frmtxtbrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXBTLR, "\\frmtxbtlr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTBV, "\\frmtxlrtbv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRLV, "\\frmtxtbrlv" ); - -// MS-2000 Tokens -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHD, "\\ulthd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASH, "\\ulthdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULLDASH, "\\ulldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHLDASH, "\\ulthldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHD, "\\ulthdashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHDD, "\\ulthdashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULHWAVE, "\\ulhwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULULDBWAVE, "\\ululdbwave" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH, "\\loch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH, "\\hich" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH, "\\dbch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANGFE, "\\langfe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG, "\\adeflang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF, "\\adeff" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE, "\\accnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT, "\\accdot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA, "\\acccomma" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE, "\\twoinone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT, "\\horzvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG, "\\fahang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR, "\\favar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER, "\\facenter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN, "\\faroman" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED, "\\fafixed" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP, "\\nocwrap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOOVERFLOW,"\\nooverflow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA, "\\aspalpha" ); - -// SWG spezifische Attribute -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNV, "\\grfalignv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNH, "\\grfalignh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFMIRROR, "\\grfmirror" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYB, "\\headeryb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXL, "\\headerxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXR, "\\headerxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYT, "\\footeryt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXL, "\\footerxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXR, "\\footerxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYH, "\\headeryh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYH, "\\footeryh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BALANCEDCOLUMN, "\\swcolmnblnc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPDNPROP, "\\updnprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRTDATA, "\\prtdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKKEY, "\\bkmkkey" ); - -// Attribute fuer die freifliegenden Rahmen -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRINT, "\\flyprint" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYOPAQUE, "\\flyopaque" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRTCTD, "\\flyprtctd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYMAINCNT, "\\flymaincnt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYVERT, "\\flyvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYHORZ, "\\flyhorz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTL, "\\dfrmtxtl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTR, "\\dfrmtxtr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTU, "\\dfrmtxtu" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTW, "\\dfrmtxtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYANCHOR, "\\flyanchor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCNTNT, "\\flycntnt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCOLUMN, "\\flycolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPAGE, "\\flypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYINPARA, "\\flyinpara" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDBOX, "\\brdbox" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNCOL, "\\brdlncol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNIN, "\\brdlnin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNOUT, "\\brdlnout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNDIST, "\\brdlndist" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADOW, "\\shadow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWDIST, "\\shdwdist" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWSTYLE, "\\shdwstyle" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWCOL, "\\shdwcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWFCOL, "\\shdwfcol" ); - - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCTBL, "\\pgdsctbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSC, "\\pgdsc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCUSE, "\\pgdscuse" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNXT, "\\pgdscnxt" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHEN, "\\hyphen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHLEAD, "\\hyphlead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHTRAIL, "\\hyphtrail" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHMAX, "\\hyphmax" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLSWG, "\\tlswg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRK, "\\pgbrk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNO, "\\pgdscno" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" ); -/* -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" ); -*/ - -// Support for overline attributes -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OL, "\\ol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLD, "\\old" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDB, "\\oldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLNONE, "\\olnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLW, "\\olw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASH, "\\oldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHD, "\\oldashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHDD, "\\oldashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTH, "\\olth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLWAVE, "\\olwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLC, "\\olc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHD, "\\olthd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASH, "\\olthdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLLDASH, "\\olldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHLDASH, "\\olthldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHD, "\\olthdashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHDD, "\\olthdashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLHWAVE, "\\olhwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLOLDBWAVE, "\\ololdbwave" ); - -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 0dc90d0da8ab..710e7e4a9a76 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -33,8 +33,8 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ -#include "rtfkeywd.hxx" -#include "rtftoken.h" +#include +#include #include "tools/string.hxx" #include diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 21dfefb14232..4dbd4735568b 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include using namespace rtl; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index b2aff7ae711d..1bfa71cd0c09 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include "svtools/genericunodialog.hxx" -#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ -#include "addresstemplate.hxx" -#endif -#ifndef _CPPUHELPER_EXTRACT_HXX_ +#include #include -#endif #include #include #include diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index b3ae322aa3ba..9a72ad5e4f5c 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "contextmenuhelper.hxx" +#include #include #include diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 79b496187b5a..7d526fd1102f 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 91c895f416a0..f8c9c813cd08 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include @@ -40,11 +40,9 @@ #include #include #include -#include +#include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif using namespace ::cppu; using namespace ::com::sun::star::awt; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index a8d05c49a7ae..3c63dada33ac 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -38,12 +38,9 @@ #include #include #include -#include +#include #include - -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include using namespace ::cppu; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 6fc8b0017ad8..e5c5280c83e4 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -31,15 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include -#endif #include - - #include #include -#include "unoevent.hxx" +#include #include using namespace ::com::sun::star; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index a1ff1ad2ac3e..de47d9651e31 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -34,12 +34,11 @@ #define _SVT_UNOIFACE_CXX #include #include - #include #include -#include "filedlg.hxx" -#include "filectrl.hxx" -#include "roadmap.hxx" +#include +#include +#include #include #include #include @@ -49,9 +48,8 @@ #include #include #include -#include -#include - +#include +#include #include #include "treecontrolpeer.hxx" #include "svtxgridcontrol.hxx" diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 28d8c7acdc70..c619ebc1bccf 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -39,23 +39,17 @@ #include #include #include - -#ifndef _COMPHELPER_SERVICEHELPER_HXX_ #include -#endif #include #include #include - #include - #include #include #include #include - -#include "unoevent.hxx" -#include "unoimap.hxx" +#include +#include #include #include #include diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 61781c2b3500..23873daf5e52 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -34,10 +34,7 @@ #include #include -#ifndef GCC -#endif - -#include "inetimg.hxx" +#include #define TOKEN_SEPARATOR '\001' diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 22be04f95d3f..bb754b239ff3 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -34,7 +34,6 @@ PRJ=.. PRJNAME=svtools TARGET=svtool RESTARGET=svt -RESTARGETPATCH=svp GEN_HID=TRUE GEN_HID_OTHER=TRUE ENABLE_EXCEPTIONS=TRUE @@ -91,10 +90,6 @@ RESLIB1SRSFILES= \ $(SRS)$/browse.srs \ $(SRS)$/javaerror.srs -RESLIB3NAME= $(RESTARGETPATCH) -RESLIB3SRSFILES= \ - $(SRS)$/patchjavaerror.srs - # build the shared library -------------------------------------------------- SHL1TARGET= svt$(DLLPOSTFIX) -- cgit From c0524d5e4df64fcebb3fa093ec909468ddd2f2f2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- svtools/inc/svtools/svtdata.hxx | 9 +- svtools/source/misc/errtxt.src | 517 ---------------------------------------- svtools/source/misc/makefile.mk | 5 +- svtools/source/misc/svtdata.cxx | 5 + svtools/source/misc/undo.src | 47 ++++ 5 files changed, 57 insertions(+), 526 deletions(-) delete mode 100644 svtools/source/misc/errtxt.src create mode 100644 svtools/source/misc/undo.src (limited to 'svtools') diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index b1cc8136ef68..566514b6b2a0 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -31,6 +31,7 @@ #ifndef _SVTOOLS_SVTDATA_HXX #define _SVTOOLS_SVTDATA_HXX +#include "svtools/svtdllapi.h" #include #include @@ -74,13 +75,11 @@ public: }; -class SvtResId: public ResId +class SVT_DLLPUBLIC SvtResId: public ResId { public: - SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): - ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} - - SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} + SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale); + SvtResId(USHORT nId); // VCL dependant, only available in SVT, not in SVL! }; diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src deleted file mode 100644 index 306ccf7f164d..000000000000 --- a/svtools/source/misc/errtxt.src +++ /dev/null @@ -1,517 +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: errtxt.src,v $ - * $Revision: 1.63 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define __RSC -#include -#include "svtools/sfxecode.hxx" - // pragma ---------------------------------------------------------------- -Resource RID_ERRCTX -{ - String ERRCTX_ERROR - { - Text [ en-US ] = "Error" ; - }; - String ERRCTX_WARNING - { - Text [ en-US ] = "Warning" ; - }; - String ERRCTX_SFX_LOADTEMPLATE - { - Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ; - }; - String ERRCTX_SFX_SAVEDOC - { - Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; - }; - String ERRCTX_SFX_SAVEASDOC - { - Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; - }; - String ERRCTX_SFX_DOCINFO - { - Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ; - }; - String ERRCTX_SFX_DOCTEMPLATE - { - Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ; - }; - String ERRCTX_SFX_MOVEORCOPYCONTENTS - { - Text [ en-US ] = "$(ERR) copying or moving document contents" ; - }; - String ERRCTX_SFX_DOCMANAGER - { - Text [ en-US ] = "$(ERR) starting the Document Manager" ; - }; - String ERRCTX_SFX_OPENDOC - { - Text [ en-US ] = "$(ERR) loading document $(ARG1)" ; - }; - String ERRCTX_SFX_NEWDOCDIRECT - { - Text [ en-US ] = "$(ERR) creating a new document" ; - }; - String ERRCTX_SFX_NEWDOC - { - Text [ en-US ] = "$(ERR) creating a new document" ; - }; - String ERRCTX_SFX_CREATEOBJSH - { - Text [ en-US ] = "$(ERR) expanding entry" ; - }; - String ERRCTX_SFX_LOADBASIC - { - Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ; - }; - String ERRCTX_SFX_SEARCHADDRESS - { - Text [ en-US ] = "$(ERR) searching for an address"; - }; -}; -Resource RID_ERRHDL -{ - String ERRCODE_CLASS_ABORT - { - Text [ en-US ] = "Abort" ; - }; - String ERRCODE_CLASS_NOTEXISTS - { - Text [ en-US ] = "Nonexistent object" ; - }; - String ERRCODE_CLASS_ALREADYEXISTS - { - Text [ en-US ] = "Object already exists" ; - }; - String ERRCODE_CLASS_ACCESS - { - Text [ en-US ] = "Object not accessible" ; - }; - String ERRCODE_CLASS_PATH - { - Text [ en-US ] = "Inadmissible path" ; - }; - String ERRCODE_CLASS_LOCKING - { - Text [ en-US ] = "Locking problem" ; - }; - String ERRCODE_CLASS_PARAMETER - { - Text [ en-US ] = "Wrong parameter" ; - }; - String ERRCODE_CLASS_SPACE - { - Text [ en-US ] = "Resource exhausted" ; - }; - String ERRCODE_CLASS_NOTSUPPORTED - { - Text [ en-US ] = "Action not supported" ; - }; - String ERRCODE_CLASS_READ - { - Text [ en-US ] = "Read-Error" ; - }; - String ERRCODE_CLASS_WRITE - { - Text [ en-US ] = "Write Error" ; - }; - String ERRCODE_CLASS_UNKNOWN - { - Text [ en-US ] = "unknown" ; - }; - String ERRCODE_CLASS_VERSION - { - Text [ en-US ] = "Version Incompatibility" ; - }; - String ERRCODE_CLASS_GENERAL - { - Text [ en-US ] = "General Error" ; - }; - String ERRCODE_CLASS_FORMAT - { - Text [ en-US ] = "Incorrect format" ; - }; - String ERRCODE_CLASS_CREATE - { - Text [ en-US ] = "Error creating object" ; - }; - String ERRCODE_CLASS_SBX - { - Text [ en-US ] = "Inadmissible value or data type" ; - }; - String ERRCODE_CLASS_RUNTIME - { - Text [ en-US ] = "BASIC runtime error" ; - }; - String ERRCODE_CLASS_COMPILER - { - Text [ en-US ] = "BASIC syntax error" ; - }; - String 1 - { - Text [ en-US ] = "General Error" ; - }; - String ERRCODE_IO_GENERAL - { - Text [ en-US ] = "General input/output error." ; - }; - String ERRCODE_IO_MISPLACEDCHAR - { - Text [ en-US ] = "Invalid file name." ; - }; - String ERRCODE_IO_NOTEXISTS - { - Text [ en-US ] = "Nonexistent file." ; - }; - String ERRCODE_IO_ALREADYEXISTS - { - Text [ en-US ] = "File already exists." ; - }; - String ERRCODE_IO_NOTADIRECTORY - { - Text [ en-US ] = "The object is not a directory." ; - }; - String ERRCODE_IO_NOTAFILE - { - Text [ en-US ] = "The object is not a file." ; - }; - String ERRCODE_IO_INVALIDDEVICE - { - Text [ en-US ] = "The specified device is invalid." ; - }; - String ERRCODE_IO_ACCESSDENIED - { - Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ; - }; - String ERRCODE_IO_LOCKVIOLATION - { - Text [ en-US ] = "Sharing violation while accessing the object." ; - }; - String ERRCODE_IO_OUTOFSPACE - { - Text [ en-US ] = "No more space on device." ; - }; - String ERRCODE_IO_ISWILDCARD - { - Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ; - }; - String ERRCODE_IO_NOTSUPPORTED - { - Text [ en-US ] = "This operation is not supported on this operating system." ; - }; - String ERRCODE_IO_TOOMANYOPENFILES - { - Text [ en-US ] = "There are too many files open." ; - }; - String ERRCODE_IO_CANTREAD - { - Text [ en-US ] = "Data could not be read from the file." ; - }; - String ERRCODE_IO_CANTWRITE - { - Text [ en-US ] = "The file could not be written." ; - }; - String ERRCODE_IO_OUTOFMEMORY - { - Text [ en-US ] = "The operation could not be run due to insufficient memory." ; - }; - String ERRCODE_IO_CANTSEEK - { - Text [ en-US ] = "The seek operation could not be run." ; - }; - String ERRCODE_IO_CANTTELL - { - Text [ en-US ] = "The tell operation could not be run." ; - }; - String ERRCODE_IO_WRONGVERSION - { - Text [ en-US ] = "Incorrect file version." ; - }; - String ERRCODE_IO_WRONGFORMAT - { - Text [ en-US ] = "Incorrect file format." ; - }; - String ERRCODE_IO_INVALIDCHAR - { - Text [ en-US ] = "The file name contains invalid characters." ; - }; - String ERRCODE_IO_UNKNOWN - { - Text [ en-US ] = "An unknown I/O error has occurred." ; - }; - String ERRCODE_IO_INVALIDACCESS - { - Text [ en-US ] = "An invalid attempt was made to access the file." ; - }; - String ERRCODE_IO_CANTCREATE - { - Text [ en-US ] = "The file could not be created." ; - }; - String ERRCODE_IO_INVALIDPARAMETER - { - Text [ en-US ] = "The operation was started under an invalid parameter." ; - }; - String ERRCODE_IO_ABORT - { - Text [ en-US ] = "The operation on the file was aborted." ; - }; - String ERRCODE_IO_NOTEXISTSPATH - { - Text [ en-US ] = "Path to the file does not exist." ; - }; - String ERRCODE_IO_RECURSIVE - { - Text [ en-US ] = "An object cannot be copied into itself." ; - }; - String ERRCODE_SFX_NOSTDTEMPLATE - { - Text [ en-US ] = "The default template could not be opened." ; - }; - String ERRCODE_SFX_TEMPLATENOTFOUND - { - Text [ en-US ] = "The specified template could not be found." ; - }; - String ERRCODE_SFX_NOTATEMPLATE - { - Text [ en-US ] = "The file cannot be used as template." ; - }; - String ERRCODE_SFX_CANTREADDOCINFO - { - Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ; - }; - String ERRCODE_SFX_ALREADYOPEN - { - Text [ en-US ] = "This document has already been opened for editing." ; - }; - String ERRCODE_SFX_WRONGPASSWORD - { - Text [ en-US ] = "The wrong password has been entered." ; - }; - String ERRCODE_SFX_DOLOADFAILED - { - Text [ en-US ] = "Error reading file." ; - }; - String ERRCODE_SFX_DOCUMENTREADONLY - { - Text [ en-US ] = "The document was opened as read-only." ; - }; - String ERRCODE_SFX_OLEGENERAL - { - Text [ en-US ] = "General OLE Error." ; - }; - String ERRCODE_INET_NAME_RESOLVE - { - Text [ en-US ] = "The host name $(ARG1) could not be resolved." ; - }; - String ERRCODE_INET_CONNECT - { - Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ; - }; - String ERRCODE_INET_READ - { - Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ; - }; - String ERRCODE_INET_WRITE - { - Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; - }; - String ERRCODE_INET_GENERAL - { - Text [ en-US ] = "General Internet error has occurred." ; - }; - String ERRCODE_INET_OFFLINE - { - Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; - }; - String ERRCODE_SFXMSG_STYLEREPLACE - { - ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; - Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; - }; - String ERRCODE_SFX_NOFILTER - { - Text [ en-US ] = "A filter has not been found." ; - }; - String ERRCODE_SFX_CANTFINDORIGINAL - { - Text [ en-US ] = "The original could not be determined." ; - }; - String ERRCODE_SFX_CANTCREATECONTENT - { - Text [ en-US ] = "The contents could not be created." ; - }; - String ERRCODE_SFX_CANTCREATELINK - { - Text [ en-US ] = "The link could not be created." ; - }; - String ERRCODE_SFX_WRONGBMKFORMAT - { - Text [ en-US ] = "The link format is invalid." ; - }; - String ERRCODE_SFX_WRONGICONFILE - { - Text [ en-US ] = "The configuration of the icon display is invalid." ; - }; - String ERRCODE_SFX_CANTWRITEICONFILE - { - Text [ en-US ] = "The configuration of the icon display can not be saved." ; - }; - String ERRCODE_SFX_CANTDELICONFILE - { - Text [ en-US ] = "The configuration of the icon display could not be deleted." ; - }; - String ERRCODE_SFX_CANTRENAMECONTENT - { - Text [ en-US ] = "Contents cannot be renamed." ; - }; - String ERRCODE_SFX_INVALIDBMKPATH - { - Text [ en-US ] = "The bookmark folder is invalid." ; - }; - String ERRCODE_SFX_CANTWRITEURLCFGFILE - { - Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ; - }; - String ERRCODE_SFX_WRONGURLCFGFORMAT - { - Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ; - }; - String ERRCODE_SFX_NODOCUMENT - { - Text [ en-US ] = "This action cannot be applied to a document that does not exist." ; - }; - String ERRCODE_SFX_INVALIDLINK - { - Text [ en-US ] = "The link refers to an invalid target." ; - }; - String ERRCODE_SFX_INVALIDTRASHPATH - { - Text [ en-US ] = "The Recycle Bin path is invalid." ; - }; - String ERRCODE_SFX_NOTRESTORABLE - { - Text [ en-US ] = "The entry could not be restored." ; - }; - String ERRCODE_IO_NAMETOOLONG - { - Text [ en-US ] = "The file name is too long for the target file system." ; - }; - String ERRCODE_SFX_CONSULTUSER - { - Text [ en-US ] = "The details for running the function are incomplete." ; - }; - String ERRCODE_SFX_INVALIDSYNTAX - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_CANTCREATEFOLDER - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_CANTRENAMEFOLDER - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_WRONG_CDF_FORMAT - { - Text [ en-US ] = "The channel document has an invalid format." ; - }; - String ERRCODE_SFX_EMPTY_SERVER - { - Text [ en-US ] = "The server must not be empty." ; - }; - String ERRCODE_SFX_NO_ABOBOX - { - Text [ en-US ] = "A subscription folder is required to install a Channel." ; - }; - String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT - { - Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; - }; - String ERRCODE_SFX_TARGETFILECORRUPTED - { - Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)."; - }; - String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED - { - Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; - }; - String ERRCODE_SFX_CANTCREATEBACKUP - { - Text [ en-US ] = "Could not create backup copy." ; - }; - String ERRCODE_SFX_MACROS_SUPPORT_DISABLED - { - Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; - }; - String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED - { - Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; - }; - String ERRCODE_SFX_BROKENSIGNATURE - { - Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; - }; - String ERRCODE_SFX_INCOMPLETE_ENCRYPTION - { - Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; - }; - - String ERRCODE_IO_INVALIDLENGTH - { - Text [ en-US ] = "Invalid data length." ; - }; - String ERRCODE_IO_CURRENTDIR - { - Text [ en-US ] = "Function not possible: path contains current directory." ; - }; - String ERRCODE_IO_NOTSAMEDEVICE - { - Text [ en-US ] = "Function not possible: device (drive) not identical." ; - }; - String ERRCODE_IO_DEVICENOTREADY - { - Text [ en-US ] = "Device (drive) not ready." ; - }; - String ERRCODE_IO_BADCRC - { - Text [ en-US ] = "Wrong check amount." ; - }; - String ERRCODE_IO_WRITEPROTECTED - { - Text [ en-US ] = "Function not possible: write protected." ; - }; - String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE - { - Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; - }; -}; - -// eof ------------------------------------------------------------------------ - diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk index 77cf8a41a8bd..fbc89822e422 100644 --- a/svtools/source/misc/makefile.mk +++ b/svtools/source/misc/makefile.mk @@ -47,14 +47,11 @@ ENABLE_EXCEPTIONS := TRUE SRS1NAME=misc SRC1FILES=\ ehdl.src \ + undo.src \ helpagent.src \ imagemgr.src \ langtab.src -SRS2NAME=ehdl -SRC2FILES=\ - errtxt.src - SLOFILES=\ $(SLO)$/acceleratorexecute.obj \ $(SLO)$/chartprettypainter.obj \ diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 2bc1977e9197..ba92b929e07d 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -93,3 +93,8 @@ ImpSvtData & ImpSvtData::GetSvtData() return *static_cast(*pAppData); } +SvtResId::SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): + ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} + +SvtResId::SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} + diff --git a/svtools/source/misc/undo.src b/svtools/source/misc/undo.src new file mode 100644 index 000000000000..c3f4c388e89c --- /dev/null +++ b/svtools/source/misc/undo.src @@ -0,0 +1,47 @@ +/************************************************************************* + * + * 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: app.src,v $ + * $Revision: 1.122 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + // include ------------------------------------------------------------------ + +#include + +String STR_UNDO +{ + Text [ en-US ] = "Undo: " ; +}; +String STR_REDO +{ + Text [ en-US ] = "Re~do: " ; +}; +String STR_REPEAT +{ + Text [ en-US ] = "~Repeat: " ; +}; + -- cgit From e1577335e0c88e269995ff9164da981d800eb6bb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- svtools/Makefile | 30 +++ svtools/prj/gbuild.lst | 4 + svtools/prj/makefile.mk | 2 + svtools/prj/target_exe_bmp.mk | 71 +++++++ svtools/prj/target_exe_bmpsum.mk | 67 ++++++ svtools/prj/target_exe_g2g.mk | 66 ++++++ svtools/prj/target_lib_hatchwindowfactory.mk | 74 +++++++ svtools/prj/target_lib_productregistration.mk | 75 +++++++ svtools/prj/target_lib_svt.mk | 281 ++++++++++++++++++++++++++ svtools/prj/target_module_svtools.mk | 57 ++++++ svtools/prj/target_package_inc.mk | 177 ++++++++++++++++ svtools/prj/target_res_productregistration.mk | 48 +++++ svtools/prj/target_res_svt.mk | 77 +++++++ 13 files changed, 1029 insertions(+) create mode 100644 svtools/Makefile create mode 100644 svtools/prj/gbuild.lst create mode 100644 svtools/prj/makefile.mk create mode 100644 svtools/prj/target_exe_bmp.mk create mode 100644 svtools/prj/target_exe_bmpsum.mk create mode 100644 svtools/prj/target_exe_g2g.mk create mode 100644 svtools/prj/target_lib_hatchwindowfactory.mk create mode 100644 svtools/prj/target_lib_productregistration.mk create mode 100644 svtools/prj/target_lib_svt.mk create mode 100644 svtools/prj/target_module_svtools.mk create mode 100644 svtools/prj/target_package_inc.mk create mode 100644 svtools/prj/target_res_productregistration.mk create mode 100644 svtools/prj/target_res_svt.mk (limited to 'svtools') diff --git a/svtools/Makefile b/svtools/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/svtools/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/svtools/prj/gbuild.lst b/svtools/prj/gbuild.lst new file mode 100644 index 000000000000..17542856e75c --- /dev/null +++ b/svtools/prj/gbuild.lst @@ -0,0 +1,4 @@ +st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL +st svtools usr1 - all st_mkout NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/svtools/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk new file mode 100644 index 000000000000..b323f8039450 --- /dev/null +++ b/svtools/prj/target_exe_bmp.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmp)) + +$(eval $(call gb_Executable_set_include,bmp,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmp,\ + svtools/bmpmaker/bmp \ + svtools/bmpmaker/bmpcore \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk new file mode 100644 index 000000000000..d06a25c09ec7 --- /dev/null +++ b/svtools/prj/target_exe_bmpsum.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmpsum)) + +$(eval $(call gb_Executable_set_include,bmpsum,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ + svtools/bmpmaker/bmpsum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk new file mode 100644 index 000000000000..b78821860a30 --- /dev/null +++ b/svtools/prj/target_exe_g2g.mk @@ -0,0 +1,66 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,g2g)) + +$(eval $(call gb_Executable_set_include,g2g,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + vcl \ + tl \ + vos3 \ + svt \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,g2g,\ + svtools/bmpmaker/g2g \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_hatchwindowfactory.mk b/svtools/prj/target_lib_hatchwindowfactory.mk new file mode 100644 index 000000000000..448517271e19 --- /dev/null +++ b/svtools/prj/target_lib_hatchwindowfactory.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,hatchwindowfactory)) + +$(eval $(call gb_Library_set_include,hatchwindowfactory,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ + svtools/source/hatchwindow/hatchwindowfactory \ + svtools/source/hatchwindow/documentcloser \ + svtools/source/hatchwindow/ipwin \ + svtools/source/hatchwindow/hatchwindow \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_productregistration.mk b/svtools/prj/target_lib_productregistration.mk new file mode 100644 index 000000000000..7dc480c8ea5a --- /dev/null +++ b/svtools/prj/target_lib_productregistration.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,productregistration)) + +$(eval $(call gb_Library_set_include,productregistration,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + svl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + stl \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,productregistration,\ + svtools/source/productregistration/productregistration \ + svtools/source/productregistration/registrationdlg \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk new file mode 100644 index 000000000000..223e7fc44650 --- /dev/null +++ b/svtools/prj/target_lib_svt.mk @@ -0,0 +1,281 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svt)) + +$(call gb_Library_get_headers_target,svt) : $(call gb_Package_get_target,svtools_inc) + +$(eval $(call gb_Library_set_include,svt,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svt,\ + $$(DEFS) \ + -DSVT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svt,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + jvmfwk \ + sal \ + sot \ + stl \ + svl \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ +)) + +ifeq ($(SYSTEM_JPEG),YES) +$(eval $(call gb_Library_add_linked_libs,svt,\ + jpeg \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,svt,\ + jpeglib \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,svt,\ + svtools/source/edit/svmedit \ + svtools/source/edit/svmedit2 \ + svtools/source/edit/textundo \ + svtools/source/edit/syntaxhighlight \ + svtools/source/edit/textwindowpeer \ + svtools/source/edit/sychconv \ + svtools/source/edit/xtextedt \ + svtools/source/edit/txtattr \ + svtools/source/edit/textdoc \ + svtools/source/edit/texteng \ + svtools/source/edit/textdata \ + svtools/source/edit/editsyntaxhighlighter \ + svtools/source/edit/textview \ + svtools/source/urlobj/inetimg \ + svtools/source/java/javainteractionhandler \ + svtools/source/java/javacontext \ + svtools/source/svhtml/htmlout \ + svtools/source/svhtml/htmlsupp \ + svtools/source/svhtml/parhtml \ + svtools/source/svhtml/htmlkywd \ + svtools/source/config/itemholder2 \ + svtools/source/config/optionsdrawinglayer \ + svtools/source/config/menuoptions \ + svtools/source/config/helpopt \ + svtools/source/config/accessibilityoptions \ + svtools/source/config/printoptions \ + svtools/source/config/miscopt \ + svtools/source/config/extcolorcfg \ + svtools/source/config/colorcfg \ + svtools/source/config/fontsubstconfig \ + svtools/source/config/apearcfg \ + svtools/source/misc/svtaccessiblefactory \ + svtools/source/misc/templatefoldercache \ + svtools/source/misc/imagemgr \ + svtools/source/misc/imap3 \ + svtools/source/misc/acceleratorexecute \ + svtools/source/misc/helpagentwindow \ + svtools/source/misc/imap \ + svtools/source/misc/wallitem \ + svtools/source/misc/langtab \ + svtools/source/misc/dialogclosedlistener \ + svtools/source/misc/itemdel \ + svtools/source/misc/dialogcontrolling \ + svtools/source/misc/svtdata \ + svtools/source/misc/transfer2 \ + svtools/source/misc/chartprettypainter \ + svtools/source/misc/imageresourceaccess \ + svtools/source/misc/imap2 \ + svtools/source/misc/ehdl \ + svtools/source/misc/embedtransfer \ + svtools/source/misc/embedhlp \ + svtools/source/misc/cliplistener \ + svtools/source/misc/transfer \ + svtools/source/misc/stringtransfer \ + svtools/source/plugapp/ttprops \ + svtools/source/control/ctrlbox \ + svtools/source/control/valueacc \ + svtools/source/control/valueset \ + svtools/source/control/taskbar \ + svtools/source/control/urlcontrol \ + svtools/source/control/scriptedtext \ + svtools/source/control/headbar \ + svtools/source/control/fileurlbox \ + svtools/source/control/fmtfield \ + svtools/source/control/collatorres \ + svtools/source/control/indexentryres \ + svtools/source/control/filectrl \ + svtools/source/control/scrwin \ + svtools/source/control/taskbox \ + svtools/source/control/hyperlabel \ + svtools/source/control/filectrl2 \ + svtools/source/control/fixedhyper \ + svtools/source/control/taskstat \ + svtools/source/control/inettbc \ + svtools/source/control/calendar \ + svtools/source/control/roadmap \ + svtools/source/control/ctrltool \ + svtools/source/control/asynclink \ + svtools/source/control/stdctrl \ + svtools/source/control/ctrldll \ + svtools/source/control/tabbar \ + svtools/source/control/ruler \ + svtools/source/control/stdmenu \ + svtools/source/control/prgsbar \ + svtools/source/control/taskmisc \ + svtools/source/dialogs/insdlg \ + svtools/source/dialogs/roadmapwizard \ + svtools/source/dialogs/mcvmath \ + svtools/source/dialogs/logindlg \ + svtools/source/dialogs/wizdlg \ + svtools/source/dialogs/addresstemplate \ + svtools/source/dialogs/printdlg \ + svtools/source/dialogs/filedlg2 \ + svtools/source/dialogs/colctrl \ + svtools/source/dialogs/colrdlg \ + svtools/source/dialogs/wizardmachine \ + svtools/source/dialogs/prnsetup \ + svtools/source/dialogs/filedlg \ + svtools/source/dialogs/property \ + svtools/source/table/tablecontrol \ + svtools/source/table/tablegeometry \ + svtools/source/table/gridtablerenderer \ + svtools/source/table/tabledatawindow \ + svtools/source/table/defaultinputhandler \ + svtools/source/table/tablecontrol_impl \ + svtools/source/contnr/svlbox \ + svtools/source/contnr/svtabbx \ + svtools/source/contnr/ivctrl \ + svtools/source/contnr/templwin \ + svtools/source/contnr/svicnvw \ + svtools/source/contnr/contentenumeration \ + svtools/source/contnr/svimpbox \ + svtools/source/contnr/imivctl1 \ + svtools/source/contnr/svtreebx \ + svtools/source/contnr/fileview \ + svtools/source/contnr/svimpicn \ + svtools/source/contnr/svlbitm \ + svtools/source/contnr/ctrdll \ + svtools/source/contnr/tooltiplbox \ + svtools/source/contnr/treelist \ + svtools/source/contnr/imivctl2 \ + svtools/source/uno/unoiface \ + svtools/source/uno/genericunodialog \ + svtools/source/uno/unocontroltablemodel \ + svtools/source/uno/contextmenuhelper \ + svtools/source/uno/toolboxcontroller \ + svtools/source/uno/generictoolboxcontroller \ + svtools/source/uno/addrtempuno \ + svtools/source/uno/miscservices \ + svtools/source/uno/statusbarcontroller \ + svtools/source/uno/svtxgridcontrol \ + svtools/source/uno/unoimap \ + svtools/source/uno/unoevent \ + svtools/source/uno/treecontrolpeer \ + svtools/source/uno/framestatuslistener \ + svtools/source/brwbox/editbrowsebox \ + svtools/source/brwbox/brwhead \ + svtools/source/brwbox/brwbox3 \ + svtools/source/brwbox/brwbox1 \ + svtools/source/brwbox/ebbcontrols \ + svtools/source/brwbox/brwbox2 \ + svtools/source/brwbox/datwin \ + svtools/source/brwbox/editbrowsebox2 \ + svtools/source/svrtf/rtfkeywd \ + svtools/source/svrtf/svparser \ + svtools/source/svrtf/parrtf \ + svtools/source/svrtf/rtfout \ + svtools/source/filter.vcl/filter/dlgepng \ + svtools/source/filter.vcl/filter/filter2 \ + svtools/source/filter.vcl/filter/FilterConfigItem \ + svtools/source/filter.vcl/filter/sgvspln \ + svtools/source/filter.vcl/filter/filter \ + svtools/source/filter.vcl/filter/sgvtext \ + svtools/source/filter.vcl/filter/sgfbram \ + svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ + svtools/source/filter.vcl/filter/dlgexpor \ + svtools/source/filter.vcl/filter/fldll \ + svtools/source/filter.vcl/filter/sgvmain \ + svtools/source/filter.vcl/filter/FilterConfigCache \ + svtools/source/filter.vcl/filter/dlgejpg \ + svtools/source/filter.vcl/wmf/winwmf \ + svtools/source/filter.vcl/wmf/winmtf \ + svtools/source/filter.vcl/wmf/emfwr \ + svtools/source/filter.vcl/wmf/wmf \ + svtools/source/filter.vcl/wmf/enhwmf \ + svtools/source/filter.vcl/wmf/wmfwr \ + svtools/source/filter.vcl/igif/decode \ + svtools/source/filter.vcl/igif/gifread \ + svtools/source/filter.vcl/ixbm/xbmread \ + svtools/source/filter.vcl/jpeg/jpeg \ + svtools/source/filter.vcl/ixpm/xpmread \ +)) + +$(eval $(call gb_Library_add_cobjects,svt,\ + svtools/source/filter.vcl/jpeg/jpegc \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,svt,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svt,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + oleaut32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk new file mode 100644 index 000000000000..0d474b4d794f --- /dev/null +++ b/svtools/prj/target_module_svtools.mk @@ -0,0 +1,57 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svtools,\ + $(call gb_AllLangResTarget_get_target,svt) \ + $(call gb_AllLangResTarget_get_target,productregistration) \ + $(call gb_Executable_get_target,bmp) \ + $(call gb_Executable_get_target,bmpsum) \ + $(call gb_Executable_get_target,g2g) \ + $(call gb_Library_get_target,hatchwindowfactory) \ + $(call gb_Library_get_target,productregistration) \ + $(call gb_Library_get_target,svt) \ + $(call gb_Package_get_target,svtools_inc) \ +)) + +$(eval $(call gb_Module_read_includes,svtools,\ + exe_bmp \ + exe_bmpsum \ + exe_g2g \ + lib_hatchwindowfactory \ + lib_productregistration \ + lib_svt \ + package_inc \ +)) + #res_svt \ + res_productregistration \ + +#todo: javapatchres +#todo: jpeg on mac in svtools/util/makefile.mk +#todo: deliver errtxt.src as ehdl.srs +#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog +#todo: map file +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk new file mode 100644 index 000000000000..4b7fd56be3fa --- /dev/null +++ b/svtools/prj/target_package_inc.mk @@ -0,0 +1,177 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) + diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk new file mode 100644 index 000000000000..c9c4c42e194f --- /dev/null +++ b/svtools/prj/target_res_productregistration.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) + +$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ + svt/productregistration \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) + +$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ + svtools/source/productregistration/registrationdlg.src \ +)) + + diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk new file mode 100644 index 000000000000..8a4bdaa30e07 --- /dev/null +++ b/svtools/prj/target_res_svt.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) + +$(eval $(call gb_AllLangResTarget_add_srs,svt,\ + svt/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) + +$(eval $(call gb_SrsTarget_set_include,svt/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/uno \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/res,\ + svtools/source/java/javaerror.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/undo.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/control/filectrl.src \ + svtools/source/control/calendar.src \ + svtools/source/control/ctrlbox.src \ + svtools/source/control/ctrltool.src \ + svtools/source/dialogs/so3res.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/colrdlg.src \ + svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/filedlg2.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/formats.src \ + svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/wizardmachine.src \ + svtools/source/contnr/templwin.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/uno/unoifac2.src \ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ + svtools/source/filter.vcl/filter/dlgejpg.src \ + svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/strings.src \ +)) + + -- cgit From 68423011aeed10e3d7fef51b4e8a044edaf50514 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 17:54:47 +0200 Subject: CWS gnumake2: removed files in svl; typo in svtools makefile; missing include in sfx2 makefile --- svtools/prj/target_module_svtools.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk index 0d474b4d794f..e57397b4890a 100644 --- a/svtools/prj/target_module_svtools.mk +++ b/svtools/prj/target_module_svtools.mk @@ -45,9 +45,9 @@ $(eval $(call gb_Module_read_includes,svtools,\ lib_productregistration \ lib_svt \ package_inc \ -)) - #res_svt \ + res_svt \ res_productregistration \ +)) #todo: javapatchres #todo: jpeg on mac in svtools/util/makefile.mk -- cgit From 86c8dc781b3a5aef3126931ee43d1f190a0143a5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 18:27:03 +0200 Subject: CWS gnumake2: remove duplicate header in solver: vcl/imagebtn.hxx is just a copy of vcl/button.hxx --- svtools/inc/svtools/addresstemplate.hxx | 2 +- svtools/inc/svtools/editbrowsebox.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index f29ea2478b4e..bb4ee44647e9 100644 --- a/svtools/inc/svtools/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index f97449e1880c..26ff11e11ca2 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -37,7 +37,7 @@ #include #ifndef _IMAGEBTN_HXX -#include +#include #endif #include #include -- cgit From 9d6f8f1d8f2906da494fac07778428cc44bf0cb1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 15:55:51 +0200 Subject: CWS gnumake2: move all delivered headers in svx to inc/svx; remove unused or useless headers --- svtools/prj/target_res_productregistration.mk | 2 ++ svtools/prj/target_res_svt.mk | 2 ++ 2 files changed, 4 insertions(+) (limited to 'svtools') diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk index c9c4c42e194f..af510d338c6e 100644 --- a/svtools/prj/target_res_productregistration.mk +++ b/svtools/prj/target_res_productregistration.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ svt/productregistration \ )) diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk index 8a4bdaa30e07..40f908c04793 100644 --- a/svtools/prj/target_res_svt.mk +++ b/svtools/prj/target_res_svt.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,svt,\ svt/res \ )) -- cgit From 11a84b8b106143d1de8bdaa663286892b8968f58 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- svtools/prj/build.lst | 29 +----- svtools/prj/d.lst | 34 ------- svtools/prj/target_module_svtools.mk | 6 +- svtools/prj/target_package_inc.mk | 139 +++++++++++++------------- svtools/prj/target_res_productregistration.mk | 2 + svtools/prj/target_res_svt.mk | 38 +++---- 6 files changed, 98 insertions(+), 150 deletions(-) (limited to 'svtools') diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index 4b2cd9f9b26b..17542856e75c 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,29 +1,4 @@ st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL -st svtools\source\graphic nmake - all st_svtgraphic st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL -st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\util nmake - all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL -st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst index 0a3ccd8a9819..8b137891791f 100644 --- a/svtools/prj/d.lst +++ b/svtools/prj/d.lst @@ -1,35 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\svtools - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs -..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid -..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib -..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.* -..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* -..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.* -..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp -..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum -..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui -..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g -..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* -..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* - -..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx -..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h -..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc -..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx -..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h -..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc - -dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi" - -*.xml %_DEST%\xml%_EXT%\*.xml diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk index 0d474b4d794f..88e6228b83e4 100644 --- a/svtools/prj/target_module_svtools.mk +++ b/svtools/prj/target_module_svtools.mk @@ -26,8 +26,8 @@ #************************************************************************* $(eval $(call gb_Module_Module,svtools,\ - $(call gb_AllLangResTarget_get_target,svt) \ $(call gb_AllLangResTarget_get_target,productregistration) \ + $(call gb_AllLangResTarget_get_target,svt) \ $(call gb_Executable_get_target,bmp) \ $(call gb_Executable_get_target,bmpsum) \ $(call gb_Executable_get_target,g2g) \ @@ -45,9 +45,9 @@ $(eval $(call gb_Module_read_includes,svtools,\ lib_productregistration \ lib_svt \ package_inc \ -)) - #res_svt \ res_productregistration \ + res_svt \ +)) #todo: javapatchres #todo: jpeg on mac in svtools/util/makefile.mk diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk index 4b7fd56be3fa..f47251f31590 100644 --- a/svtools/prj/target_package_inc.mk +++ b/svtools/prj/target_package_inc.mk @@ -26,119 +26,109 @@ #************************************************************************* $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) @@ -150,28 +140,41 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/sv $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) - diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk index c9c4c42e194f..af510d338c6e 100644 --- a/svtools/prj/target_res_productregistration.mk +++ b/svtools/prj/target_res_productregistration.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ svt/productregistration \ )) diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk index 8a4bdaa30e07..1e3e21b7ca6b 100644 --- a/svtools/prj/target_res_svt.mk +++ b/svtools/prj/target_res_svt.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,svt,\ svt/res \ )) @@ -43,35 +45,35 @@ $(eval $(call gb_SrsTarget_set_include,svt/res,\ )) $(eval $(call gb_SrsTarget_add_files,svt/res,\ - svtools/source/java/javaerror.src \ - svtools/source/misc/helpagent.src \ - svtools/source/misc/langtab.src \ - svtools/source/misc/ehdl.src \ - svtools/source/misc/undo.src \ - svtools/source/misc/imagemgr.src \ - svtools/source/plugapp/testtool.src \ - svtools/source/control/filectrl.src \ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/contnr/templwin.src \ svtools/source/control/calendar.src \ svtools/source/control/ctrlbox.src \ svtools/source/control/ctrltool.src \ - svtools/source/dialogs/so3res.src \ - svtools/source/dialogs/prnsetup.src \ - svtools/source/dialogs/colrdlg.src \ + svtools/source/control/filectrl.src \ svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/colrdlg.src \ svtools/source/dialogs/filedlg2.src \ - svtools/source/dialogs/printdlg.src \ svtools/source/dialogs/formats.src \ svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - svtools/source/contnr/templwin.src \ - svtools/source/contnr/fileview.src \ - svtools/source/contnr/svcontnr.src \ - svtools/source/uno/unoifac2.src \ - svtools/source/brwbox/editbrowsebox.src \ - svtools/source/filter.vcl/filter/dlgexpor.src \ svtools/source/filter.vcl/filter/dlgejpg.src \ svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ svtools/source/filter.vcl/filter/strings.src \ + svtools/source/java/javaerror.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/undo.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/uno/unoifac2.src \ )) -- cgit From f4f1d545e7523f3a900e466402aa65a468cbaeca Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- svtools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit From bb7508a36c2d20efe1ad0566a8a0c4b14148355e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:12:03 +0200 Subject: gnumake2: svtools: always link against stl --- svtools/prj/target_exe_bmp.mk | 2 +- svtools/prj/target_exe_bmpsum.mk | 2 +- svtools/prj/target_exe_g2g.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk index b323f8039450..57b34292ff11 100644 --- a/svtools/prj/target_exe_bmp.mk +++ b/svtools/prj/target_exe_bmp.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Executable_set_include,bmp,\ )) $(eval $(call gb_Executable_add_linked_libs,bmp,\ + stl \ vcl \ tl \ vos3 \ @@ -56,7 +57,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk index d06a25c09ec7..ec0f90f2b04b 100644 --- a/svtools/prj/target_exe_bmpsum.mk +++ b/svtools/prj/target_exe_bmpsum.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,bmpsum,\ )) $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + stl \ vcl \ tl \ vos3 \ @@ -52,7 +53,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk index b78821860a30..d7d75396562c 100644 --- a/svtools/prj/target_exe_g2g.mk +++ b/svtools/prj/target_exe_g2g.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,g2g,\ )) $(eval $(call gb_Executable_add_linked_libs,g2g,\ + stl \ vcl \ tl \ vos3 \ @@ -52,7 +53,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) -- cgit From 1c4f220b470e3887ef3f04974b805c7641e593e2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 27 Apr 2010 11:39:42 +0200 Subject: CWS gnumake2: refactoring --- svtools/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/Makefile b/svtools/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: -- cgit From 80f4107d6d5e6280756e051ffcdd374a9a84287c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 17:48:27 +0200 Subject: gnumake2: g2g on linux needs X11 (patch by ause) --- svtools/prj/target_exe_g2g.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'svtools') diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk index d7d75396562c..4bba4dc2644f 100644 --- a/svtools/prj/target_exe_g2g.mk +++ b/svtools/prj/target_exe_g2g.mk @@ -61,6 +61,7 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,g2g,\ pthread \ dl \ + X11 \ )) endif # vim: set noet sw=4 ts=4: -- cgit From 334fd6c47c59b59ba4124734d6ee4203557edc83 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 17 May 2010 18:08:27 +0200 Subject: CWS gnumake2: hacking the LD_LIBRARY_PATH for svt when using system jpeg (ugly, but slightly better than the hack in the old build system) --- svtools/prj/target_lib_svt.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'svtools') diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk index f688dd16fa71..97ad04823d14 100644 --- a/svtools/prj/target_lib_svt.mk +++ b/svtools/prj/target_lib_svt.mk @@ -72,6 +72,9 @@ ifeq ($(SYSTEM_JPEG),YES) $(eval $(call gb_Library_add_linked_libs,svt,\ jpeg \ )) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ +)) else $(eval $(call gb_Library_add_linked_static_libs,svt,\ jpeglib \ -- cgit From 0a5ab4320969089fdc7979b70bb0f43bc2c0af06 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- svtools/inc/fileview.hxx | 4 +- svtools/inc/svtools/headbar.hxx | 8 ++-- svtools/inc/svtools/roadmapwizard.hxx | 4 +- svtools/inc/tabbar.hxx | 10 ++-- svtools/inc/taskbar.hxx | 6 +-- svtools/source/contnr/fileview.cxx | 6 +-- svtools/source/contnr/templwin.cxx | 6 ++- svtools/source/control/headbar.cxx | 26 +++++------ svtools/source/control/inettbc.cxx | 3 +- svtools/source/control/tabbar.cxx | 25 +++++----- svtools/source/control/taskstat.cxx | 6 +-- svtools/source/dialogs/addresstemplate.cxx | 3 +- svtools/source/dialogs/filedlg2.cxx | 75 +++++++++++++++++++----------- svtools/source/dialogs/roadmapwizard.cxx | 8 ++-- svtools/source/dialogs/wizardmachine.cxx | 6 ++- svtools/source/misc/helpagentwindow.cxx | 3 +- 16 files changed, 112 insertions(+), 87 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx index 74476541dcd8..db704a0e6784 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/fileview.hxx @@ -104,8 +104,8 @@ public: sal_Bool GetParentURL( String& _rParentURL ) const; sal_Bool CreateNewFolder( const String& rNewFolder ); - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; + void SetHelpId( const rtl::OString& rHelpId ); + const rtl::OString& GetHelpId( ) const; void SetSizePixel( const Size& rNewSize ); using Window::SetPosSizePixel; virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index 1ef7687cfb1d..c225a95d1f55 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -360,15 +360,15 @@ public: void SetHelpText( USHORT nItemId, const XubString& rText ); XubString GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - inline ULONG GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const rtl::OString& rId ) { Window::SetHelpId( rId ); } + inline const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 49a0f441c49c..957620a645c7 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -85,8 +85,8 @@ namespace svt void SetRoadmapBitmap( const BitmapEx& _rBitmap ); const BitmapEx& GetRoadmapBitmap( ) const; - void SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART ); - SmartId GetRoadmapSmartHelpId() const; + void SetRoadmapHelpId( const rtl::OString& _rId ); + const rtl::OString& GetRoadmapHelpId() const; void SetRoadmapInteractive( sal_Bool _bInteractive ); sal_Bool IsRoadmapInteractive(); diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx index cf89d4426726..5816499d1b87 100644 --- a/svtools/inc/tabbar.hxx +++ b/svtools/inc/tabbar.hxx @@ -511,8 +511,8 @@ public: XubString GetPageText( USHORT nPageId ) const; void SetHelpText( USHORT nPageId, const XubString& rText ); XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nPageId ) const; long GetSplitSize() const { return mnSplitSize; } long GetMinSize() const; @@ -521,9 +521,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx index 46853fa07c03..d4a6699e2d5e 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/taskbar.hxx @@ -268,7 +268,7 @@ private: Image maImage; XubString maQuickHelpText; XubString maHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; USHORT mnFlags; public: @@ -289,8 +289,8 @@ public: const XubString& GetQuickHelpText() const { return maQuickHelpText; } void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } + void SetHelpId( const rtl::OString& rHelpId ) { maHelpId = rHelpId; } + const rtl::OString& GetHelpId() const { return maHelpId; } void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } USHORT GetFlags() const { return mnFlags; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8538e344bdc1..9c6474283279 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1324,16 +1324,16 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const // ----------------------------------------------------------------------- -sal_uInt32 SvtFileView::GetHelpId( ) const +const rtl::OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } // ----------------------------------------------------------------------- -void SvtFileView::SetHelpId( sal_uInt32 nHelpId ) +void SvtFileView::SetHelpId( const rtl::OString& rHelpId ) { - mpImp->mpView->SetHelpId( nHelpId ); + mpImp->mpView->SetHelpId( rHelpId ); } // ----------------------------------------------------------------------- diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 47b5ab9aa4b9..578150967727 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -346,7 +346,8 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : aDummyHeaderBar.Show(); aIconCtrl.SetAccessibleName( String( RTL_CONSTASCII_USTRINGPARAM("Groups") ) ); - aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL ); + // FIMXE: HELPID + aIconCtrl.SetHelpId( "" /*HID_TEMPLATEDLG_ICONCTRL*/ ); aIconCtrl.SetChoiceWithCursor( TRUE ); aIconCtrl.SetSelectionMode( SINGLE_SELECTION ); aIconCtrl.Show(); @@ -609,7 +610,8 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) : { aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP ); - aFileView.SetHelpId( HID_TEMPLATEDLG_FILEVIEW ); + // FIXME: HELPID + aFileView.SetHelpId( "" /*HID_TEMPLATEDLG_FILEVIEW*/ ); aFileView.Show(); aFileView.SetPosPixel( Point( 0, 0 ) ); aFileView.EnableAutoResize(); diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1ae223bebf06..7b1f2ad87108 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -53,7 +53,7 @@ struct ImplHeadItem USHORT mnId; HeaderBarItemBits mnBits; long mnSize; - ULONG mnHelpId; + rtl::OString maHelpId; Image maImage; XubString maOutText; XubString maText; @@ -1132,13 +1132,13 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -1266,7 +1266,6 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maText = rText; pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); @@ -1291,7 +1290,6 @@ void HeaderBar::InsertItem( USHORT nItemId, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maImage = rImage; pItem->maText = rText; pItem->mpUserData = 0; @@ -1563,11 +1561,11 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const if ( nPos != HEADERBAR_ITEM_NOTFOUND ) { ImplHeadItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -1578,22 +1576,22 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void HeaderBar::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void HeaderBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { USHORT nPos = GetItemPos( nItemId ); if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG HeaderBar::GetHelpId( USHORT nItemId ) const +rtl::OString HeaderBar::GetHelpId( USHORT nItemId ) const { USHORT nPos = GetItemPos( nItemId ); + rtl::OString aRet; if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 02a578629039..85325911114f 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -858,7 +858,8 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - SetHelpId( SID_OPENURL ); + // FIXME: HELPID + SetHelpId( ""/*SID_OPENURL*/ ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index c4896ba8b812..f49ae2e432a6 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -58,7 +58,7 @@ struct ImplTabBarItem XubString maHelpText; Rectangle maRect; long mnWidth; - ULONG mnHelpId; + rtl::OString maHelpId; BOOL mbShort; BOOL mbSelect; BOOL mbEnable; @@ -70,7 +70,6 @@ struct ImplTabBarItem mnId = nItemId; mnBits = nPageBits; mnWidth = 0; - mnHelpId = 0; mbShort = FALSE; mbSelect = FALSE; mbEnable = TRUE; @@ -1338,13 +1337,13 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -2309,11 +2308,11 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const if ( nPos != TABBAR_PAGE_NOTFOUND ) { ImplTabBarItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2324,22 +2323,22 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const // ----------------------------------------------------------------------- -void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId ) +void TabBar::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ) { USHORT nPos = GetPagePos( nPageId ); if ( nPos != TABBAR_PAGE_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG TabBar::GetHelpId( USHORT nPageId ) const +rtl::OString TabBar::GetHelpId( USHORT nPageId ) const { USHORT nPos = GetPagePos( nPageId ); + rtl::OString aRet; if ( nPos != TABBAR_PAGE_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 2fdab63be37f..ba5e8d53b8b2 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -517,13 +517,13 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt ) { if ( pItem ) { - ULONG nHelpId = pItem->maItem.GetHelpId(); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 2849ddb71d10..82b8cd2c5c04 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -609,7 +609,8 @@ void AssignmentPersistentData::Commit() m_pImpl->pFields[row * 2 + column]->SetDropDownLineCount(15); m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect)); - m_pImpl->pFields[row * 2 + column]->SetHelpId(HID_ADDRTEMPL_FIELD_ASSIGNMENT); + // FIXME: HELPID + m_pImpl->pFields[row * 2 + column]->SetHelpId( "" /*HID_ADDRTEMPL_FIELD_ASSIGNMENT*/); } } diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index b0e77d658931..1f6af3f36660 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -68,9 +68,9 @@ DECLARE_LIST( UniStringList, UniString* ) // #define STD_BTN_WIDTH 90 // #define STD_BTN_HEIGHT 35 -#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \ +#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \ p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \ - p->SetHelpId( nHelpId ); \ + p->SetHelpId( rHelpId ); \ p->SetPosSizePixel( aPos, aSize ); \ p->SetText( aTitel ); \ p->Show(); @@ -132,7 +132,8 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pNewDirBtn->Enable( bCreateDir ); } - pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*HID_FILEDLG_PATHDLG*/ ); lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); @@ -173,29 +174,35 @@ void ImpPathDialog::InitControls() long nH = 0; UniString aEmptyStr; + // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT ); + // FIXME: HELPID + INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), ""/*HID_FILEDLG_EDIT*/ ); aPnt.Y() += aEDSiz.Height() + a3Siz.Height(); #ifndef UNX long nLbH2 = pDlg->LogicToPixel( Size( 0, 60 ), MAP_APPFONT ).Height(); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS ); + aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); aPnt.Y() += nLbH1 + a6Siz.Height(); + // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES ); + aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); nH = aPnt.Y() + aEDSiz.Height() + a6Siz.Height(); #else long nNewH = nLbH1 + 3 * a3Siz.Height() + aFTSiz.Height() + aEDSiz.Height(); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, HID_FILEDLG_DIRS ); + aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); nH = aPnt.Y() + nNewH + a6Siz.Height(); pDriveTitle = NULL; pDriveList = NULL; @@ -226,17 +233,19 @@ void ImpPathDialog::InitControls() aPnt.X() = 2 * a6Siz.Width() + aEDSiz.Width(); aPnt.Y() = a6Siz.Height(); INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aOkStr, 0 ); + aPnt, aBtnSiz, aOkStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pCancelBtn, CancelButton, 0, - aPnt, aBtnSiz, aCancelStr, 0 ); + aPnt, aBtnSiz, aCancelStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); + aPnt, aBtnSiz, aNewDirStr, ""/*HID_FILEDLG_NEWDIR*/ ); #if defined(UNX) || defined(OS2) aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pHomeBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aHomeDirStr, HID_FILEDLG_HOME ); + aPnt, aBtnSiz, aHomeDirStr, ""/*HID_FILEDLG_HOME*/ ); #else pHomeBtn = NULL; #endif @@ -714,7 +723,8 @@ ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits, RESOURCE_TYPE if ( nType == WINDOW_FILEDIALOG ) InitControls(); - pDlg->SetHelpId( HID_FILEDLG_OPENDLG ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*HID_FILEDLG_OPENDLG*/ ); } @@ -742,36 +752,47 @@ void ImpFileDialog::InitControls() const int nW = 160; const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen + // FIXME: HELPID INITCONTROL( pFileTitel, FixedText, 0, - Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), HID_FILEDLG_FILE ); + Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), ""/*HID_FILEDLG_FILE*/ ); + // FIXME: HELPID INITCONTROL( pEdit, Edit, WB_BORDER, - Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask() + Point(10, 31), Size(nW, 20), aEmptyStr, ""/*HID_FILEDLG_EDIT*/ ); // aMask() + // FIXME: HELPID INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER, - Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES ); + Point(10, 58), Size(nW, 180-nH), aEmptyStr, ""/*HID_FILEDLG_FILES*/ ); + // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); + Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); + // FIXME: HELPID INITCONTROL( pDirPath, FixedInfo, WB_PATHELLIPSIS, - Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), HID_FILEDLG_PATH ); + Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), ""/*HID_FILEDLG_PATH*/ ); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, HID_FILEDLG_DIRS ); + Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + // FIXME: HELPID INITCONTROL( pTypeTitel, FixedText, 0, - Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), HID_FILEDLG_TYPE ); + Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), ""/*HID_FILEDLG_TYPE*/ ); #ifndef UNX + // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); + Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); + Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); + // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_DRIVES ); + Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); pNewDirBtn = NULL; pHomeBtn = NULL; #else + // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); + Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); pDriveTitle = NULL; pDriveList = NULL; @@ -782,10 +803,10 @@ void ImpFileDialog::InitControls() const long nButtonStartX = 2*nW+20+15; INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, Point(nButtonStartX, 10), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_OK ), 0 ); + Button::GetStandardText( BUTTON_OK ), "" ); INITCONTROL( pCancelBtn, CancelButton, 0, Point(nButtonStartX, 45 ), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_CANCEL ), 0 ); + Button::GetStandardText( BUTTON_CANCEL ), "" ); pLoadBtn = 0; diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 2c71e60e8101..4898ed5d5f86 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -225,15 +225,15 @@ namespace svt } //-------------------------------------------------------------------- - void RoadmapWizard::SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode ) + void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId ) { - m_pImpl->pRoadmap->SetSmartHelpId( _rId, _aMode ); + m_pImpl->pRoadmap->SetHelpId( _rId ); } //-------------------------------------------------------------------- - SmartId RoadmapWizard::GetRoadmapSmartHelpId() const + const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const { - return m_pImpl->pRoadmap->GetSmartHelpId(); + return m_pImpl->pRoadmap->GetHelpId(); } //-------------------------------------------------------------------- diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 6a09f85036fd..24c68a9cdb00 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -177,7 +177,8 @@ namespace svt if (_nButtonFlags & WZB_PREVIOUS) { m_pPrevPage = new PushButton(this, WB_TABSTOP); - m_pPrevPage->SetSmartHelpId( SmartId(HID_WIZARD_PREVIOUS) ); + // FIXME: HELPID + m_pPrevPage->SetHelpId( "" /*HID_WIZARD_PREVIOUS*/ ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); m_pPrevPage->Show(); @@ -194,7 +195,8 @@ namespace svt if (_nButtonFlags & WZB_NEXT) { m_pNextPage = new PushButton(this, WB_TABSTOP); - m_pNextPage->SetSmartHelpId( SmartId(HID_WIZARD_NEXT) ); + // FIXME: HELPID + m_pNextPage->SetHelpId( "" /*HID_WIZARD_NEXT*/ ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); m_pNextPage->Show(); diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 55800a213a2e..930d3412c632 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -109,7 +109,8 @@ namespace svt AlwaysEnableInput( TRUE, TRUE ); // unique id for the testtool - SetUniqueId( HID_HELPAGENT_WINDOW ); + // FIXME: HELPID + SetUniqueId( ""/*HID_HELPAGENT_WINDOW*/ ); } //-------------------------------------------------------------------- -- cgit From 333d1e3dcc2e819f8c62c9713cca96fbedaba3de Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 16 Jun 2010 06:33:39 +0200 Subject: impress186: #i4499# graphic dialog reorganisation - added support of bitmap resolution --- .../filter.vcl/filter/SvFilterOptionsDialog.cxx | 143 +- .../filter.vcl/filter/SvFilterOptionsDialog.hxx | 18 +- svtools/source/filter.vcl/filter/dlgejpg.cxx | 96 -- svtools/source/filter.vcl/filter/dlgejpg.hrc | 39 - svtools/source/filter.vcl/filter/dlgejpg.hxx | 72 - svtools/source/filter.vcl/filter/dlgejpg.src | 136 -- svtools/source/filter.vcl/filter/dlgepng.cxx | 90 -- svtools/source/filter.vcl/filter/dlgepng.hrc | 35 - svtools/source/filter.vcl/filter/dlgepng.hxx | 71 - svtools/source/filter.vcl/filter/dlgepng.src | 119 -- svtools/source/filter.vcl/filter/dlgexpor.cxx | 442 ------ svtools/source/filter.vcl/filter/dlgexpor.hrc | 58 - svtools/source/filter.vcl/filter/dlgexpor.hxx | 127 -- svtools/source/filter.vcl/filter/dlgexpor.src | 315 ----- svtools/source/filter.vcl/filter/exportdialog.cxx | 1474 ++++++++++++++++++++ svtools/source/filter.vcl/filter/exportdialog.hrc | 99 ++ svtools/source/filter.vcl/filter/exportdialog.hxx | 211 +++ svtools/source/filter.vcl/filter/exportdialog.src | 505 +++++++ svtools/source/filter.vcl/filter/filter.cxx | 10 +- svtools/source/filter.vcl/filter/makefile.mk | 35 +- svtools/source/filter.vcl/filter/strings.hrc | 27 - svtools/source/filter.vcl/filter/strings.src | 85 -- 22 files changed, 2362 insertions(+), 1845 deletions(-) delete mode 100644 svtools/source/filter.vcl/filter/dlgejpg.cxx delete mode 100644 svtools/source/filter.vcl/filter/dlgejpg.hrc delete mode 100644 svtools/source/filter.vcl/filter/dlgejpg.hxx delete mode 100644 svtools/source/filter.vcl/filter/dlgejpg.src delete mode 100644 svtools/source/filter.vcl/filter/dlgepng.cxx delete mode 100644 svtools/source/filter.vcl/filter/dlgepng.hrc delete mode 100644 svtools/source/filter.vcl/filter/dlgepng.hxx delete mode 100644 svtools/source/filter.vcl/filter/dlgepng.src delete mode 100644 svtools/source/filter.vcl/filter/dlgexpor.cxx delete mode 100644 svtools/source/filter.vcl/filter/dlgexpor.hrc delete mode 100644 svtools/source/filter.vcl/filter/dlgexpor.hxx delete mode 100644 svtools/source/filter.vcl/filter/dlgexpor.src create mode 100755 svtools/source/filter.vcl/filter/exportdialog.cxx create mode 100755 svtools/source/filter.vcl/filter/exportdialog.hrc create mode 100755 svtools/source/filter.vcl/filter/exportdialog.hxx create mode 100755 svtools/source/filter.vcl/filter/exportdialog.src delete mode 100644 svtools/source/filter.vcl/filter/strings.hrc delete mode 100644 svtools/source/filter.vcl/filter/strings.src (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx index 038930ef80ee..1c4eeeff1bbf 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx @@ -36,9 +36,7 @@ #include #include #include -#include "dlgexpor.hxx" -#include "dlgejpg.hxx" -#include "dlgepng.hxx" +#include "exportdialog.hxx" #include #include #include @@ -49,12 +47,6 @@ #include #include "vcl/svapp.hxx" -#if defined WIN || (defined OS2 && !defined ICC) -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" -#else -#define EXPDLG_FUNCTION_NAME "DoExportDialog" -#endif - using namespace ::rtl; using namespace ::com::sun::star; @@ -93,9 +85,10 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- -SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > & xMgr ) : - rxMgr ( xMgr ), - eFieldUnit ( FUNIT_CM ) +SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > xMgr ) : + mxMgr ( xMgr ), + meFieldUnit ( FUNIT_CM ), + mbExportSelection ( sal_False ) { } @@ -148,18 +141,18 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() throw ( uno::RuntimeException ) { sal_Int32 i, nCount; - for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) + for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( maMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) break; } if ( i == nCount ) - aMediaDescriptor.realloc( ++nCount ); + maMediaDescriptor.realloc( ++nCount ); // the "FilterData" Property is an Any that will contain our PropertySequence of Values - aMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) ); - aMediaDescriptor[ i ].Value <<= aFilterDataSequence; - return aMediaDescriptor; + maMediaDescriptor[ i ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterData" ) ); + maMediaDescriptor[ i ].Value <<= maFilterDataSequence; + return maMediaDescriptor; } void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) @@ -167,15 +160,18 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - aMediaDescriptor = aProps; + maMediaDescriptor = aProps; sal_Int32 i, nCount; - for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) + for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( maMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) { - aMediaDescriptor[ i ].Value >>= aFilterDataSequence; - break; + maMediaDescriptor[ i ].Value >>= maFilterDataSequence; + } + else if ( maMediaDescriptor[ i ].Name.equalsAscii( "SelectionOnly" ) ) + { + maMediaDescriptor[ i ].Value >>= mbExportSelection; } } } @@ -184,7 +180,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope void SvFilterOptionsDialog::setTitle( const OUString& aTitle ) throw ( uno::RuntimeException ) { - aDialogTitle = aTitle; + maDialogTitle = aTitle; } sal_Int16 SvFilterOptionsDialog::execute() @@ -194,13 +190,13 @@ sal_Int16 SvFilterOptionsDialog::execute() String aFilterNameStr( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); String aInternalFilterName; - sal_Int32 j, nCount = aMediaDescriptor.getLength(); + sal_Int32 j, nCount = maMediaDescriptor.getLength(); for ( j = 0; j < nCount; j++ ) { - if ( aMediaDescriptor[ j ].Name.equals( aFilterNameStr ) ) + if ( maMediaDescriptor[ j ].Name.equals( aFilterNameStr ) ) { OUString aStr; - aMediaDescriptor[ j ].Value >>= aStr; + maMediaDescriptor[ j ].Value >>= aStr; aInternalFilterName = aStr; aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "draw_" ) ), String(), 0 ); aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "impress_" ) ), String(), 0 ); @@ -219,79 +215,24 @@ sal_Int16 SvFilterOptionsDialog::execute() } if ( nFormat < nFilterCount ) { - FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, eFieldUnit ); - aFltCallDlgPara.aFilterData = aFilterDataSequence; - - String aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) ); - if ( aGraphicFilter.pConfig->IsExportInternalFilter( nFormat ) ) - { - // Export-Dialog fuer Bitmap's, SVM's und WMF's - if( ( aFilterName.EqualsIgnoreCaseAscii( EXP_BMP ) ) || - ( aFilterName.EqualsIgnoreCaseAscii( EXP_SVMETAFILE ) ) || - ( aFilterName.EqualsIgnoreCaseAscii( EXP_WMF ) ) || - ( aFilterName.EqualsIgnoreCaseAscii( EXP_EMF ) ) || - ( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )|| - ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) ) - { - ByteString aResMgrName( "svt", 3 ); - ResMgr* pResMgr; - - pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); - aFltCallDlgPara.pResMgr = pResMgr; - // JPEG-Dialog - if( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) ) - { - if ( DlgExportEJPG( aFltCallDlgPara ).Execute() == RET_OK ) - nRet = ui::dialogs::ExecutableDialogResults::OK; - } - else if ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) - { - if ( DlgExportEPNG( aFltCallDlgPara ).Execute() == RET_OK ) - nRet = ui::dialogs::ExecutableDialogResults::OK; - } - else if( aFilterName.EqualsIgnoreCaseAscii( EXP_BMP ) ) - { - // Fuer Vektorformate nehmen wir den Vektor-Dialog - aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); - if ( DlgExportPix( aFltCallDlgPara ).Execute() == RET_OK ) - nRet = ui::dialogs::ExecutableDialogResults::OK; - } - else - { - aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); - if ( DlgExportVec( aFltCallDlgPara ).Execute() == RET_OK ) - nRet = ui::dialogs::ExecutableDialogResults::OK; - } - delete pResMgr; - } - } - else // ladbare Filter - { - xub_StrLen i, nTokenCount = aGraphicFilter.aFilterPath.GetTokenCount( ';' ); - for ( i = 0; i < nTokenCount; i++ ) - { - - OUString aPathURL; - - ::osl::FileBase::getFileURLFromSystemPath( aGraphicFilter.aFilterPath.GetToken( i ), aPathURL ); - aPathURL += String( '/' ); - - OUString aSystemPath; - ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); - aSystemPath += OUString( aFilterName ); - - osl::Module aLibrary( aSystemPath ); - PFilterDlgCall pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); - // Dialog in DLL ausfuehren - if( pFunc ) - { - if ( (*pFunc)( aFltCallDlgPara ) ) - nRet = ui::dialogs::ExecutableDialogResults::OK; - } - } - } + FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit ); + aFltCallDlgPara.aFilterData = maFilterDataSequence; + + ByteString aResMgrName( "svt", 3 ); + ResMgr* pResMgr; + + pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); + aFltCallDlgPara.pResMgr = pResMgr; + + aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); + sal_Bool bIsPixelFormat( aGraphicFilter.pConfig->IsExportPixelFormat( nFormat ) ); + if ( ExportDialog( aFltCallDlgPara, mxMgr, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK ) + nRet = ui::dialogs::ExecutableDialogResults::OK; + + delete pResMgr; + // taking the out parameter from the dialog - aFilterDataSequence = aFltCallDlgPara.aFilterData; + maFilterDataSequence = aFltCallDlgPara.aFilterData; } } return nRet; @@ -301,6 +242,8 @@ sal_Int16 SvFilterOptionsDialog::execute() void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) { + mxSourceDocument = xDoc; + // try to set the corresponding metric unit String aConfigPath; uno::Reference< lang::XServiceInfo > xServiceInfo @@ -320,7 +263,7 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "Metric" ) ); else aPropertyName = String( RTL_CONSTASCII_USTRINGPARAM( "NonMetric" ) ); - eFieldUnit = (FieldUnit)aConfigItem.ReadInt32( aPropertyName, FUNIT_CM ); + meFieldUnit = (FieldUnit)aConfigItem.ReadInt32( aPropertyName, FUNIT_CM ); } } } diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx index a55fc4c84520..16592bac8df7 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx @@ -46,18 +46,22 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5 com::sun::star::lang::XServiceInfo > { - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & - rxMgr; + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + mxMgr; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - aMediaDescriptor; + maMediaDescriptor; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - aFilterDataSequence; - rtl::OUString aDialogTitle; - FieldUnit eFieldUnit; + maFilterDataSequence; + com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + mxSourceDocument; + + rtl::OUString maDialogTitle; + FieldUnit meFieldUnit; + sal_Bool mbExportSelection; public: - SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); + SvFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB ); ~SvFilterOptionsDialog(); // XInterface diff --git a/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx deleted file mode 100644 index 377697023de3..000000000000 --- a/svtools/source/filter.vcl/filter/dlgejpg.cxx +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include "dlgejpg.hxx" -#include "dlgejpg.hrc" -#include "strings.hrc" -#include - -#define KEY_QUALITY "Quality" -#define KEY_GRAYSCALES "ColorMode" - -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ - -DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) : - ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_JPG, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), - aFiDescr ( this, ResId( FI_DESCR, *rPara.pResMgr ) ), - aNumFldQuality ( this, ResId( NUM_FLD_QUALITY, *rPara.pResMgr ) ), - aGrpQuality ( this, ResId( GRP_QUALITY, *rPara.pResMgr ) ), - aRbGray ( this, ResId( RB_GRAY, *rPara.pResMgr ) ), - aRbRGB ( this, ResId( RB_RGB, *rPara.pResMgr ) ), - aGrpColors ( this, ResId( GRP_COLORS, *rPara.pResMgr ) ), - aBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), - aBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), - aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ) -{ - FreeResource(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); - pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - - // reading filter options - sal_Int32 nQuality = pConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 ); - sal_Int32 nColorMode = pConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_GRAYSCALES ) ), 0 ); - aNumFldQuality.SetValue( nQuality ); - - if ( nColorMode ) - aRbGray.Check( sal_True ); - else - aRbRGB.Check( sal_True ); - - aBtnOK.SetClickHdl( LINK( this, DlgExportEJPG, OK ) ); -} - - -/************************************************************************* -|* -|* Speichert eingestellte Werte in ini-Datei -|* -\************************************************************************/ - -IMPL_LINK( DlgExportEJPG, OK, void *, EMPTYARG ) -{ - // Config-Parameter schreiben - pConfigItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), (sal_Int32)aNumFldQuality.GetValue() ); - pConfigItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_GRAYSCALES ) ), aRbGray.IsChecked() ? 1 : 0 ); - rFltCallPara.aFilterData = pConfigItem->GetFilterData(); - EndDialog( RET_OK ); - return 0; -} - -DlgExportEJPG::~DlgExportEJPG() -{ - delete pConfigItem; -} - - diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc deleted file mode 100644 index 523a1d9553f1..000000000000 --- a/svtools/source/filter.vcl/filter/dlgejpg.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 -#define FI_DESCR 1 -#define NUM_FLD_QUALITY 1 -#define GRP_QUALITY 1 -#define GRP_COLORS 2 -#define RB_GRAY 1 -#define RB_RGB 2 - - diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx deleted file mode 100644 index d80682574a54..000000000000 --- a/svtools/source/filter.vcl/filter/dlgejpg.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _DLGEJPG_HXX_ -#define _DLGEJPG_HXX_ - -#include -#include -#include -#include -#include -#include -#include -#include - -/************************************************************************* -|* -|* Dialog zum Einstellen von Filteroptionen -|* -\************************************************************************/ -class FilterConfigItem; -class DlgExportEJPG : public ModalDialog -{ -private: - - FltCallDialogParameter& rFltCallPara; - - FixedInfo aFiDescr; - NumericField aNumFldQuality; - FixedLine aGrpQuality; - RadioButton aRbGray; - RadioButton aRbRGB; - FixedLine aGrpColors; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - FilterConfigItem* pConfigItem; - - DECL_LINK( OK, void * ); - -public: - DlgExportEJPG( FltCallDialogParameter& rDlgPara ); - ~DlgExportEJPG(); -}; - -#endif // _DLGEJPG_HXX_ - diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src deleted file mode 100644 index fd224f22c409..000000000000 --- a/svtools/source/filter.vcl/filter/dlgejpg.src +++ /dev/null @@ -1,136 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "dlgejpg.hrc" -ModalDialog DLG_EXPORT_JPG -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 159 , 92 ) ; - Text [ en-US ] = "JPEG Options" ; - Moveable = TRUE ; - Closeable = TRUE ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 103 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 103 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 103 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedLine GRP_QUALITY - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 90 , 8 ) ; - Text [ en-US ] = "Quality" ; - }; - FixedText FI_DESCR - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 81 , 16 ) ; - Text [ en-US ] = "1: min. quality\n100: max. quality" ; - }; - NumericField NUM_FLD_QUALITY - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 33 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Spin = TRUE ; - Minimum = 1; - Maximum = 100 ; - StrictFormat = TRUE ; - Last = 100 ; - Repeat = TRUE ; - }; - FixedLine GRP_COLORS - { - Pos = MAP_APPFONT ( 6 , 51 ) ; - Size = MAP_APPFONT ( 90 , 8 ) ; - Text [ en-US ] = "Color resolution" ; - }; - RadioButton RB_GRAY - { - Pos = MAP_APPFONT ( 12 , 62 ) ; - Size = MAP_APPFONT ( 81 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Grayscale" ; - }; - RadioButton RB_RGB - { - Pos = MAP_APPFONT ( 12 , 76 ) ; - Size = MAP_APPFONT ( 81 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "True Colors" ; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx deleted file mode 100644 index bd551e9a4bda..000000000000 --- a/svtools/source/filter.vcl/filter/dlgepng.cxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include -#include -#include "dlgepng.hxx" -#include "dlgepng.hrc" - -using namespace ::rtl; -using namespace ::com::sun::star::uno; - -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ - -DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) : - ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_EPNG, *rPara.pResMgr ) ), - FilterConfigItem ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ), - rFltCallPara ( rPara ), - aGrpCompression ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ), - aFiCompression ( this, ResId( FI_COMPRESSION, *rPara.pResMgr ) ), - aNumCompression ( this, ResId( NUM_COMPRESSION, *rPara.pResMgr ) ), - aCbxInterlaced ( this, ResId( CBX_INTERLACED, *rPara.pResMgr ) ), - aBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), - aBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), - aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ) -{ - FreeResource(); - - // Config-Parameter lesen - sal_Int32 nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); - if ( ( nCompression < 0 ) || ( nCompression > 9 ) ) - nCompression = 6; - aNumCompression.SetValue( nCompression ); - - sal_Int32 nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ); - sal_Bool bInterlaced = nInterlaced != 0; - aCbxInterlaced.Check( bInterlaced ); - - aBtnOK.SetClickHdl( LINK( this, DlgExportEPNG, OK ) ); -} - -/************************************************************************* -|* -|* Speichert eingestellte Werte in ini-Datei -|* -\************************************************************************/ - -IMPL_LINK( DlgExportEPNG, OK, void *, EMPTYARG ) -{ - // Config-Parameter schreiben - WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), static_cast(aNumCompression.GetValue()) ); - sal_Int32 nInterlace = 0; - if ( aCbxInterlaced.IsChecked() ) - nInterlace++; - WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace ); - rFltCallPara.aFilterData = GetFilterData(); - EndDialog( RET_OK ); - - return 0; -} diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc deleted file mode 100644 index 4a05771534ab..000000000000 --- a/svtools/source/filter.vcl/filter/dlgepng.hrc +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 -#define GRP_COMPRESSION 1 -#define FI_COMPRESSION 1 -#define NUM_COMPRESSION 1 -#define CBX_INTERLACED 1 diff --git a/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx deleted file mode 100644 index 469985afee59..000000000000 --- a/svtools/source/filter.vcl/filter/dlgepng.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _DLGEPNG_HXX_ -#define _DLGEPNG_HXX_ -#include -#include -#include -#include -#include -#include -#include - - -/************************************************************************* -|* -|* Dialog zum Einstellen von Filteroptionen -|* -\************************************************************************/ - -class ResMgr; - -class DlgExportEPNG : public ModalDialog, FilterConfigItem -{ - - private: - - FltCallDialogParameter& rFltCallPara; - - FixedLine aGrpCompression; - FixedInfo aFiCompression; - NumericField aNumCompression; - CheckBox aCbxInterlaced; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - ResMgr* pMgr; - - DECL_LINK( OK, void * ); - - public: - - DlgExportEPNG( FltCallDialogParameter& rPara ); -}; - -#endif // _DLGEPNG_HXX_ diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src deleted file mode 100644 index aa778842dc48..000000000000 --- a/svtools/source/filter.vcl/filter/dlgepng.src +++ /dev/null @@ -1,119 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "dlgepng.hrc" -ModalDialog DLG_EXPORT_EPNG -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 169 , 64 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Text [ en-US ] = "PNG Options" ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 113 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 113 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 113 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedLine GRP_COMPRESSION - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 100 , 8 ) ; - Text[ en-US ] = "Mode"; - }; - FixedText FI_COMPRESSION - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; - Text[ en-US ] = "~Compression 0..9"; - }; - NumericField NUM_COMPRESSION - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 25 ) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - TabStop = TRUE ; - Spin = TRUE ; - Minimum = 0 ; - Maximum = 9 ; - First = 0 ; - Last = 9 ; - StrictFormat = TRUE ; - Repeat = TRUE ; - }; - CheckBox CBX_INTERLACED - { - Pos = MAP_APPFONT ( 12 , 43 ) ; - Size = MAP_APPFONT ( 80 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Interlaced" ; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx deleted file mode 100644 index b4b7c0fc949d..000000000000 --- a/svtools/source/filter.vcl/filter/dlgexpor.cxx +++ /dev/null @@ -1,442 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifndef GCC -# pragma hdrstop -#endif - -#include -#include -#include -#include -#include "dlgexpor.hxx" -#include "dlgexpor.hrc" -#include "strings.hrc" - -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ - -DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : - ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_PIX, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), - aBtnOK ( this, ResId( BTN_OK_PIX, *rPara.pResMgr ) ), - aBtnCancel ( this, ResId( BTN_CANCEL_PIX, *rPara.pResMgr ) ), - aBtnHelp ( this, ResId( BTN_HELP_PIX, *rPara.pResMgr ) ), - aLbColors ( this, ResId( LB_COLORS, *rPara.pResMgr ) ), - aCbxRLE ( this, ResId( CBX_RLE, *rPara.pResMgr ) ), - aGrpColors ( this, ResId( GRP_COLORS, *rPara.pResMgr ) ), - aRbOriginal ( this, ResId( RB_ORIGINAL_PIX, *rPara.pResMgr ) ), - aRbRes ( this, ResId( RB_RES_PIX, *rPara.pResMgr ) ), - aRbSize ( this, ResId( RB_SIZE_PIX, *rPara.pResMgr ) ), - aFtSizeX ( this, ResId( FT_SIZEX_PIX, *rPara.pResMgr ) ), - aMtfSizeX ( this, ResId( MTF_SIZEX_PIX, *rPara.pResMgr ) ), - aFtSizeY ( this, ResId( FT_SIZEY_PIX, *rPara.pResMgr ) ), - aMtfSizeY ( this, ResId( MTF_SIZEY_PIX, *rPara.pResMgr ) ), - aGrpMode ( this, ResId( GRP_MODE_PIX, *rPara.pResMgr ) ), - aCbbRes ( this, ResId( CBB_RES_PIX, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) -{ - aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); - aFilterConfigPath.Append( aExt ); - pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - - String aTitle( aExt ); - FreeResource(); - - aBtnOK.SetClickHdl( LINK( this, DlgExportPix, OK ) ); - aRbOriginal.SetClickHdl( LINK( this, DlgExportPix, ClickRbOriginal ) ); - aRbRes.SetClickHdl( LINK( this, DlgExportPix, ClickRbRes ) ); - aRbSize.SetClickHdl( LINK( this, DlgExportPix, ClickRbSize ) ); - aLbColors.SetSelectHdl( LINK( this, DlgExportPix, SelectLbColors ) ); - - aTitle.ToUpperAscii(); - aTitle += String( ResId( EXPORT_DIALOG_TITLE, *pMgr ) ); - SetText( aTitle ); - - // Config-Parameter lesen - sal_Int32 nColors = pConfigItem->ReadInt32( String( ResId( KEY_COLORS, *pMgr ) ), 0 ); - sal_Int32 nMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 ); - sal_Int32 nRes = pConfigItem->ReadInt32( String( ResId( KEY_RES, *pMgr ) ), 75 ); - sal_Bool bRleCoding = pConfigItem->ReadBool( String( ResId( KEY_RLE_CODING, *pMgr ) ), sal_True ); - - aLbColors.SelectEntryPos( Min( (sal_uInt16) 7, (sal_uInt16)nColors ) ); - - String aStrRes( String::CreateFromInt32( nRes ) ); - aStrRes.Append( String( RTL_CONSTASCII_USTRINGPARAM( " DPI" ) ) ); - aCbbRes.SetText( aStrRes ); - - ::com::sun::star::awt::Size aDefault( 10000, 10000 ); - ::com::sun::star::awt::Size aSize; - aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault ); - - aCbxRLE.Check( bRleCoding ); - - aMtfSizeX.SetDefaultUnit( FUNIT_MM ); - aMtfSizeY.SetDefaultUnit( FUNIT_MM ); - - aMtfSizeX.SetValue( aSize.Width ); - aMtfSizeY.SetValue( aSize.Height ); - - switch ( rPara.eFieldUnit ) - { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : -// case FUNIT_M : - case FUNIT_MM : - case FUNIT_CM : - case FUNIT_TWIP : - case FUNIT_POINT : - case FUNIT_PICA : - case FUNIT_INCH : - case FUNIT_100TH_MM : - { - aMtfSizeX.SetUnit( rPara.eFieldUnit ); - aMtfSizeY.SetUnit( rPara.eFieldUnit ); - } - break; - - default: - break; // -Wall multiple values not handled. - } - - switch ( nMode ) - { - case 2 : - { - aRbSize.Check( TRUE ); - ClickRbSize( NULL ); - } - break; - case 1 : - { - aRbRes.Check( TRUE ); - ClickRbRes( NULL ); - } - break; - default : - { - aRbOriginal.Check( TRUE ); - ClickRbOriginal( NULL ); - } - break; - } - SelectLbColors( &aLbColors ); -} - -DlgExportPix::~DlgExportPix() -{ - delete pConfigItem; -} - - -/************************************************************************* -|* -|* Speichert eingestellte Werte in ini-Datei -|* -\************************************************************************/ - -IMPL_LINK( DlgExportPix, OK, void *, EMPTYARG ) -{ - // Config-Parameter schreiben - - sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) ); - ::com::sun::star::awt::Size aSize( - static_cast(MetricField::ConvertDoubleValue( static_cast(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )), - static_cast(MetricField::ConvertDoubleValue( static_cast(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) ); - - sal_Int32 nMode; - if ( aRbRes.IsChecked() ) - nMode = 1; - else if ( aRbSize.IsChecked() ) - nMode = 2; - else - nMode = 0; - - pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nMode ); - pConfigItem->WriteInt32( String( ResId( KEY_RES, *pMgr ) ), nRes ); - pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize ); - pConfigItem->WriteInt32( String( ResId( KEY_COLORS, *pMgr ) ), (sal_Int32)aLbColors.GetSelectEntryPos() ); - pConfigItem->WriteBool( String( ResId( KEY_RLE_CODING, *pMgr ) ), aCbxRLE.IsChecked() ); - rFltCallPara.aFilterData = pConfigItem->GetFilterData(); - EndDialog( RET_OK ); - - return 0; -} - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportPix, ClickRbOriginal, void*, EMPTYARG ) -{ - aCbbRes.Disable(); - - aFtSizeX.Disable(); - aMtfSizeX.Disable(); - aFtSizeY.Disable(); - aMtfSizeY.Disable(); - - return 0; -} - - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportPix, ClickRbRes, void*, EMPTYARG ) -{ - aCbbRes.Enable(); - - aFtSizeX.Disable(); - aMtfSizeX.Disable(); - aFtSizeY.Disable(); - aMtfSizeY.Disable(); - - return 0; -} - - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportPix, ClickRbSize, void*, EMPTYARG ) -{ - aFtSizeX.Enable(); - aMtfSizeX.Enable(); - aFtSizeY.Enable(); - aMtfSizeY.Enable(); - - aCbbRes.Disable(); - - return 0; -} - - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportPix, SelectLbColors, void*, EMPTYARG ) -{ - const USHORT nLbPos = aLbColors.GetSelectEntryPos(); - - if ( ( nLbPos >= 3 ) && ( nLbPos <= 6 ) ) - aCbxRLE.Enable(); - else - aCbxRLE.Disable(); - - return 0L; -} - - -/******************************************************************************/ - - -/************************************************************************* -|* -|* Ctor -|* -\************************************************************************/ - -DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : - ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_VEC, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), - aBtnOK ( this, ResId( BTN_OK_VEC, *rPara.pResMgr ) ), - aBtnCancel ( this, ResId( BTN_CANCEL_VEC, *rPara.pResMgr ) ), - aBtnHelp ( this, ResId( BTN_HELP_VEC, *rPara.pResMgr ) ), - aRbOriginal ( this, ResId( RB_ORIGINAL_VEC, *rPara.pResMgr ) ), - aRbSize ( this, ResId( RB_SIZE_VEC, *rPara.pResMgr ) ), - aGrpMode ( this, ResId( GRP_MODE_VEC, *rPara.pResMgr ) ), - aFtSizeX ( this, ResId( FT_SIZEX_VEC, *rPara.pResMgr ) ), - aMtfSizeX ( this, ResId( MTF_SIZEX_VEC, *rPara.pResMgr ) ), - aFtSizeY ( this, ResId( FT_SIZEY_VEC, *rPara.pResMgr ) ), - aMtfSizeY ( this, ResId( MTF_SIZEY_VEC, *rPara.pResMgr ) ), - aGrpSize ( this, ResId( GRP_SIZE_VEC, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) -{ - aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); - aFilterConfigPath.Append( aExt ); - pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - - String aTitle( aExt ); - FreeResource(); - - aBtnOK.SetClickHdl( LINK( this, DlgExportVec, OK ) ); - aRbOriginal.SetClickHdl( LINK( this, DlgExportVec, ClickRbOriginal ) ); - aRbSize.SetClickHdl( LINK( this, DlgExportVec, ClickRbSize ) ); - - aTitle.ToUpperAscii(); - aTitle += String( ResId( EXPORT_DIALOG_TITLE, *pMgr ) ); - SetText( aTitle ); - - // reading config-parameter - sal_Int32 nMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 ); - - ::com::sun::star::awt::Size aDefault( 10000, 10000 ); - ::com::sun::star::awt::Size aSize; - aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault ); - - aMtfSizeX.SetDefaultUnit( FUNIT_MM ); - aMtfSizeY.SetDefaultUnit( FUNIT_MM ); - aMtfSizeX.SetValue( aSize.Width ); - aMtfSizeY.SetValue( aSize.Height ); - - switch ( rPara.eFieldUnit ) - { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : - case FUNIT_MM : - case FUNIT_CM : - case FUNIT_M : - case FUNIT_TWIP : - case FUNIT_POINT : - case FUNIT_PICA : - case FUNIT_INCH : - case FUNIT_100TH_MM : - { - aMtfSizeX.SetUnit( rPara.eFieldUnit ); - aMtfSizeY.SetUnit( rPara.eFieldUnit ); - } - break; - default: - break; // -Wall Multiple values not handled. - } - - switch ( nMode ) - { - case 1 : - { - aRbSize.Check( TRUE ); - ClickRbSize( NULL ); - } - break; - - default : - { - aRbOriginal.Check( TRUE ); - ClickRbOriginal( NULL ); - } - break; - } -} - -DlgExportVec::~DlgExportVec() -{ - delete pConfigItem; -} -/************************************************************************* -|* -|* Speichert eingestellte Werte in ini-Datei -|* -\************************************************************************/ - -IMPL_LINK( DlgExportVec, OK, void *, EMPTYARG ) -{ - // Config-Parameter schreiben - ::com::sun::star::awt::Size aSize( - static_cast(MetricField::ConvertDoubleValue( static_cast(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )), - static_cast(MetricField::ConvertDoubleValue( static_cast(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) ); - - sal_Int32 nMode; - if ( aRbSize.IsChecked() ) - nMode = 1; - else - nMode = 0; - - pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nMode ); - pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize ); - rFltCallPara.aFilterData = pConfigItem->GetFilterData(); - EndDialog( RET_OK ); - - return 0; -} - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportVec, ClickRbOriginal, void*, EMPTYARG ) -{ - aGrpSize.Disable(); - aFtSizeX.Disable(); - aMtfSizeX.Disable(); - aFtSizeY.Disable(); - aMtfSizeY.Disable(); - - return 0; -} - - -/************************************************************************* -|* -|* Enabled/Disabled Controls -|* -\************************************************************************/ - -IMPL_LINK( DlgExportVec, ClickRbSize, void*, EMPTYARG ) -{ - aGrpSize.Enable(); - aFtSizeX.Enable(); - aMtfSizeX.Enable(); - aFtSizeY.Enable(); - aMtfSizeY.Enable(); - - return 0; -} - - - diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc deleted file mode 100644 index 2e5377ce4fcb..000000000000 --- a/svtools/source/filter.vcl/filter/dlgexpor.hrc +++ /dev/null @@ -1,58 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include - -#define BTN_OK_PIX 1 -#define BTN_CANCEL_PIX 1 -#define BTN_HELP_PIX 1 -#define CBX_RES_PIX 1 -#define CBX_SIZE_PIX 2 -#define CBX_RLE 3 -#define CBB_RES_PIX 1 -#define LB_COLORS 1 -#define MTF_SIZEX_PIX 1 -#define MTF_SIZEY_PIX 2 -#define FT_SIZEX_PIX 1 -#define FT_SIZEY_PIX 2 -#define GRP_MODE_PIX 1 -#define GRP_COLORS 4 -#define RB_ORIGINAL_PIX 1 -#define RB_RES_PIX 2 -#define RB_SIZE_PIX 3 - -#define BTN_OK_VEC 1 -#define BTN_CANCEL_VEC 1 -#define BTN_HELP_VEC 1 -#define CBX_SIZE_VEC 2 -#define MTF_SIZEX_VEC 1 -#define MTF_SIZEY_VEC 2 -#define FT_SIZEX_VEC 1 -#define FT_SIZEY_VEC 2 -#define GRP_SIZE_VEC 1 -#define GRP_MODE_VEC 2 -#define RB_ORIGINAL_VEC 1 -#define RB_SIZE_VEC 2 diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx deleted file mode 100644 index 8c7b2d462e70..000000000000 --- a/svtools/source/filter.vcl/filter/dlgexpor.hxx +++ /dev/null @@ -1,127 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _DLGEXPOR_HXX_ -#define _DLGEXPOR_HXX_ - -#include -#include -#include -#include -#include -#include - -/************************************************************************* -|* -|* Dialog zum Einstellen von Filteroptionen bei Pixelformaten -|* -\************************************************************************/ - -class FilterConfigItem; -class DlgExportPix : public ModalDialog -{ -private: - - FltCallDialogParameter& rFltCallPara; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ListBox aLbColors; - CheckBox aCbxRLE; - FixedLine aGrpColors; - - RadioButton aRbOriginal; - RadioButton aRbRes; - RadioButton aRbSize; - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpMode; - ComboBox aCbbRes; - - FilterConfigItem* pConfigItem; - ResMgr* pMgr; - - String aExt; - - DECL_LINK( OK, void* p ); - DECL_LINK( ClickRbOriginal,void* p ); - DECL_LINK( ClickRbRes,void* p ); - DECL_LINK( ClickRbSize,void* p ); - DECL_LINK( SelectLbColors, void* p ); - -public: - DlgExportPix( FltCallDialogParameter& rPara ); - ~DlgExportPix(); -}; - - -/************************************************************************* -|* -|* Dialog zum Einstellen von Filteroptionen bei Vektorformaten -|* -\************************************************************************/ -class DlgExportVec : public ModalDialog -{ -private: - - FltCallDialogParameter& rFltCallPara; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - RadioButton aRbOriginal; - RadioButton aRbSize; - FixedLine aGrpMode; - - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpSize; - - FilterConfigItem* pConfigItem; - ResMgr* pMgr; - - String aExt; - - DECL_LINK( OK, void* p ); - DECL_LINK( ClickRbOriginal,void* p ); - DECL_LINK( ClickRbSize,void* p ); - -public: - DlgExportVec( FltCallDialogParameter& rPara ); - ~DlgExportVec(); -}; - -#endif // _DLGEXPOR_HXX_ - diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src deleted file mode 100644 index 7573b394d72f..000000000000 --- a/svtools/source/filter.vcl/filter/dlgexpor.src +++ /dev/null @@ -1,315 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "dlgexpor.hrc" - -ModalDialog DLG_EXPORT_PIX -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 178 , 135 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - FixedLine GRP_COLORS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Color resolution" ; - }; - ListBox LB_COLORS - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 98 , 90 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoHScroll = TRUE ; - StringList [ en-US ] = - { - < "Original" ; Default ; > ; - < "1 Bit - Threshold Value" ; Default ; > ; - < "1 Bit - Dithering" ; Default ; > ; - < "4 Bit - Grayscale" ; Default ; > ; - < "4 Bit - Color Palette" ; Default ; > ; - < "8 Bit - Grayscales" ; Default ; > ; - < "8 Bit - Color Palette" ; Default ; > ; - < "24 Bit - True Colors" ; Default ; > ; - }; - }; - CheckBox CBX_RLE - { - Pos = MAP_APPFONT ( 12 , 31 ) ; - Size = MAP_APPFONT ( 98 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "RLE coding" ; - }; - FixedLine GRP_MODE_PIX - { - Pos = MAP_APPFONT ( 6 , 48 ) ; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Mode" ; - }; - RadioButton RB_ORIGINAL_PIX - { - Pos = MAP_APPFONT ( 12 , 59 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Original" ; - }; - RadioButton RB_RES_PIX - { - Pos = MAP_APPFONT ( 12 , 73 ) ; - Size = MAP_APPFONT ( 55 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Resolution" ; - }; - ComboBox CBB_RES_PIX - { - Pos = MAP_APPFONT ( 70 , 73 ) ; - Size = MAP_APPFONT ( 40 , 50 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList = - { - "75 DPI" ; - "150 DPI" ; - "300 DPI" ; - "600 DPI" ; - }; - }; - RadioButton RB_SIZE_PIX - { - Pos = MAP_APPFONT ( 12 , 87 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Size" ; - }; - MetricField MTF_SIZEX_PIX - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 101 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 100 ; - Maximum = 99999 ; - StrictFormat = TRUE ; - DecimalDigits = 2 ; - Unit = FUNIT_MM ; - First = 100 ; - Last = 99999 ; - SpinSize = 100 ; - }; - FixedText FT_SIZEX_PIX - { - Pos = MAP_APPFONT ( 18 , 102 ) ; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Width" ; - }; - MetricField MTF_SIZEY_PIX - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 117 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 100 ; - Maximum = 99999 ; - StrictFormat = TRUE ; - DecimalDigits = 2 ; - Unit = FUNIT_MM ; - First = 100 ; - Last = 99999 ; - SpinSize = 100 ; - }; - FixedText FT_SIZEY_PIX - { - Pos = MAP_APPFONT ( 18 , 118 ) ; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Height" ; - }; - OKButton BTN_OK_PIX - { - Pos = MAP_APPFONT ( 122 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL_PIX - { - Pos = MAP_APPFONT ( 122 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP_PIX - { - Pos = MAP_APPFONT ( 122 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; -ModalDialog DLG_EXPORT_VEC -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 178 , 89 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - - FixedLine GRP_MODE_VEC - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Mode" ; - }; - RadioButton RB_ORIGINAL_VEC - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Original" ; - }; - RadioButton RB_SIZE_VEC - { - Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Size" ; - }; - FixedLine GRP_SIZE_VEC - { - Pos = MAP_APPFONT ( 6 , 44 ) ; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Size" ; - }; - FixedText FT_SIZEX_VEC - { - Pos = MAP_APPFONT ( 12 , 56 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text [ en-US ] = "Width" ; - }; - MetricField MTF_SIZEX_VEC - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 55 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 100 ; - Maximum = 99999 ; - StrictFormat = TRUE ; - DecimalDigits = 2 ; - Unit = FUNIT_MM ; - First = 100 ; - Last = 99999 ; - SpinSize = 100 ; - }; - FixedText FT_SIZEY_VEC - { - Pos = MAP_APPFONT ( 12 , 72 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text [ en-US ] = "Height" ; - }; - MetricField MTF_SIZEY_VEC - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 71 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 100 ; - Maximum = 99999 ; - StrictFormat = TRUE ; - DecimalDigits = 2 ; - Unit = FUNIT_MM ; - First = 100 ; - Last = 99999 ; - SpinSize = 100 ; - }; - OKButton BTN_OK_VEC - { - Pos = MAP_APPFONT ( 122 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL_VEC - { - Pos = MAP_APPFONT ( 122 , 24 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP_VEC - { - Pos = MAP_APPFONT ( 122 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx new file mode 100755 index 000000000000..7e56be261dbb --- /dev/null +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -0,0 +1,1474 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svtools.hxx" + +#ifndef GCC +# pragma hdrstop +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "exportdialog.hxx" +#include "exportdialog.hrc" + +#define FORMAT_UNKNOWN 0 +#define FORMAT_JPG 1 +#define FORMAT_PNG 2 +#define FORMAT_BMP 3 +#define FORMAT_GIF 4 +#define FORMAT_PBM 5 +#define FORMAT_PGM 6 +#define FORMAT_PPM 7 +#define FORMAT_PCT 8 +#define FORMAT_RAS 9 +#define FORMAT_TIF 10 +#define FORMAT_XPM 11 +#define FORMAT_WMF 12 +#define FORMAT_EMF 13 +#define FORMAT_EPS 14 +#define FORMAT_MET 15 +#define FORMAT_SVG 16 +#define FORMAT_SVM 17 + +#define UNIT_INCH 0 +#define UNIT_CM 1 +#define UNIT_MM 2 +#define UNIT_POINT 3 +#define UNIT_PIXEL 4 +#define UNIT_MAX_ID UNIT_PIXEL + +using namespace ::com::sun::star; + +static sal_Int16 GetFilterFormat( String& rExt ) +{ + sal_Int16 nFormat = FORMAT_UNKNOWN; + ByteString aExt( rExt, RTL_TEXTENCODING_UTF8 ); + if ( aExt.Equals( "JPG" ) ) + nFormat = FORMAT_JPG; + else if ( aExt.Equals( "PNG" ) ) + nFormat = FORMAT_PNG; + else if ( aExt.Equals( "BMP" ) ) + nFormat = FORMAT_BMP; + else if ( aExt.Equals( "GIF" ) ) + nFormat = FORMAT_GIF; + else if ( aExt.Equals( "PBM" ) ) + nFormat = FORMAT_PBM; + else if ( aExt.Equals( "PGM" ) ) + nFormat = FORMAT_PGM; + else if ( aExt.Equals( "PPM" ) ) + nFormat = FORMAT_PPM; + else if ( aExt.Equals( "PCT" ) ) + nFormat = FORMAT_PCT; + else if ( aExt.Equals( "RAS" ) ) + nFormat = FORMAT_RAS; + else if ( aExt.Equals( "TIF" ) ) + nFormat = FORMAT_TIF; + else if ( aExt.Equals( "XPM" ) ) + nFormat = FORMAT_XPM; + else if ( aExt.Equals( "WMF" ) ) + nFormat = FORMAT_WMF; + else if ( aExt.Equals( "EMF" ) ) + nFormat = FORMAT_EMF; + else if ( aExt.Equals( "EPS" ) ) + nFormat = FORMAT_EPS; + else if ( aExt.Equals( "MET" ) ) + nFormat = FORMAT_MET; + else if ( aExt.Equals( "SVG" ) ) + nFormat = FORMAT_SVG; + else if ( aExt.Equals( "SVM" ) ) + nFormat = FORMAT_SVM; + return nFormat; +} + +static MapUnit GetMapUnit( sal_Int32 nUnit ) +{ + MapUnit aMapUnit( MAP_PIXEL ); + switch( nUnit ) + { + case UNIT_INCH : aMapUnit = MAP_INCH; break; + case UNIT_CM : aMapUnit = MAP_CM; break; + case UNIT_MM : aMapUnit = MAP_MM; break; + case UNIT_POINT : aMapUnit = MAP_POINT; break; + case UNIT_PIXEL : aMapUnit = MAP_PIXEL; break; + } + return aMapUnit; +} + +static basegfx::B2DRange GetShapeRangeForXShape( const uno::Reference< drawing::XShape >& rxShape, + const uno::Reference< graphic::XPrimitiveFactory2D >& rxPrimitiveFactory2D, const uno::Sequence< beans::PropertyValue >& rViewInformation ) +{ + basegfx::B2DRange aShapeRange; + + const uno::Sequence< beans::PropertyValue > aParams; + const uno::Sequence< uno::Reference< graphic::XPrimitive2D > > aPrimitiveSequence( rxPrimitiveFactory2D->createPrimitivesFromXShape( rxShape, aParams ) ); + + const sal_Int32 nCount = aPrimitiveSequence.getLength(); + for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) + { + const geometry::RealRectangle2D aRect( aPrimitiveSequence[ nIndex ]->getRange( rViewInformation ) ); + aShapeRange.expand( basegfx::B2DTuple( aRect.X1, aRect.Y1 ) ); + aShapeRange.expand( basegfx::B2DTuple( aRect.X2, aRect.Y2 ) ); + } + return aShapeRange; +} + +uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpdateConfig ) +{ + if ( bUpdateConfig ) + { + sal_Int32 nUnit = maLbSizeX.GetSelectEntryPos(); + if ( nUnit < 0 ) + nUnit = UNIT_CM; + + // updating ui configuration + if ( mbIsPixelFormat ) + { + if ( nUnit > UNIT_MAX_ID ) + nUnit = UNIT_PIXEL; + + sal_Int32 nResolution = maNfResolution.GetValue(); + if ( nResolution < 1 ) + nResolution = 96; + + mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), nUnit ); + mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), nResolution ); + mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), maLbResolution.GetSelectEntryPos() ); + } + else + { + if ( nUnit >= UNIT_PIXEL ) + nUnit = UNIT_CM; + + mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), nUnit ); + } + } + + FilterConfigItem* pFilterOptions; + if ( bUpdateConfig ) + pFilterOptions = mpFilterOptionsItem; + else + { + uno::Sequence< beans::PropertyValue > aFilterData( mpFilterOptionsItem->GetFilterData() ); + pFilterOptions = new FilterConfigItem( &aFilterData ); + } + + const String sLogicalWidth( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ) ); + const String sLogicalHeight( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ) ); + if ( mbIsPixelFormat ) + { + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) ), static_cast< sal_Int32 >( maSize.Width ) ); + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) ), static_cast< sal_Int32 >( maSize.Height ) ); + if ( maResolution.Width && maResolution.Height ) + { + const double f100thmmPerPixelX = 100000.0 / maResolution.Width; + const double f100thmmPerPixelY = 100000.0 / maResolution.Height; + sal_Int32 nLogicalWidth = static_cast< sal_Int32 >( f100thmmPerPixelX * maSize.Width ); + sal_Int32 nLogicalHeight= static_cast< sal_Int32 >( f100thmmPerPixelY * maSize.Height ); + if ( nLogicalWidth && nLogicalHeight ) + { + pFilterOptions->WriteInt32( sLogicalWidth, nLogicalWidth ); + pFilterOptions->WriteInt32( sLogicalHeight, nLogicalHeight ); + } + } + } + else + { + pFilterOptions->WriteInt32( sLogicalWidth, static_cast< sal_Int32 >( maSize.Width ) ); + pFilterOptions->WriteInt32( sLogicalHeight, static_cast< sal_Int32 >( maSize.Height ) ); + } + switch ( mnFormat ) + { + case FORMAT_JPG : + { + sal_Int32 nColor = maLbColorDepth.GetSelectEntryPos(); + if ( nColor == 1 ) + nColor = 0; + else + nColor = 1; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), nColor ); + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) ); + } + break; + + case FORMAT_PNG : + { + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) ); + sal_Int32 nInterlace = 0; + if ( maCbInterlaced.IsChecked() ) + nInterlace++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace ); + } + break; + + case FORMAT_BMP : + { + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), maLbColorDepth.GetSelectEntryPos() + 1 ); + pFilterOptions->WriteBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), maCbRLEEncoding.IsChecked() ); + } + break; + + case FORMAT_GIF : + { + sal_Int32 nValue = 0; + if ( maCbInterlaced.IsChecked() ) + nValue++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nValue ); + + nValue = 0; + if ( maCbSaveTransparency.IsChecked() ) + nValue++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), nValue ); + } + break; + + case FORMAT_PBM : + case FORMAT_PGM : + case FORMAT_PPM : + { + sal_Int32 nFormat = 0; + if ( maRbText.IsChecked() ) + nFormat++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), nFormat ); + } + break; + + case FORMAT_EPS : + { + sal_Int32 nCheck = 0; + if ( maCbEPSPreviewTIFF.IsChecked() ) + nCheck++; + if ( maCbEPSPreviewEPSI.IsChecked() ) + nCheck += 2; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), nCheck ); + + nCheck = 1; + if ( maRbEPSLevel2.IsChecked() ) + nCheck++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), nCheck ); + + nCheck = 1; + if ( maRbEPSColorFormat2.IsChecked() ) + nCheck++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), nCheck ); + + nCheck = 1; + if ( maRbEPSCompressionNone.IsChecked() ) + nCheck++; + pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), nCheck ); + } + break; + } + + uno::Sequence< beans::PropertyValue > aRet( pFilterOptions->GetFilterData() ); + if ( bUpdateConfig == sal_False ) + delete pFilterOptions; + return aRet; +} + +// +awt::Size ExportDialog::GetOriginalSize() +{ + basegfx::B2DRange aShapesRange; + + if ( mxPage.is () ) + { + uno::Reference< beans::XPropertySet > xPagePropSet( mxPage, uno::UNO_QUERY ); + if ( xPagePropSet.is() ) + { + sal_Int32 nWidth = 0; + sal_Int32 nHeight= 0; + com::sun::star::uno::Any aAny; + aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ); + aAny >>= nWidth; + aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ); + aAny >>= nHeight; + aShapesRange = basegfx::B2DRange( 0, 0, nWidth, nHeight ); + } + } + else + { + uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory( + mxMgr->createInstance( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.PrimitiveFactory2D" ) ) ), uno::UNO_QUERY ); + if ( xPrimitiveFactory.is() ) + { + basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() ); + com::sun::star::geometry::AffineMatrix2D aTransformation; + aTransformation.m00 = aViewTransformation.get(0,0); + aTransformation.m01 = aViewTransformation.get(0,1); + aTransformation.m02 = aViewTransformation.get(0,2); + aTransformation.m10 = aViewTransformation.get(1,0); + aTransformation.m11 = aViewTransformation.get(1,1); + aTransformation.m12 = aViewTransformation.get(1,2); + + const rtl::OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) ); + uno::Sequence< beans::PropertyValue > aViewInformation( 1 ); + aViewInformation[ 0 ].Value <<= aTransformation; + aViewInformation[ 0 ].Name = sViewTransformation; + + if ( mxShape.is() ) + aShapesRange = GetShapeRangeForXShape( mxShape, xPrimitiveFactory, aViewInformation ); + else if ( mxShapes.is() ) + { + const sal_Int32 nCount = mxShapes->getCount(); + for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) + { + uno::Reference< drawing::XShape > xShape; + mxShapes->getByIndex( nIndex ) >>= xShape; + aShapesRange.expand( GetShapeRangeForXShape( xShape, xPrimitiveFactory, aViewInformation ) ); + } + } + } + } + return awt::Size( aShapesRange.getWidth(), aShapesRange.getHeight() ); +} + +void ExportDialog::GetGraphicSource() +{ + if ( mxSourceDocument.is() ) + { + uno::Reference< frame::XModel > xModel( mxSourceDocument, uno::UNO_QUERY ); + if ( xModel.is() ) + { + uno::Reference< frame::XController > xController( xModel->getCurrentController() ); + if ( xController.is() ) + { + if ( mbExportSelection ) // check if there is a selection + { + uno::Reference< view::XSelectionSupplier > xSelectionSupplier( xController, uno::UNO_QUERY ); + if ( xSelectionSupplier.is() ) + { + uno::Any aAny( xSelectionSupplier->getSelection() ); + if ( ! ( aAny >>= mxShapes ) ) + aAny >>= mxShape; + } + } + if ( !mxShape.is() && !mxShapes.is() ) + { + uno::Reference< drawing::XDrawView > xDrawView( xController, uno::UNO_QUERY ); + if ( xDrawView.is() ) + { + uno::Reference< drawing::XDrawPage > xCurrentPage( xDrawView->getCurrentPage() ); + if ( xCurrentPage.is() ) + { + mxPage = xCurrentPage; // exporting whole page + } + } + } + } + } + } +} + +sal_Bool ExportDialog::GetGraphicStream() +{ + sal_Bool bRet = sal_False; + + if ( !IsTempExportAvailable() ) + { + delete mpTempStream, mpTempStream = new SvMemoryStream(); + maBitmap = Bitmap(); + return bRet; + } + + sal_Bool bRecreateOutputStream = mpTempStream->Tell() == 0; + + static uno::Sequence< beans::PropertyValue > aOldFilterData; + uno::Sequence< beans::PropertyValue > aNewFilterData( GetFilterData( sal_False ) ); + if ( aOldFilterData != aNewFilterData ) + { + aOldFilterData = aNewFilterData; + bRecreateOutputStream = sal_True; + } + try + { + if ( bRecreateOutputStream ) + { + delete mpTempStream, mpTempStream = new SvMemoryStream(); + maBitmap = Bitmap(); + + uno::Reference < io::XStream > xStream( new utl::OStreamWrapper( *mpTempStream ) ); + uno::Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() ); + + uno::Reference< document::XExporter > xGraphicExporter( + mxMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< document::XFilter > xFilter( xGraphicExporter, uno::UNO_QUERY_THROW ); + + sal_Int32 nProperties = 2; + uno::Sequence< beans::PropertyValue > aFilterData( nProperties ); + + + rtl::OUString sFormat( maExt ); + uno::Sequence< beans::PropertyValue > aDescriptor( 3 ); + aDescriptor[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OutputStream") ); + aDescriptor[0].Value <<= xOutputStream; + aDescriptor[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + aDescriptor[1].Value <<= sFormat; + aDescriptor[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") ); + aDescriptor[2].Value <<= aNewFilterData; + + uno::Reference< lang::XComponent > xSourceDoc; + if ( mxPage.is() ) + xSourceDoc = uno::Reference< lang::XComponent >( mxPage, uno::UNO_QUERY_THROW ); + else if ( mxShapes.is() ) + xSourceDoc = uno::Reference< lang::XComponent >( mxShapes, uno::UNO_QUERY_THROW ); + else if ( mxShape.is() ) + xSourceDoc = uno::Reference< lang::XComponent >( mxShape, uno::UNO_QUERY_THROW );; + if ( xSourceDoc.is() ) + { + xGraphicExporter->setSourceDocument( xSourceDoc ); + xFilter->filter( aDescriptor ); + bRet = sal_True; + + if ( mnFormat == FORMAT_JPG ) + { + mpTempStream->Seek( STREAM_SEEK_TO_BEGIN ); + maBitmap = GetGraphicBitmap( *mpTempStream ); + mpTempStream->Seek( STREAM_SEEK_TO_END ); + } + } + } + else + bRet = sal_True; + } + catch( uno::Exception& ) + { + + // ups + + } + return bRet; +} + +Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) +{ + Bitmap aRet; + Graphic aGraphic; + GraphicFilter aFilter( sal_False ); + if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, NULL ) == GRFILTER_OK ) + { + aRet = aGraphic.GetBitmap(); + } + return aRet; +} + +sal_uInt32 ExportDialog::GetRawFileSize() const +{ + sal_uInt64 nRawFileSize = 0; + if ( mbIsPixelFormat ) + { + sal_Int32 nBitsPerPixel = 24; + String aEntry( maLbColorDepth.GetSelectEntry() ); + if ( ms1BitTreshold == aEntry ) + nBitsPerPixel = 1; + else if ( ms1BitDithered == aEntry ) + nBitsPerPixel = 1; + else if ( ms4BitGrayscale == aEntry ) + nBitsPerPixel = 4; + else if ( ms4BitColorPalette == aEntry ) + nBitsPerPixel = 8; + else if ( ms8BitGrayscale == aEntry ) + nBitsPerPixel = 8; + else if ( ms8BitColorPalette == aEntry ) + nBitsPerPixel = 8; + else if ( ms24BitColor == aEntry ) + nBitsPerPixel = 24; + + if ( mbIsPixelFormat ) + { + nRawFileSize = ( maSize.Width * nBitsPerPixel + 7 ) &~ 7; // rounding up to 8 bits + nRawFileSize /= 8; // in bytes + nRawFileSize *= maSize.Height; + } + if ( nRawFileSize > SAL_MAX_UINT32 ) + nRawFileSize = 0; + } + return static_cast< sal_uInt32 >( nRawFileSize ); +} + +// checks if the source dimension/resolution is not too big +// to determine the exact graphic output size and preview for jpg +sal_Bool ExportDialog::IsTempExportAvailable() const +{ + return GetRawFileSize() < mnMaxFilesizeForRealtimePreview; +} + +ExportDialog::ExportDialog( FltCallDialogParameter& rPara, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr, + const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument, + sal_Bool bExportSelection, sal_Bool bIsPixelFormat ) : + ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT, *rPara.pResMgr ) ), + mrFltCallPara ( rPara ), + mpMgr ( rPara.pResMgr ), + mxMgr ( rxMgr ), + mxSourceDocument ( rxSourceDocument ), + maFlExportSize ( this, ResId( FL_EXPORT_SIZE, *rPara.pResMgr ) ), + maFtSizeX ( this, ResId( FT_SIZEX, *rPara.pResMgr ) ), + maMfSizeX ( this, ResId( MF_SIZEX, *rPara.pResMgr ) ), + maLbSizeX ( this, ResId( LB_SIZEX, *rPara.pResMgr ) ), + maFtSizeY ( this, ResId( FT_SIZEY, *rPara.pResMgr ) ), + maMfSizeY ( this, ResId( MF_SIZEY, *rPara.pResMgr ) ), + maLbSizeY ( this, ResId( LB_SIZEY, *rPara.pResMgr ) ), + maFtResolution ( this, ResId( FT_RESOLUTION, *rPara.pResMgr ) ), + maNfResolution ( this, ResId( NF_RESOLUTION, *rPara.pResMgr ) ), + maLbResolution ( this, ResId( LB_RESOLUTION, *rPara.pResMgr ) ), + maFlColorDepth ( this, ResId( FL_COLOR_DEPTH, *rPara.pResMgr ) ), + maLbColorDepth ( this, ResId( LB_COLOR_DEPTH, *rPara.pResMgr ) ), + maFlJPGQuality ( this, ResId( FL_JPG_QUALITY, *rPara.pResMgr ) ), + maFlMode ( this, ResId( FL_MODE, *rPara.pResMgr ) ), + maFlPBMOptions ( this, ResId( FL_PBM_OPTIONS, *rPara.pResMgr ) ), + maSbCompression ( this, ResId( SB_COMPRESSION, *rPara.pResMgr ) ), + maNfCompression ( this, ResId( NF_COMPRESSION, *rPara.pResMgr ) ), + maFtJPGMin ( this, ResId( FT_JPG_MIN, *rPara.pResMgr ) ), + maFtJPGMax ( this, ResId( FT_JPG_MAX, *rPara.pResMgr ) ), + maFtPNGMin ( this, ResId( FT_PNG_MIN, *rPara.pResMgr ) ), + maFtPNGMax ( this, ResId( FT_PNG_MAX, *rPara.pResMgr ) ), + maCbJPGPreview ( this, ResId( CB_JPG_PREVIEW, *rPara.pResMgr ) ), + maCbInterlaced ( this, ResId( CB_INTERLACED, *rPara.pResMgr ) ), + maCbRLEEncoding ( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ), + maFlGIFDrawingObjects ( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ), + maCbSaveTransparency ( this, ResId( CB_SAVE_TRANSPARENCY, *rPara.pResMgr ) ), + maFlEPSPreview ( this, ResId( FL_EPS_PREVIEW, *rPara.pResMgr ) ), + maCbEPSPreviewTIFF ( this, ResId( CB_EPS_PREVIEW_TIFF, *rPara.pResMgr ) ), + maCbEPSPreviewEPSI ( this, ResId( CB_EPS_PREVIEW_EPSI, *rPara.pResMgr ) ), + maFlEPSVersion ( this, ResId( FL_EPS_VERSION, *rPara.pResMgr ) ), + maRbEPSLevel1 ( this, ResId( RB_EPS_LEVEL1, *rPara.pResMgr ) ), + maRbEPSLevel2 ( this, ResId( RB_EPS_LEVEL2, *rPara.pResMgr ) ), + maFlEPSColorFormat ( this, ResId( FL_EPS_COLOR_FORMAT, *rPara.pResMgr ) ), + maRbEPSColorFormat1 ( this, ResId( RB_EPS_COLOR_FORMAT1, *rPara.pResMgr ) ), + maRbEPSColorFormat2 ( this, ResId( RB_EPS_COLOR_FORMAT2, *rPara.pResMgr ) ), + maFlCompression ( this, ResId( FL_COMPRESSION, *rPara.pResMgr ) ), + maRbEPSCompressionLZW ( this, ResId( RB_EPS_COMPRESSION_LZW, *rPara.pResMgr ) ), + maRbEPSCompressionNone ( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ), + maRbBinary ( this, ResId( RB_BINARY, *rPara.pResMgr ) ), + maRbText ( this, ResId( RB_TEXT, *rPara.pResMgr ) ), + maFlEstimatedSize ( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ), + maFtEstimatedSize ( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ), + msEstimatedSizePix1 ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ) ), + msEstimatedSizePix2 ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ) ), + msEstimatedSizeVec ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ) ), + maFlButtons ( this, ResId( FL_BUTTONS, *rPara.pResMgr ) ), + maFbJPGPreview ( this, ResId( FB_JPG_PREVIEW, *rPara.pResMgr ) ), + maSbZoom ( this, ResId( SB_ZOOM, *rPara.pResMgr ) ), + maNfZoom ( this, ResId( NF_ZOOM, *rPara.pResMgr ) ), + maSbJPGPreviewHorz ( this, ResId( SB_JPG_PREVIEW_HORZ, *rPara.pResMgr ) ), + maSbJPGPreviewVert ( this, ResId( SB_JPG_PREVIEW_VERT, *rPara.pResMgr ) ), + maBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), + maBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), + maBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), + ms1BitTreshold ( ResId( STR_1BIT_THRESHOLD, *rPara.pResMgr ) ), + ms1BitDithered ( ResId( STR_1BIT_DITHERED, *rPara.pResMgr ) ), + ms4BitGrayscale ( ResId( STR_4BIT_GRAYSCALE, *rPara.pResMgr ) ), + ms4BitColorPalette ( ResId( STR_4BIT_COLOR_PALETTE, *rPara.pResMgr ) ), + ms8BitGrayscale ( ResId( STR_8BIT_GRAYSCALE, *rPara.pResMgr ) ), + ms8BitColorPalette ( ResId( STR_8BIT_COLOR_PALETTE, *rPara.pResMgr ) ), + ms24BitColor ( ResId( STR_24BIT_TRUE_COLOR, *rPara.pResMgr ) ), + maExt ( rPara.aFilterExt ), + mnFormat ( FORMAT_UNKNOWN ), + mnMaxFilesizeForRealtimePreview( 0 ), + mpTempStream ( new SvMemoryStream() ), + maOriginalSize ( awt::Size( 0, 0 ) ), + mbPreview ( sal_False ), + mbIsPixelFormat ( bIsPixelFormat ), + mbExportSelection ( bExportSelection ), + mbPreserveAspectRatio ( sal_True ) +{ + GetGraphicSource(); + + maExt.ToUpperAscii(); + + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + mpOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); + aFilterConfigPath.Append( maExt ); + mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); + + mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxFilesizeForRealtimePreview" ) ), 0 ); + + String aTitle( maExt ); + aTitle += String( ResId( DLG_EXPORT_TITLE, *mpMgr ) ); + SetText( aTitle ); + + mnFormat = GetFilterFormat( maExt ); + + Size aResolution( Application::GetDefaultDevice()->LogicToPixel( Size( 100, 100 ), MAP_CM ) ); + maResolution.Width = aResolution.Width(); + maResolution.Height= aResolution.Height(); + maOriginalSize = GetOriginalSize(); + if ( bIsPixelFormat ) + { + double fPixelsPer100thmm = static_cast< double >( maResolution.Width ) / 100000.0; + maSize = awt::Size( static_cast< sal_Int32 >( ( fPixelsPer100thmm * maOriginalSize.Width ) + 0.5 ), + static_cast< sal_Int32 >( ( fPixelsPer100thmm * maOriginalSize.Height ) + 0.5 ) ); + } + else + { + maSize = maOriginalSize; + } + + // Size + maLbSizeX.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maSbCompression.SetScrollHdl( LINK( this, ExportDialog, SbCompressionUpdateHdl ) ); + maNfCompression.SetModifyHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maMfSizeX.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeX ) ); + maMfSizeY.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeY ) ); + + maNfResolution.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlNfResolution ) ); + maLbResolution.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maLbColorDepth.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maCbInterlaced.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maCbSaveTransparency.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maCbEPSPreviewTIFF.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maCbEPSPreviewEPSI.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maRbEPSCompressionLZW.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maRbEPSCompressionNone.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maRbBinary.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maRbText.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + + // JPG Preview +// maCbJPGPreview.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); +maCbJPGPreview.Enable( sal_False ); + + maSbJPGPreviewVert.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maSbJPGPreviewHorz.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maSbZoom.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + // BMP + maCbRLEEncoding.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + // EPS + maRbEPSLevel1.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + maRbEPSLevel2.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + + maBtnOK.SetClickHdl( LINK( this, ExportDialog, OK ) ); + + setupLayout(); + updateControls(); + + FreeResource(); +} + +void ExportDialog::createSizeControls( vcl::RowOrColumn& rLayout ) +{ + size_t nIndex; + Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + long nIndent = aBorder.Width(); + + // Size controls + rLayout.addWindow( &maFlExportSize ); + + Size aLbMax( maLbSizeX.GetSizePixel() ); + aLbMax.Width() = Max( aLbMax.Width(), maLbResolution.GetSizePixel().Width() ); + + boost::shared_ptr< vcl::LabelColumn > xSizeColumns( new vcl::LabelColumn( &rLayout ) ); + rLayout.addChild( xSizeColumns ); + + // row 1 + boost::shared_ptr< vcl::RowOrColumn > xColumn( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); + xSizeColumns->addRow( &maFtSizeX, xColumn, nIndent ); + Size aMinSize( maMfSizeX.GetSizePixel() ); + nIndex = xColumn->addWindow( &maMfSizeX ); + xColumn->setMinimumSize( nIndex, aMinSize ); + nIndex = xColumn->addWindow( &maLbSizeX ); + xColumn->setMinimumSize( nIndex, aLbMax ); + + // row 2 + xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); + xSizeColumns->addRow( &maFtSizeY, xColumn, nIndent ); + nIndex = xColumn->addWindow( &maMfSizeY ); + xColumn->setMinimumSize( nIndex, aMinSize ); + nIndex = xColumn->addWindow( &maLbSizeY ); + xColumn->setMinimumSize( nIndex, aLbMax ); + + // row 3 + if ( mbIsPixelFormat ) // TODO: (metafileresolutionsupport) + { + xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); + xSizeColumns->addRow( &maFtResolution, xColumn, nIndent ); + nIndex = xColumn->addWindow( &maNfResolution ); + xColumn->setMinimumSize( nIndex, aMinSize ); + nIndex = xColumn->addWindow( &maLbResolution ); + xColumn->setMinimumSize( nIndex, aLbMax ); + } + + sal_Int32 nUnit = mbIsPixelFormat + ? mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), UNIT_PIXEL ) + : mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), UNIT_CM ); + if ( !mbIsPixelFormat ) + { + maLbSizeX.RemoveEntry( UNIT_PIXEL ); // removing pixel + if ( nUnit >= UNIT_PIXEL ) + nUnit = UNIT_CM; + } + else if ( nUnit > UNIT_MAX_ID ) + nUnit = UNIT_PIXEL; + if ( nUnit < 0 ) + nUnit = UNIT_CM; + maLbSizeX.SelectEntryPos( static_cast< USHORT >( nUnit ) ); + + if ( mbIsPixelFormat ) // TODO: (metafileresolutionsupport) should be supported for vector formats also... this makes + { // sense eg for bitmap fillings in metafiles, to preserve high dpi output + // (atm without special vector support the bitmaps are rendered with 96dpi) + sal_Int32 nResolution = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), 96 ); + if ( nResolution < 1 ) + nResolution = 96; + maNfResolution.SetValue( nResolution ); + + sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), 1 ); + if ( ( nResolutionUnit < 0 ) || ( nResolutionUnit > 2 ) ) + nResolutionUnit = 1; + maLbResolution.SelectEntryPos( static_cast< USHORT >( nResolutionUnit ) ); + } + + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); +} + +void ExportDialog::createColorDepthControls( vcl::RowOrColumn& rLayout ) +{ + // Color Depth + Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + long nIndent = aBorder.Width(); + + boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) ); + rLayout.addChild( xRow ); + xRow->addWindow( &maFlColorDepth ); + + xRow = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, false ) ); + rLayout.addChild( xRow ); + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + xRow->addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maLbColorDepth ); + + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); +} + +void ExportDialog::createScrollBar( vcl::RowOrColumn& rLayout ) +{ + boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) ); + rLayout.addChild( xRow ); + + Size aMinSize( maSbCompression.GetSizePixel() ); + size_t nIndex = xRow->addWindow( &maSbCompression ); + xRow->setMinimumSize( nIndex, aMinSize ); + aMinSize = maNfCompression.GetSizePixel(); + nIndex = xRow->addWindow( &maNfCompression ); + xRow->setMinimumSize( nIndex, aMinSize ); +} + +void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout ) +{ + Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + long nIndent = aBorder.Width(); + + switch( mnFormat ) + { + case FORMAT_JPG : + { + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), 0 ); + if ( nColor == 1 ) + nColor = 0; + else + nColor = 1; + maLbColorDepth.InsertEntry( ms8BitGrayscale ); + maLbColorDepth.InsertEntry( ms24BitColor ); + maLbColorDepth.SelectEntryPos( nColor ); + createColorDepthControls( maLayout ); + + rLayout.addWindow( &maFlJPGQuality ); + + // Quality + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + createScrollBar( *xRows.get() ); + xRows->addWindow( &maFtJPGMin ); + xRows->addWindow( &maFtJPGMax ); + if ( maCbJPGPreview.IsEnabled() ) + xRows->addWindow( &maCbJPGPreview ); + + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 75 ); + if ( ( nQuality < 1 ) || ( nQuality > 100 ) ) + nQuality = 75; + + maSbCompression.SetRangeMin( 1 ); + maSbCompression.SetRangeMax( 100 ); + maNfCompression.SetMin( 1 ); + maNfCompression.SetMax( 100 ); + maNfCompression.SetValue( nQuality ); + maNfCompression.SetStrictFormat( sal_True ); + if ( maCbJPGPreview.IsEnabled() ) + maCbJPGPreview.Check( sal_False ); + } + break; + case FORMAT_PNG : + { + rLayout.addWindow( &maFlCompression ); + + // Compression 1..9 + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + createScrollBar( *xRows.get() ); + xRows->addWindow( &maFtPNGMin ); + xRows->addWindow( &maFtPNGMax ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + // Interlaced + rLayout.addWindow( &maFlMode ); + xIndenter.reset( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + xRows.reset( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maCbInterlaced ); + + xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); + if ( ( nCompression < 1 ) || ( nCompression > 9 ) ) + nCompression = 6; + maSbCompression.SetRangeMin( 1 ); + maSbCompression.SetRangeMax( 9 ); + maNfCompression.SetMin( 1 ); + maNfCompression.SetMax( 9 ); + maNfCompression.SetValue( 9 ); + maNfCompression.SetStrictFormat( sal_True ); + + maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ) != 0 ); + } + break; + case FORMAT_BMP : + { + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), 0 ); + if ( nColor == 0 ) + nColor = 6; + else + nColor--; + maLbColorDepth.InsertEntry( ms1BitTreshold ); + maLbColorDepth.InsertEntry( ms1BitDithered ); + maLbColorDepth.InsertEntry( ms4BitGrayscale ); + maLbColorDepth.InsertEntry( ms4BitColorPalette ); + maLbColorDepth.InsertEntry( ms8BitGrayscale ); + maLbColorDepth.InsertEntry( ms8BitColorPalette ); + maLbColorDepth.InsertEntry( ms24BitColor ); + maLbColorDepth.SelectEntryPos( nColor ); + createColorDepthControls( maLayout ); + + rLayout.addWindow( &maFlCompression ); + // RLE coding + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maCbRLEEncoding ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + maCbRLEEncoding.Check( mpFilterOptionsItem->ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), sal_True ) ); + } + break; + case FORMAT_GIF : + { + rLayout.addWindow( &maFlMode ); + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maCbInterlaced ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + rLayout.addWindow( &maFlGIFDrawingObjects ); + xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maCbSaveTransparency ); + xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 1 ) != 0 ); + maCbSaveTransparency.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), 1 ) != 0 ); + } + break; + case FORMAT_PBM : + case FORMAT_PGM : + case FORMAT_PPM : + { + rLayout.addWindow( &maFlJPGQuality ); + + // RB Binary / Text + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); + rLayout.addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maRbBinary ); + xRows->addWindow( &maRbText ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 1 ); + maRbBinary.Check( nFormat == 0 ); + maRbText.Check( nFormat != 0 ); + } + break; + case FORMAT_EPS : + { + boost::shared_ptr< vcl::RowOrColumn > xColumns( new vcl::RowOrColumn( &rLayout, false ) ); + rLayout.addChild( xColumns ); + boost::shared_ptr< vcl::RowOrColumn > xLeft( new vcl::RowOrColumn( &rLayout, true ) ); + xColumns->addChild( xLeft ); + + xLeft->addWindow( &maFlEPSPreview ); + boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( xLeft.get(), nIndent ) ); + xLeft->addChild( xIndenter ); + boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( xLeft.get(), true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maCbEPSPreviewTIFF ); + xRows->addWindow( &maCbEPSPreviewEPSI ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( xLeft.get(), 2 ) ); + xLeft->addChild( xSpacer ); + + xLeft->addWindow( &maFlEPSVersion ); + xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xLeft.get(), nIndent ) ); + xLeft->addChild( xIndenter ); + xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xLeft.get(), true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maRbEPSLevel1 ); + xRows->addWindow( &maRbEPSLevel2 ); + xSpacer.reset( new vcl::Spacer( xLeft.get(), 2 ) ); + xLeft->addChild( xSpacer ); + + boost::shared_ptr< vcl::RowOrColumn > xRight( new vcl::RowOrColumn( &rLayout, true ) ); + xColumns->addChild( xRight ); + + xRight->addWindow( &maFlEPSColorFormat ); + xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) ); + xRight->addChild( xIndenter ); + xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maRbEPSColorFormat1 ); + xRows->addWindow( &maRbEPSColorFormat2 ); + xSpacer.reset( new vcl::Spacer( xRight.get(), 2 ) ); + xRight->addChild( xSpacer ); + + xRight->addWindow( &maFlCompression ); + xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) ); + xRight->addChild( xIndenter ); + xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) ); + xIndenter->setChild( xRows ); + xRows->addWindow( &maRbEPSCompressionLZW ); + xRows->addWindow( &maRbEPSCompressionNone ); + + xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), 0 ); + sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 2 ); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), 0 ); + sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), 2 ); + + mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) ), 0 ); + + maCbEPSPreviewTIFF.Check( ( nPreview & 1 ) != 0 ); + maCbEPSPreviewEPSI.Check( ( nPreview & 2 ) != 0 ); + + maRbEPSLevel1.Check( nVersion == 1 ); + maRbEPSLevel2.Check( nVersion == 2 ); + + maRbEPSColorFormat1.Check( nColor == 1 ); + maRbEPSColorFormat2.Check( nColor != 1 ); + + maRbEPSCompressionLZW.Check( nCompr == 1 ); + maRbEPSCompressionNone.Check( nCompr != 1 ); + } + break; + } +} + +void ExportDialog::createButtons( vcl::RowOrColumn& rLayout ) +{ + rLayout.addWindow( &maFlButtons ); + boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); + rLayout.addChild( xSpacer ); + + Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + + boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &rLayout, false ) ); + size_t nIndex = rLayout.addChild( xButtons ); + rLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() ); + + Size aMinSize( maBtnCancel.GetSizePixel() ); + // insert help button + xButtons->setMinimumSize( xButtons->addWindow( &maBtnHelp ), aMinSize ); + + // insert a spacer, cancel and OK buttons are right aligned + + xSpacer.reset( new vcl::Spacer( xButtons.get(), 2 ) ); + xButtons->addChild( xSpacer ); + xButtons->setMinimumSize( xButtons->addWindow( &maBtnOK ), aMinSize ); + xButtons->setMinimumSize( xButtons->addWindow( &maBtnCancel ), aMinSize ); +} + +void ExportDialog::setupLayout() +{ + Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + maLayout.setParentWindow( this ); + maLayout.setOuterBorder( aBorder.Width() ); + + createSizeControls( maLayout ); + createFilterOptions( maLayout ); + + if ( mnMaxFilesizeForRealtimePreview || mbIsPixelFormat ) + { + maLayout.addWindow( &maFlEstimatedSize ); + maLayout.addWindow( &maFtEstimatedSize ); + } + createButtons( maLayout ); + + maLayout.show(); + maDialogSize = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ); + maLayout.setManagedArea( Rectangle( Point(), maDialogSize ) ); + SetOutputSizePixel( Size( mbPreview ? maDialogSize.Width() * 2 : maDialogSize.Width(), maDialogSize.Height() ) ); + + maRectFlButtons = Rectangle( maFlButtons.GetPosPixel(), maFlButtons.GetSizePixel() ); + maRectBtnHelp = Rectangle( maBtnHelp.GetPosPixel(), maBtnHelp.GetSizePixel() ); + maRectBtnOK = Rectangle( maBtnOK.GetPosPixel(), maBtnOK.GetSizePixel() ); + maRectBtnCancel = Rectangle( maBtnCancel.GetPosPixel(), maBtnOK.GetSizePixel() ); + + maLbSizeY.Hide(); +} + +static rtl::OUString ImpValueOfInKB( const sal_Int64& rVal ) +{ + double fVal( static_cast( rVal ) ); + fVal /= ( 1 << 10 ); + fVal += 0.05; + rtl::OUStringBuffer aVal( rtl::OUString::valueOf( fVal ) ); + sal_Int32 nX( rtl::OUString( aVal.getStr() ).indexOf( '.', 0 ) ); + if ( nX > 0 ) + aVal.setLength( nX + 2 ); + return aVal.makeStringAndClear(); +} + +sal_Int32 static GetZoomValueFromThumbPos( sal_Int32 nThumbPos ) +{ + sal_Int32 nProz = 0; + if ( nThumbPos <= 50 ) + nProz = nThumbPos * 2; // so a range of 50 represents 100% + else + nProz = ( ( nThumbPos - 50 ) * 60 ) + 100; // we want to scale up to 3000% + return nProz; +} + +void ExportDialog::updatePreview() +{ + // JPG +// maCbJPGPreview.Enable( IsTempExportAvailable() ); + +// if ( maCbJPGPreview.IsEnabled() && maCbJPGPreview.IsChecked() ) + if ( mbPreview ) + { + long nScrollBarSize = Application::GetSettings().GetStyleSettings().GetScrollBarSize(); + + Point aPreviewPos( maDialogSize.Width(), 0 ); + Size aPreviewSize( maDialogSize.Width(), maFlButtons.GetPosPixel().Y() ); + + Point aFixedBitmapPos( aPreviewPos ); + Size aFixedBitmapSize( aPreviewSize ); + + maSbZoom.Show( sal_False ); + maSbZoom.SetPosPixel( Point( aPreviewPos.X(), aPreviewPos.Y() ) ); + maSbZoom.SetSizePixel( Size( aPreviewSize.Width() / 4, nScrollBarSize ) ); + maNfZoom.Show( sal_False ); + maNfZoom.SetPosPixel( Point( aPreviewPos.X() + aPreviewSize.Width() / 4, aPreviewPos.Y() ) ); + maNfZoom.SetSizePixel( Size( aPreviewSize.Width() / 6, nScrollBarSize ) ); + maNfZoom.SetValue( GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() ) ); + maFbJPGPreview.Show( sal_True ); + + sal_Int32 nZoom = GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() ); + double fSizePixelX = static_cast< double >( maSize.Width * nZoom ) / 100.0; + double fSizePixelY = static_cast< double >( maSize.Height * nZoom ) / 100.0; + + double fXRatio = fSizePixelX / maSize.Width; // the size of each pixel + double fYRatio = fSizePixelY / maSize.Height; + + sal_Bool bHorzSb = fSizePixelX > aFixedBitmapSize.Width(); + sal_Bool bVertSb = fSizePixelY > aFixedBitmapSize.Height(); + if ( bHorzSb ) + { + aFixedBitmapSize.Height() -= nScrollBarSize; + + maSbJPGPreviewHorz.Show( sal_True ); + maSbJPGPreviewHorz.SetPosPixel( Point( aFixedBitmapPos.X(), aFixedBitmapPos.Y() + aFixedBitmapSize.Height() ) ); + maSbJPGPreviewHorz.SetSizePixel( Size( aFixedBitmapSize.Width(), nScrollBarSize ) ); + } + else + { + maSbJPGPreviewHorz.Show( sal_False ); + } + + + if ( bVertSb ) + { + aFixedBitmapSize.Width() -= nScrollBarSize; + + maSbJPGPreviewVert.Show( sal_True ); + maSbJPGPreviewVert.SetPosPixel( Point( aFixedBitmapPos.X() + aFixedBitmapSize.Width(), aFixedBitmapPos.Y() ) ); + maSbJPGPreviewVert.SetSizePixel( Size( nScrollBarSize, aFixedBitmapSize.Height() ) ); + } + else + { + maSbJPGPreviewVert.Show( sal_False ); + } + + Point aPos( 0, 0 ); + Size aSize; + if ( fXRatio > 1.0 ) + { + aSize.Width() = Max( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() /= fXRatio; + } + else + { + aSize.Width() = Min( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() /= fXRatio; + } + + if ( fYRatio > 1.0 ) + { + aSize.Height() = Max( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() /= fYRatio; + } + else + { + aSize.Height() = Min( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() /= fYRatio; + } + + if ( aSize.Width() < maSize.Width ) + { + sal_Int32 nXDiff = static_cast< sal_Int32 >( ( ( ( maSize.Width - aSize.Width() ) * maSbJPGPreviewHorz.GetThumbPos() ) / 100.0 ) ); + aPos.X() += nXDiff; + } + if ( aSize.Height() < maSize.Height ) + { + sal_Int32 nYDiff = static_cast< sal_Int32 >( ( ( ( maSize.Height - aSize.Height() ) * maSbJPGPreviewVert.GetThumbPos() ) / 100.0 ) ); + aPos.Y() += nYDiff; + } + + Bitmap aCroppedBitmap( maBitmap ); + aCroppedBitmap.Crop( Rectangle( aPos, aSize ) ); + aSize = aCroppedBitmap.GetSizePixel(); + aSize = Size( aSize.Width() * fXRatio, aSize.Height() * fYRatio ); + aCroppedBitmap.Scale( aSize ); + + if ( aSize.Width() > aFixedBitmapSize.Width() ) + aSize.Width() = aFixedBitmapSize.Width(); + if ( aSize.Height() > aFixedBitmapSize.Height() ) + aSize.Height() = aFixedBitmapSize.Height(); + Point aPoint( aFixedBitmapPos ); + if ( aSize.Width() < aFixedBitmapSize.Width() ) + aPoint.X() += ( aFixedBitmapSize.Width() - aSize.Width() ) / 2; + if ( aSize.Height() < aFixedBitmapSize.Height() ) + aPoint.Y() += ( aFixedBitmapSize.Height() - aSize.Height() ) / 2; + + maFbJPGPreview.SetPosPixel( aPoint ); + maFbJPGPreview.SetSizePixel( aSize ); + maFbJPGPreview.SetBitmap( aCroppedBitmap ); + + SetOutputSizePixel( Size( maDialogSize.Width() * 2, maDialogSize.Height() ) ); + + maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth() * 2, maRectFlButtons.GetHeight() ) ); + maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left() + maDialogSize.Width(), maRectBtnHelp.Top() ) ); + maBtnOK.SetPosPixel( Point( maRectBtnOK.Left() + maDialogSize.Width(), maRectBtnOK.Top() ) ); + maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left() + maDialogSize.Width(), maRectBtnCancel.Top() ) ); + } + else + { + maSbZoom.Show( sal_False ); + maNfZoom.Show( sal_False ); + maFbJPGPreview.Show( sal_False ); + maSbJPGPreviewHorz.Show( sal_False ); + maSbJPGPreviewVert.Show( sal_False ); + + SetOutputSizePixel( maDialogSize ); + + maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth(), maRectFlButtons.GetHeight() ) ); + maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left(), maRectBtnHelp.Top() ) ); + maBtnOK.SetPosPixel( Point( maRectBtnOK.Left(), maRectBtnOK.Top() ) ); + maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left(), maRectBtnCancel.Top() ) ); + } +} + +void ExportDialog::updateControls() +{ + GetGraphicStream(); + + // Size Controls + if ( !mbIsPixelFormat ) + { + awt::Size aSize100thmm( maSize ); + Size aSize( LogicToLogic( Size( aSize100thmm.Width * 100, aSize100thmm.Height * 100 ), MAP_100TH_MM, + MapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) ) ); + maMfSizeX.SetValue( aSize.Width() ); + maMfSizeY.SetValue( aSize.Height() ); + } + else + { + MapUnit aMapUnit( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ); + if ( aMapUnit == MAP_PIXEL ) + { // calculating pixel count via resolution and original graphic size + maMfSizeX.SetDecimalDigits( 0 ); + maMfSizeY.SetDecimalDigits( 0 ); + maMfSizeX.SetValue( maSize.Width ); + maMfSizeY.SetValue( maSize.Height ); + } + else + { + maMfSizeX.SetDecimalDigits( 2 ); + maMfSizeY.SetDecimalDigits( 2 ); + double fRatio; + switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + { + case MAP_INCH : fRatio = static_cast< double >( maResolution.Width ) * 0.0254; break; + case MAP_MM : fRatio = static_cast< double >( maResolution.Width ) * 0.001; break; + case MAP_POINT :fRatio = ( static_cast< double >( maResolution.Width ) * 0.0254 ) / 72.0; break; + default: + case MAP_CM : fRatio = static_cast< double >( maResolution.Width ) * 0.01; break; + } + maMfSizeX.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Width * 100 ) / fRatio ) + 0.5 ) ); + maMfSizeY.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Height * 100 ) / fRatio ) + 0.5 ) ); + } + } + sal_Int32 nResolution = 0; + switch( maLbResolution.GetSelectEntryPos() ) + { + case 0 : nResolution = maResolution.Width / 100; break; // pixels / cm + case 2 : nResolution = maResolution.Width; break; // pixels / meter + default: + case 1 : nResolution = maResolution.Width * 0.0254; break; // pixels / inch + } + maNfResolution.SetValue( nResolution ); + + if ( maSbCompression.IsVisible() ) + maSbCompression.SetThumbPos( maNfCompression.GetValue() ); + + // updating estimated size + sal_Int64 nRealFileSize( mpTempStream->Tell() ); + if ( mbIsPixelFormat ) + { + String aEst( nRealFileSize ? msEstimatedSizePix2 : msEstimatedSizePix1 ); + sal_Int64 nRawFileSize( GetRawFileSize() ); + xub_StrLen nInd = aEst.Search( '%' ); + aEst.Replace( nInd, 2, ImpValueOfInKB( nRawFileSize ) ); + + if ( nRealFileSize ) + { + nInd = aEst.Search( '%', nInd ); + aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); + } + maFtEstimatedSize.SetText( aEst ); + } + else + { + if ( mnMaxFilesizeForRealtimePreview ) + { + String aEst( msEstimatedSizeVec ); + xub_StrLen nInd = aEst.Search( '%', 0 ); + aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); + maFtEstimatedSize.SetText( aEst ); + } + } + updatePreview(); + + // EPS + if ( maRbEPSLevel1.IsVisible() ) + { + sal_Bool bEnabled = maRbEPSLevel1.IsChecked() == sal_False; + maRbEPSColorFormat1.Enable( bEnabled ); + maRbEPSColorFormat2.Enable( bEnabled ); + maRbEPSCompressionLZW.Enable( bEnabled ); + maRbEPSCompressionNone.Enable( bEnabled ); + } +} + +ExportDialog::~ExportDialog() +{ + delete mpFilterOptionsItem; + delete mpOptionsItem; +} + + +/************************************************************************* +|* +|* Speichert eingestellte Werte in ini-Datei +|* +\************************************************************************/ +IMPL_LINK( ExportDialog, UpdateHdl, void *, EMPTYARG ) +{ + updateControls(); + return 0; +} + +IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG ) +{ + double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width; + + if ( mbIsPixelFormat ) + { + switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + { + case MAP_INCH : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; + case MAP_CM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; + case MAP_MM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; + case MAP_POINT : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 * 72 + 0.5 ); break; + case MAP_PIXEL : maSize.Width = maMfSizeX.GetValue(); break; + } + maSize.Height = static_cast< sal_Int32 >( fRatio * maSize.Width + 0.5 ); + } + else + { + Fraction aFract( 1, 100 ); + sal_Int32 nWidth = maMfSizeX.GetValue(); + sal_Int32 nHeight= static_cast< sal_Int32 >( nWidth * fRatio ); + const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) ); + MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract ); + Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); + + maSize.Width = aDest.Width(); + if ( mbPreserveAspectRatio ) + maSize.Height = aDest.Height(); + } + updateControls(); + return 0; +} + +IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG ) +{ + double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height; + + if ( mbIsPixelFormat ) + { + switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + { + case MAP_INCH : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; + case MAP_CM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; + case MAP_MM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; + case MAP_POINT : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 * 72 + 0.5 ); break; + case MAP_PIXEL : maSize.Height = maMfSizeY.GetValue(); break; + } + maSize.Width = static_cast< sal_Int32 >( fRatio * maSize.Height + 0.5 ); + } + else + { + Fraction aFract( 1, 100 ); + sal_Int32 nHeight= maMfSizeY.GetValue(); + sal_Int32 nWidth = static_cast< sal_Int32 >( nHeight * fRatio ); + const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) ); + MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract ); + Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); + + maSize.Height = aDest.Height(); + if ( mbPreserveAspectRatio ) + maSize.Width = aDest.Width(); + } + updateControls(); + return 0; +} + +IMPL_LINK( ExportDialog, UpdateHdlNfResolution, void *, EMPTYARG ) +{ + sal_Int32 nResolution = maNfResolution.GetValue(); + if ( maLbResolution.GetSelectEntryPos() == 0 ) // pixels / cm + nResolution *= 100; + else if ( maLbResolution.GetSelectEntryPos() == 1 ) // pixels / inch + nResolution = static_cast< sal_Int32 >( ( ( static_cast< double >( nResolution ) + 0.5 ) / 0.0254 ) ); + maResolution.Width = nResolution; + maResolution.Height= nResolution; + + updateControls(); + return 0; +} + +IMPL_LINK( ExportDialog, SbCompressionUpdateHdl, void *, EMPTYARG ) +{ + maNfCompression.SetValue( maSbCompression.GetThumbPos() ); + updateControls(); + return 0; +} + +IMPL_LINK( ExportDialog, OK, void *, EMPTYARG ) +{ + // writing config parameter + + + mrFltCallPara.aFilterData = GetFilterData( sal_True ); + EndDialog( RET_OK ); + + return 0; +} + diff --git a/svtools/source/filter.vcl/filter/exportdialog.hrc b/svtools/source/filter.vcl/filter/exportdialog.hrc new file mode 100755 index 000000000000..df18684dd333 --- /dev/null +++ b/svtools/source/filter.vcl/filter/exportdialog.hrc @@ -0,0 +1,99 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#include + +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 + +#define FL_EXPORT_SIZE 1 +#define FL_COLOR_DEPTH 2 +#define FL_JPG_QUALITY 3 +#define FL_COMPRESSION 4 +#define FL_MODE 5 +#define FL_GIF_DRAWING_OBJECTS 6 +#define FL_PBM_OPTIONS 7 +#define FL_EPS_PREVIEW 8 +#define FL_EPS_VERSION 9 +#define FL_EPS_COLOR_FORMAT 10 +#define FL_ESTIMATED_SIZE 11 +#define FL_BUTTONS 12 + +#define FT_SIZEX 1 +#define FT_SIZEY 2 +#define FT_RESOLUTION 3 +#define FT_JPG_MIN 4 +#define FT_JPG_MAX 5 +#define FT_PNG_MIN 6 +#define FT_PNG_MAX 7 +#define FT_ESTIMATED_SIZE 8 + +#define NF_RESOLUTION 1 +#define NF_COMPRESSION 2 +#define NF_ZOOM 3 + +#define MF_SIZEX 1 +#define MF_SIZEY 2 + +#define LB_SIZEX 1 +#define LB_SIZEY 2 +#define LB_RESOLUTION 3 +#define LB_COLOR_DEPTH 4 + +#define RB_BINARY 1 +#define RB_TEXT 2 +#define RB_EPS_LEVEL1 3 +#define RB_EPS_LEVEL2 4 +#define RB_EPS_COLOR_FORMAT1 5 +#define RB_EPS_COLOR_FORMAT2 6 +#define RB_EPS_COMPRESSION_LZW 7 +#define RB_EPS_COMPRESSION_NONE 8 + +#define CB_JPG_PREVIEW 1 +#define CB_INTERLACED 2 +#define CB_RLE_ENCODING 3 +#define CB_SAVE_TRANSPARENCY 4 +#define CB_EPS_PREVIEW_TIFF 5 +#define CB_EPS_PREVIEW_EPSI 6 + +#define FB_JPG_PREVIEW 1 + +#define SB_COMPRESSION 1 +#define SB_JPG_PREVIEW_HORZ 2 +#define SB_JPG_PREVIEW_VERT 3 +#define SB_ZOOM 4 + +#define STR_1BIT_THRESHOLD 1 +#define STR_1BIT_DITHERED 2 +#define STR_4BIT_GRAYSCALE 3 +#define STR_4BIT_COLOR_PALETTE 4 +#define STR_8BIT_GRAYSCALE 5 +#define STR_8BIT_COLOR_PALETTE 6 +#define STR_24BIT_TRUE_COLOR 7 +#define STR_ESTIMATED_SIZE_PIX_1 8 +#define STR_ESTIMATED_SIZE_PIX_2 9 +#define STR_ESTIMATED_SIZE_VEC 10 diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter.vcl/filter/exportdialog.hxx new file mode 100755 index 000000000000..564b1111c647 --- /dev/null +++ b/svtools/source/filter.vcl/filter/exportdialog.hxx @@ -0,0 +1,211 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + +#ifndef _EXPORTDIALOG_HXX_ +#define _EXPORTDIALOG_HXX_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/************************************************************************* +|* +|* Dialog zum Einstellen von Filteroptionen bei Pixelformaten +|* +\************************************************************************/ + +class FilterConfigItem; +class ExportDialog : public ModalDialog +{ +private: + + FltCallDialogParameter& + mrFltCallPara; + + ResMgr* mpMgr; + + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + mxMgr; + const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& + mxSourceDocument; + + FixedLine maFlExportSize; + FixedText maFtSizeX; + MetricField maMfSizeX; + ListBox maLbSizeX; + FixedText maFtSizeY; + MetricField maMfSizeY; + ListBox maLbSizeY; + FixedText maFtResolution; + NumericField maNfResolution; + ListBox maLbResolution; + FixedLine maFlColorDepth; + ListBox maLbColorDepth; + FixedLine maFlJPGQuality; + FixedLine maFlMode; + FixedLine maFlPBMOptions; + ScrollBar maSbCompression; + NumericField maNfCompression; + FixedText maFtJPGMin; + FixedText maFtJPGMax; + FixedText maFtPNGMin; + FixedText maFtPNGMax; + CheckBox maCbJPGPreview; + CheckBox maCbInterlaced; + CheckBox maCbRLEEncoding; + FixedLine maFlGIFDrawingObjects; + CheckBox maCbSaveTransparency; + RadioButton maRbBinary; + RadioButton maRbText; + FixedLine maFlEPSPreview; + CheckBox maCbEPSPreviewTIFF; + CheckBox maCbEPSPreviewEPSI; + FixedLine maFlEPSVersion; + RadioButton maRbEPSLevel1; + RadioButton maRbEPSLevel2; + FixedLine maFlEPSColorFormat; + RadioButton maRbEPSColorFormat1; + RadioButton maRbEPSColorFormat2; + FixedLine maFlCompression; + RadioButton maRbEPSCompressionLZW; + RadioButton maRbEPSCompressionNone; + FixedLine maFlEstimatedSize; + FixedText maFtEstimatedSize; + String msEstimatedSizePix1; + String msEstimatedSizePix2; + String msEstimatedSizeVec; + FixedLine maFlButtons; + FixedBitmap maFbJPGPreview; + ScrollBar maSbZoom; + NumericField maNfZoom; + ScrollBar maSbJPGPreviewHorz; + ScrollBar maSbJPGPreviewVert; + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + + String ms1BitTreshold; + String ms1BitDithered; + String ms4BitGrayscale; + String ms4BitColorPalette; + String ms8BitGrayscale; + String ms8BitColorPalette; + String ms24BitColor; + + vcl::RowOrColumn maLayout; + Size maDialogSize; + + FilterConfigItem* mpOptionsItem; + FilterConfigItem* mpFilterOptionsItem; + + String maExt; + String maEstimatedSizeText; + sal_Int16 mnFormat; + sal_Int32 mnMaxFilesizeForRealtimePreview; + + sal_Bool mbPreview; + sal_Bool mbIsPixelFormat; + sal_Bool mbExportSelection; + sal_Bool mbPreserveAspectRatio; + + Rectangle maRectFlButtons; + Rectangle maRectBtnHelp; + Rectangle maRectBtnOK; + Rectangle maRectBtnCancel; + + SvStream* mpTempStream; + Bitmap maBitmap; + + com::sun::star::awt::Size + maOriginalSize; // the original graphic size in 1/100mm + com::sun::star::awt::Size + maSize; // for vector graphics it always contains the logical size in 1/100mm + // for pixel graphics it always contains the pixel count + com::sun::star::awt::Size + maResolution; // it always contains the number of pixels per meter + + com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + mxShape; + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > + mxShapes; + com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > + mxPage; + + + DECL_LINK( UpdateHdl,void* p ); + DECL_LINK( UpdateHdlMtfSizeX,void* p ); + DECL_LINK( UpdateHdlMtfSizeY,void* p ); + DECL_LINK( UpdateHdlNfResolution,void* p ); + DECL_LINK( SbCompressionUpdateHdl,void* p ); + DECL_LINK( NfCompressionUpdateHdlX,void* p ); + + DECL_LINK( OK, void* p ); + + void createSizeControls( vcl::RowOrColumn& ); + void createColorDepthControls( vcl::RowOrColumn& ); + void createFilterOptions( vcl::RowOrColumn& ); + void createButtons( vcl::RowOrColumn& ); + void createScrollBar( vcl::RowOrColumn& ); + void setupLayout(); + void updatePreview(); + void updateControls(); + + void GetGraphicSource(); + sal_Bool GetGraphicStream(); + Bitmap GetGraphicBitmap( SvStream& rStream ); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + GetFilterData( sal_Bool bUpdateConfig ); + + sal_uInt32 GetRawFileSize() const; + sal_Bool IsTempExportAvailable() const; + + com::sun::star::awt::Size + GetOriginalSize(); + +public: + ExportDialog( FltCallDialogParameter& rPara, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr, + const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument, + sal_Bool bExportSelection, sal_Bool bIsExportVectorFormat ); + ~ExportDialog(); +}; + + + +#endif // _EXPORTDIALOG_HXX_ + diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src new file mode 100755 index 000000000000..065fcee6ba18 --- /dev/null +++ b/svtools/source/filter.vcl/filter/exportdialog.src @@ -0,0 +1,505 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "exportdialog.hrc" + +String DLG_EXPORT_TITLE +{ + Text [ en-US ] = " Options" ; +}; + +ModalDialog DLG_EXPORT +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 178 , 135 ) ; + Moveable = TRUE ; + Closeable = TRUE ; + + FixedLine FL_EXPORT_SIZE + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Size" ; + }; + FixedText FT_SIZEX + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "Width:" ; + }; + MetricField MF_SIZEX + { + Hide = TRUE; + Border = TRUE; + Size = MAP_APPFONT ( 30, 12 ) ; + TabStop = TRUE; + Repeat = TRUE; + Spin = FALSE; + StrictFormat = TRUE; + DecimalDigits = 2; + Unit = FUNIT_NONE; + Maximum = 99999; + Last = 255; + }; + ListBox LB_SIZEX + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 60, 80 ) ; + DropDown = TRUE ; + Sort = FALSE ; + StringList [ en-US ] = + { + < "inches" ; > ; + < "cm" ; Default ; > ; + < "mm" ; > ; + < "points" ; > ; + < "pixels" ; > ; + }; + }; + FixedText FT_SIZEY + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "Height:" ; + }; + MetricField MF_SIZEY + { + Hide = TRUE; + Border = TRUE; + Size = MAP_APPFONT ( 30, 12 ); + TabStop = TRUE; + Repeat = TRUE; + Spin = FALSE; + StrictFormat = TRUE; + DecimalDigits = 2; + Unit = FUNIT_NONE; + Maximum = 99999; + Last = 255 ; + }; + ListBox LB_SIZEY + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 60, 80 ) ; + DropDown = TRUE ; + Sort = FALSE ; + StringList [ en-US ] = + { + < "inches" ; > ; + < "cm" ; Default ; > ; + < "mm" ; > ; + < "points" ; > ; + < "pixels" ; > ; + }; + }; + FixedText FT_RESOLUTION + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "Resolution:" ; + }; + NumericField NF_RESOLUTION + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 30, 12 ) ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = FALSE ; + Maximum = 99999; + Last = 255 ; + }; + ListBox LB_RESOLUTION + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 60, 80 ) ; + DropDown = TRUE ; + Sort = FALSE ; + StringList [ en-US ] = + { + < "pixels/cm" ; > ; + < "pixels/inch" ; Default ; > ; + < "pixels/meter" ; > ; + }; + }; + FixedLine FL_COLOR_DEPTH + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Color Depth" ; + }; + ListBox LB_COLOR_DEPTH + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 60, 80 ) ; + DropDown = TRUE ; + Sort = FALSE ; + }; + String STR_1BIT_THRESHOLD + { + Text [ en-US ] = "1 bit threshold"; + }; + String STR_1BIT_DITHERED + { + Text [ en-US ] = "1 bit dithered"; + }; + String STR_4BIT_GRAYSCALE + { + Text [ en-US ] = "4 bit grayscale"; + }; + String STR_4BIT_COLOR_PALETTE + { + Text [ en-US ] = "4 bit color"; + }; + String STR_8BIT_GRAYSCALE + { + Text [ en-US ] = "8 bit grayscale"; + }; + String STR_8BIT_COLOR_PALETTE + { + Text [ en-US ] = "8 bit color"; + }; + String STR_24BIT_TRUE_COLOR + { + Text [ en-US ] = "24 bit true color"; + }; + FixedLine FL_JPG_QUALITY + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Quality" ; + }; + FixedLine FL_COMPRESSION + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Compression" ; + }; + FixedLine FL_MODE + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Mode" ; + }; + FixedLine FL_PBM_OPTIONS + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "File Format" ; + }; + ScrollBar SB_COMPRESSION + { + Hide = TRUE; + Size = MAP_APPFONT ( 48, 10 ) ; + VScroll = FALSE ; + HScroll = TRUE; + Drag = TRUE ; + }; + NumericField NF_COMPRESSION + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 30, 12 ) ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = FALSE ; + Maximum = 99999; + Last = 255 ; + }; + FixedText FT_JPG_MIN + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "1 is minimum Quality and smallest file size." ; + }; + FixedText FT_JPG_MAX + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "100 is maximum Quality and biggest file size." ; + }; + FixedText FT_PNG_MIN + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "0 is biggest file size and fastest loading." ; + }; + FixedText FT_PNG_MAX + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "9 is smallest file size and slowest loading." ; + }; + CheckBox CB_JPG_PREVIEW + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "Preview" ; + }; + CheckBox CB_INTERLACED + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "Interlaced" ; + }; + CheckBox CB_RLE_ENCODING + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "RLE encoding" ; + }; + FixedLine FL_GIF_DRAWING_OBJECTS + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Drawing Objects" ; + }; + CheckBox CB_SAVE_TRANSPARENCY + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "Save transparency" ; + }; + RadioButton RB_BINARY + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Binary" ; + }; + RadioButton RB_TEXT + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Text" ; + }; + FixedLine FL_EPS_PREVIEW + { + Hide = TRUE; + Size = MAP_APPFONT ( 110 , 8 ) ; + Text [ en-US ] = "Preview" ; + }; + CheckBox CB_EPS_PREVIEW_TIFF + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "Image Preview (TIFF)" ; + }; + CheckBox CB_EPS_PREVIEW_EPSI + { + Hide = TRUE; + Size = MAP_APPFONT ( 60 , 10 ) ; + Text [ en-US ] = "Interchange (EPSI)" ; + }; + FixedLine FL_EPS_VERSION + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "Version" ; + }; + RadioButton RB_EPS_LEVEL1 + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Level 1" ; + }; + RadioButton RB_EPS_LEVEL2 + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Level 2" ; + }; + FixedLine FL_EPS_COLOR_FORMAT + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + Text [ en-US ] = "Color format" ; + }; + RadioButton RB_EPS_COLOR_FORMAT1 + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Color" ; + }; + RadioButton RB_EPS_COLOR_FORMAT2 + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "Grayscale" ; + }; + RadioButton RB_EPS_COMPRESSION_LZW + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "LZW encoding" ; + }; + RadioButton RB_EPS_COMPRESSION_NONE + { + Hide = TRUE; + Size = MAP_APPFONT ( 105 , 10 ) ; + Text [ en-US ] = "None" ; + }; + FixedLine FL_ESTIMATED_SIZE + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + }; + FixedText FT_ESTIMATED_SIZE + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + }; + String STR_ESTIMATED_SIZE_PIX_1 + { + Text [ en-US ] = "The picture needs about %1 KB of memory."; + }; + String STR_ESTIMATED_SIZE_PIX_2 + { + Text [ en-US ] = "The picture needs about %1 KB of memory,\n the file size is %2 KB."; + }; + String STR_ESTIMATED_SIZE_VEC + { + Text [ en-US ] = "The file size is %1 KB."; + }; + FixedLine FL_BUTTONS + { + Hide = TRUE; + Size = MAP_APPFONT ( 41 , 10 ) ; + }; + FixedBitmap FB_JPG_PREVIEW + { + Hide = TRUE; + OutputSize = TRUE ; + Scale = TRUE; + Border = TRUE; + }; + ScrollBar SB_ZOOM + { + Hide = TRUE; + Size = MAP_APPFONT ( 48, 10 ); + VScroll = FALSE; + HScroll = TRUE; + Drag = TRUE; + MinPos = 5; + MaxPos = 100; + ThumbPos = 50; + }; + NumericField NF_ZOOM + { + Hide = TRUE; + Border = TRUE ; + Size = MAP_APPFONT ( 30, 12 ) ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = FALSE ; + Maximum = 3000; + Last = 255 ; + }; + ScrollBar SB_JPG_PREVIEW_HORZ + { + Hide = TRUE; + Size = MAP_APPFONT ( 48, 10 ); + VScroll = FALSE; + HScroll = TRUE; + Drag = TRUE; + MinPos = 0; + MaxPos = 100; + ThumbPos = 50; + }; + ScrollBar SB_JPG_PREVIEW_VERT + { + Hide = TRUE; + Size = MAP_APPFONT ( 48, 10 ); + VScroll = TRUE; + HScroll = FALSE; + Drag = TRUE; + MinPos = 0; + MaxPos = 100; + ThumbPos = 50; + }; + OKButton BTN_OK + { + Hide = TRUE; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + }; + CancelButton BTN_CANCEL + { + Hide = TRUE; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + }; + HelpButton BTN_HELP + { + Hide = TRUE; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + }; +}; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index e8121f1d7e94..2888c2fcaa24 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -52,7 +52,7 @@ #include "xbmread.hxx" #include "xpmread.hxx" #include -#include "strings.hrc" +#include #include "sgffilt.hxx" #include "osl/module.hxx" #include @@ -752,7 +752,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r if ( rGraphic.GetType() != GRAPHIC_NONE ) { - sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, *pResMgr ) ), -1 ); + sal_Int32 nMode = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ExportMode" ) ), -1 ); if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter { // is called via UnoGraphicExporter and not from a graphic export Dialog @@ -782,7 +782,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r Bitmap aBitmap( rGraphic.GetBitmap() ); MapMode aMap( MAP_100TH_INCH ); - sal_Int32 nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, *pResMgr ) ), 75 ); + sal_Int32 nDPI = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), 75 ); Fraction aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); aMap.SetScaleX( aFrac ); @@ -806,7 +806,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r else aGraphic = rGraphic; - sal_Int32 nColors = rConfigItem.ReadInt32( String( ResId( KEY_COLORS, *pResMgr ) ), 0 ); // #92767# + sal_Int32 nColors = rConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), 0 ); // #92767# if ( nColors ) // graphic conversion necessary ? { BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); @@ -1769,7 +1769,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat aBmp = aGraphic.GetBitmap(); } ResMgr* pResMgr = CREATERESMGR( svt ); - sal_Bool bRleCoding = aConfigItem.ReadBool( String( ResId( KEY_RLE_CODING, *pResMgr ) ), sal_True ); + sal_Bool bRleCoding = aConfigItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), sal_True ); // Wollen wir RLE-Kodiert speichern? aBmp.Write( rOStm, bRleCoding ); delete pResMgr; diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk index 272bb9a76b03..11d35150bda8 100644 --- a/svtools/source/filter.vcl/filter/makefile.mk +++ b/svtools/source/filter.vcl/filter/makefile.mk @@ -41,16 +41,11 @@ SOLARINC+=-I../../inc # --- Files -------------------------------------------------------- SRS1NAME=$(TARGET) -SRC1FILES= strings.src \ - dlgexpor.src \ - dlgepng.src \ - dlgejpg.src +SRC1FILES=exportdialog.src SLOFILES= $(SLO)$/filter.obj \ $(SLO)$/filter2.obj \ - $(SLO)$/dlgexpor.obj \ - $(SLO)$/dlgejpg.obj \ - $(SLO)$/dlgepng.obj \ + $(SLO)$/exportdialog.obj \ $(SLO)$/sgfbram.obj \ $(SLO)$/sgvmain.obj \ $(SLO)$/sgvtext.obj \ @@ -59,28 +54,26 @@ SLOFILES= $(SLO)$/filter.obj \ $(SLO)$/FilterConfigCache.obj \ $(SLO)$/SvFilterOptionsDialog.obj +EXCEPTIONSFILES= $(SLO)$/exportdialog.obj + EXCEPTIONSNOOPTFILES= $(SLO)$/filter.obj \ $(SLO)$/FilterConfigItem.obj \ $(SLO)$/FilterConfigCache.obj \ $(SLO)$/SvFilterOptionsDialog.obj LIB1TARGET= $(SLB)$/$(TARGET).uno.lib -LIB1OBJFILES= \ - $(SLO)$/dlgexpor.obj \ - $(SLO)$/dlgejpg.obj \ - $(SLO)$/dlgepng.obj \ - $(SLO)$/SvFilterOptionsDialog.obj +LIB1OBJFILES= $(SLO)$/exportdialog.obj \ + $(SLO)$/SvFilterOptionsDialog.obj LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/filter.obj \ - $(SLO)$/filter2.obj \ - $(SLO)$/sgfbram.obj \ - $(SLO)$/sgvmain.obj \ - $(SLO)$/sgvtext.obj \ - $(SLO)$/sgvspln.obj \ - $(SLO)$/FilterConfigItem.obj \ - $(SLO)$/FilterConfigCache.obj +LIB2OBJFILES= $(SLO)$/filter.obj \ + $(SLO)$/filter2.obj \ + $(SLO)$/sgfbram.obj \ + $(SLO)$/sgvmain.obj \ + $(SLO)$/sgvtext.obj \ + $(SLO)$/sgvspln.obj \ + $(SLO)$/FilterConfigItem.obj \ + $(SLO)$/FilterConfigCache.obj # --- Targets ------------------------------------------------------- diff --git a/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc deleted file mode 100644 index ac162bff09f4..000000000000 --- a/svtools/source/filter.vcl/filter/strings.hrc +++ /dev/null @@ -1,27 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src deleted file mode 100644 index 60e628ee0b5c..000000000000 --- a/svtools/source/filter.vcl/filter/strings.src +++ /dev/null @@ -1,85 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "strings.hrc" - -String EXPORT_DIALOG_TITLE -{ - Text [ en-US ] = " Options" ; -}; - -String KEY_MODE -{ - Text = "ExportMode" ; -}; - -String KEY_RES -{ - Text = "Resolution" ; -}; - -String KEY_SIZE -{ - Text = "Size" ; -}; - -String KEY_COLORS -{ - Text = "Color" ; -}; - -String KEY_RLE_CODING -{ - Text = "RLE_Coding" ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit From 50178be7f5b3d4bbecdf008b1edf4e1543d4df4d Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 16 Jun 2010 10:19:21 +0200 Subject: impress186: solved merge problems --- svtools/inc/svtools/svtools.hrc | 19 ++++--------------- svtools/source/filter.vcl/filter/exportdialog.hrc | 2 +- svtools/source/filter.vcl/filter/filter.cxx | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index a57a0f5bb0fe..3dd2f0706a2e 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -38,22 +38,12 @@ //............................................................................. // various unsorted stuff -#define DLG_EXPORT_PIX (RID_SVTOOLS_START+1) -#define DLG_EXPORT_VEC (RID_SVTOOLS_START+2) #define DLG_TWAIN_SOURCE (RID_SVTOOLS_START+3) #define DLG_SVT_EXPLORERFILE (RID_SVTOOLS_START+4) #define DLG_SVT_QUERYFOLDERNAME (RID_SVTOOLS_START+5) #define DLG_SVT_QUERYDELETE (RID_SVTOOLS_START+6) -#define EXPORT_DIALOG_TITLE (RID_SVTOOLS_START+4) -#define KEY_MODE (RID_SVTOOLS_START+5) -#define KEY_RES (RID_SVTOOLS_START+6) -#define KEY_SIZE (RID_SVTOOLS_START+7) - -#define KEY_COLORS (RID_SVTOOLS_START+9) -#define KEY_RLE_CODING (RID_SVTOOLS_START+10) - #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) #define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20) @@ -289,17 +279,16 @@ //............................................................................. // dialogs - -#define DLG_EXPORT_JPG_START (RID_SVTOOLS_START+110) -#define DLG_EXPORT_JPG (RID_SVTOOLS_START+111) -#define DLG_EXPORT_JPG_END (RID_SVTOOLS_START+112) +#define DLG_EXPORT_START (STR_ARR_SVT_LANGUAGE_TABLE_END + 1) +#define DLG_EXPORT (DLG_EXPORT_START) +#define DLG_EXPORT_TITLE (DLG_EXPORT_START+1) +#define DLG_EXPORT_END (DLG_EXPORT_TITLE) #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) #define DLG_REGISTRATION_REQUEST (RID_SVTOOLS_START+115) -#define DLG_EXPORT_EPNG (RID_SVTOOLS_START+116) //............................................................................. // bitmaps diff --git a/svtools/source/filter.vcl/filter/exportdialog.hrc b/svtools/source/filter.vcl/filter/exportdialog.hrc index df18684dd333..e230bcd2c5c3 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.hrc +++ b/svtools/source/filter.vcl/filter/exportdialog.hrc @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include +#include #define BTN_OK 1 #define BTN_CANCEL 1 diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 2888c2fcaa24..c7dd30354e10 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -52,7 +52,7 @@ #include "xbmread.hxx" #include "xpmread.hxx" #include -#include +#include #include "sgffilt.hxx" #include "osl/module.hxx" #include -- cgit From c2eab77d2f47c58d91740ce9e624d1438a87c19c Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 16 Jun 2010 14:29:37 +0200 Subject: impress186: fixed warnings --- svtools/source/filter.vcl/filter/exportdialog.cxx | 8 +++++--- svtools/source/filter.vcl/filter/exportdialog.hxx | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 7e56be261dbb..d23934155a2e 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -535,7 +535,7 @@ sal_uInt32 ExportDialog::GetRawFileSize() const // to determine the exact graphic output size and preview for jpg sal_Bool ExportDialog::IsTempExportAvailable() const { - return GetRawFileSize() < mnMaxFilesizeForRealtimePreview; + return GetRawFileSize() < static_cast< sal_uInt32 >( mnMaxFilesizeForRealtimePreview ); } ExportDialog::ExportDialog( FltCallDialogParameter& rPara, @@ -573,6 +573,8 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maCbRLEEncoding ( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ), maFlGIFDrawingObjects ( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ), maCbSaveTransparency ( this, ResId( CB_SAVE_TRANSPARENCY, *rPara.pResMgr ) ), + maRbBinary ( this, ResId( RB_BINARY, *rPara.pResMgr ) ), + maRbText ( this, ResId( RB_TEXT, *rPara.pResMgr ) ), maFlEPSPreview ( this, ResId( FL_EPS_PREVIEW, *rPara.pResMgr ) ), maCbEPSPreviewTIFF ( this, ResId( CB_EPS_PREVIEW_TIFF, *rPara.pResMgr ) ), maCbEPSPreviewEPSI ( this, ResId( CB_EPS_PREVIEW_EPSI, *rPara.pResMgr ) ), @@ -585,8 +587,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maFlCompression ( this, ResId( FL_COMPRESSION, *rPara.pResMgr ) ), maRbEPSCompressionLZW ( this, ResId( RB_EPS_COMPRESSION_LZW, *rPara.pResMgr ) ), maRbEPSCompressionNone ( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ), - maRbBinary ( this, ResId( RB_BINARY, *rPara.pResMgr ) ), - maRbText ( this, ResId( RB_TEXT, *rPara.pResMgr ) ), maFlEstimatedSize ( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ), maFtEstimatedSize ( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ), msEstimatedSizePix1 ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ) ), @@ -1386,6 +1386,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeX, void *, EMPTYARG ) case MAP_CM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; case MAP_MM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; case MAP_POINT : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 * 72 + 0.5 ); break; + default: case MAP_PIXEL : maSize.Width = maMfSizeX.GetValue(); break; } maSize.Height = static_cast< sal_Int32 >( fRatio * maSize.Width + 0.5 ); @@ -1419,6 +1420,7 @@ IMPL_LINK( ExportDialog, UpdateHdlMtfSizeY, void *, EMPTYARG ) case MAP_CM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; case MAP_MM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; case MAP_POINT : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 * 72 + 0.5 ); break; + default: case MAP_PIXEL : maSize.Height = maMfSizeY.GetValue(); break; } maSize.Width = static_cast< sal_Int32 >( fRatio * maSize.Height + 0.5 ); diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter.vcl/filter/exportdialog.hxx index 564b1111c647..a9692e646746 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.hxx +++ b/svtools/source/filter.vcl/filter/exportdialog.hxx @@ -138,11 +138,6 @@ private: sal_Int16 mnFormat; sal_Int32 mnMaxFilesizeForRealtimePreview; - sal_Bool mbPreview; - sal_Bool mbIsPixelFormat; - sal_Bool mbExportSelection; - sal_Bool mbPreserveAspectRatio; - Rectangle maRectFlButtons; Rectangle maRectBtnHelp; Rectangle maRectBtnOK; @@ -155,7 +150,13 @@ private: maOriginalSize; // the original graphic size in 1/100mm com::sun::star::awt::Size maSize; // for vector graphics it always contains the logical size in 1/100mm - // for pixel graphics it always contains the pixel count + + sal_Bool mbPreview; + sal_Bool mbIsPixelFormat; + sal_Bool mbExportSelection; + sal_Bool mbPreserveAspectRatio; + + // for pixel graphics it always contains the pixel count com::sun::star::awt::Size maResolution; // it always contains the number of pixels per meter -- cgit From d3f7ff0321d03c423d9eaff787b3921862f47f8c Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 16 Jun 2010 16:50:36 +0200 Subject: impress186: #i4499# reserving two text lines to display the estimated file size --- svtools/source/filter.vcl/filter/exportdialog.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index d23934155a2e..1e2c669afa33 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -628,6 +628,7 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxFilesizeForRealtimePreview" ) ), 0 ); + maFtEstimatedSize.SetText( String( RTL_CONSTASCII_USTRINGPARAM( " \n " ) ) ); String aTitle( maExt ); aTitle += String( ResId( DLG_EXPORT_TITLE, *mpMgr ) ); -- cgit From 829b5e25d01442907ce061f1f1eb50bd4c8320f2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 19:03:40 +0200 Subject: CWS gnumake2: enabling precompiled headers where possible --- svtools/prj/target_lib_svt.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk index 97ad04823d14..8968775b8e7c 100644 --- a/svtools/prj/target_lib_svt.mk +++ b/svtools/prj/target_lib_svt.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,svt)) -$(call gb_Library_get_headers_target,svt) : $(call gb_Package_get_target,svtools_inc) +$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) $(eval $(call gb_Library_set_include,svt,\ $$(INCLUDE) \ -- cgit From 5965bb52435916c06d1b5a63df4959203b7cf018 Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Fri, 25 Jun 2010 13:15:03 +0200 Subject: codecleanup02: #i112685# Removed ifdefs and code for WIN,W30,W31 --- svtools/inc/fltdefs.hxx | 18 +---- svtools/inc/svtools/svxbox.hxx | 4 -- svtools/source/contnr/ctrdll.cxx | 79 ---------------------- svtools/source/contnr/svicnvw.cxx | 3 - svtools/source/contnr/svimpicn.cxx | 15 ++-- svtools/source/contnr/treelist.cxx | 10 --- svtools/source/control/ctrldll.cxx | 78 --------------------- .../filter.vcl/filter/SvFilterOptionsDialog.cxx | 2 +- svtools/source/filter.vcl/filter/filter.cxx | 2 +- svtools/source/filter.vcl/filter/fldll.cxx | 76 --------------------- svtools/source/filter.vcl/filter/sgfbram.cxx | 4 -- svtools/source/filter.vcl/filter/sgvmain.cxx | 13 ---- svtools/source/filter.vcl/filter/sgvspln.cxx | 5 -- svtools/source/filter.vcl/filter/sgvtext.cxx | 10 +-- svtools/source/filter.vcl/jpeg/jpeg.h | 4 -- svtools/source/misc/imap.cxx | 10 --- svtools/source/misc/imap2.cxx | 6 -- 17 files changed, 11 insertions(+), 328 deletions(-) delete mode 100644 svtools/source/contnr/ctrdll.cxx delete mode 100644 svtools/source/control/ctrldll.cxx delete mode 100644 svtools/source/filter.vcl/filter/fldll.cxx (limited to 'svtools') diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx index 8ef3f2ab3740..86462c2faa33 100644 --- a/svtools/inc/fltdefs.hxx +++ b/svtools/inc/fltdefs.hxx @@ -34,7 +34,7 @@ #define _FLTDEFS_HXX -#if defined ( WIN ) || defined ( WNT ) +#if defined ( WNT ) #define RGBQUAD RGBQUADWIN @@ -53,21 +53,6 @@ typedef struct RGBQUAD } RGBQUAD; -#ifdef WIN -typedef BYTE huge* PDIBBYTE; -#define MEMCPY hmemcpy -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) -#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) -#define MEMSET( pDst, cByte, nCount ) \ -{ \ - PDIBBYTE pTmp = (PDIBBYTE) pDst; \ - for ( ULONG i = 0; i < nCount; i++ )\ - *pTmp++ = cByte; \ -} - -#else - typedef BYTE* PDIBBYTE; #define MEMCPY memcpy #define MEMSET memset @@ -75,7 +60,6 @@ typedef BYTE* PDIBBYTE; #define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) #define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) -#endif #else typedef BYTE* PDIBBYTE; diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx index 25deba4d091c..a4a920e692be 100644 --- a/svtools/inc/svtools/svxbox.hxx +++ b/svtools/inc/svtools/svxbox.hxx @@ -129,11 +129,7 @@ enum SvxComboBoxStyle SVX_CBS_LOWER = 0x02, SVX_CBS_ALL = 0x04, SVX_CBS_FILENAME = 0x08, -#ifdef WIN - SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER -#else SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME -#endif }; // class SvxComboBox ----------------------------------------------------- diff --git a/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx deleted file mode 100644 index 463c6ccc8b35..000000000000 --- a/svtools/source/contnr/ctrdll.cxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef WIN -#include - -#ifndef _SYSDEP_HXX -#include -#endif - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - - -/*************************************************************************** -|* -|* LibMain() -|* -|* Beschreibung Initialisierungsfunktion der DLL -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* -|* WEP() -|* -|* Beschreibung DLL-Deinitialisierung -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index 20bcfe0fe33a..b16cd67d12a5 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -550,9 +550,6 @@ void SvIconView::EditItemText( SvLBoxEntry* pEntry, SvLBoxItem* pItem, aRect.Bottom() += 2; // sieht huebscher aus -#ifdef WIN - aRect.Bottom() += 4; -#endif #ifdef OS2 #if OS2_SINGLE_LINE_EDIT diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 2d4c9cf2df0e..d1e471953663 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -1702,11 +1702,6 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight ) Point aPos( 0, nRealHeight ); aPos.Y() -= nHorSBarHeight; -#ifdef WIN - // vom linken und unteren Rand ein Pixel abschneiden - aPos.Y()++; - aPos.X()--; -#endif #ifdef OS2 aPos.Y()++; #endif @@ -1717,7 +1712,7 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight ) aPos.X() = nRealWidth; aPos.Y() = 0; aPos.X() -= nVerSBarWidth; -#if defined(WIN) || defined(WNT) +#if defined(WNT) aPos.X()++; aPos.Y()--; #endif @@ -1809,7 +1804,7 @@ void SvImpIconView::AdjustScrollBars() // size ver scrollbar long nThumb = aVerSBar.GetThumbPos(); Size aSize( nVerSBarWidth, nRealHeight ); -#if defined(WIN) || defined(WNT) +#if defined(WNT) aSize.Height() += 2; #endif #ifdef OS2 @@ -1834,7 +1829,7 @@ void SvImpIconView::AdjustScrollBars() nThumb = aHorSBar.GetThumbPos(); aSize.Width() = nRealWidth; aSize.Height() = nHorSBarHeight; -#if defined(WIN) || defined(WNT) +#if defined(WNT) aSize.Width()++; #endif #ifdef OS2 @@ -1842,7 +1837,7 @@ void SvImpIconView::AdjustScrollBars() if( nResult & 0x0001 ) // vertikale Scrollbar ? aSize.Width()--; #endif -#if defined(WIN) || defined(WNT) +#if defined(WNT) if( nResult & 0x0001 ) // vertikale Scrollbar ? { aSize.Width()++; @@ -1868,7 +1863,7 @@ void SvImpIconView::AdjustScrollBars() nRealWidth++; #endif aOutputSize.Width() = nRealWidth; -#if defined(WIN) || defined(WNT) +#if defined(WNT) if( nResult & 0x0002 ) // hor scrollbar ? nRealHeight++; // weil unterer Rand geclippt wird #endif diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 3395dffc28f5..1b96f1ac89e4 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -139,16 +139,6 @@ void SvTreeEntryList::DestroyAll() } - - -#if defined (WIN) && defined (MSC) -// siehe BugId 42896: Die Funktionen Prev, PrevVisible, Next, NextVisible -// (andere?) funktionieren nicht mit Optimierung. -#pragma optimize ("", off) -#endif - - - /************************************************************************* |* |* SvTreeList:: diff --git a/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx deleted file mode 100644 index 2f3ff037be31..000000000000 --- a/svtools/source/control/ctrldll.cxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef WIN -#include - -#ifndef _SYSDEP_HXX -#include -#endif - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - -/*************************************************************************** -|* -|* LibMain() -|* -|* Beschreibung Initialisierungsfunktion der DLL -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* -|* WEP() -|* -|* Beschreibung DLL-Deinitialisierung -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx index 038930ef80ee..8ca6ba2b124e 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx @@ -49,7 +49,7 @@ #include #include "vcl/svapp.hxx" -#if defined WIN || (defined OS2 && !defined ICC) +#if (defined OS2 && !defined ICC) #define EXPDLG_FUNCTION_NAME "_DoExportDialog" #else #define EXPDLG_FUNCTION_NAME "DoExportDialog" diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index c8a79d3a35cd..db1f4c11cf94 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -79,7 +79,7 @@ #define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF -#if defined WIN || (defined OS2 && !defined ICC) +#if (defined OS2 && !defined ICC) #define IMPORT_FUNCTION_NAME "_GraphicImport" #define EXPORT_FUNCTION_NAME "_GraphicExport" diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx deleted file mode 100644 index b44e08835f34..000000000000 --- a/svtools/source/filter.vcl/filter/fldll.cxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef WIN -#include - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - - -/*************************************************************************** -|* -|* LibMain() -|* -|* Beschreibung Initialisierungsfunktion der DLL -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* -|* WEP() -|* -|* Beschreibung DLL-Deinitialisierung -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif - diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx index 43cf0fbbacd3..3d1a71f5a2db 100644 --- a/svtools/source/filter.vcl/filter/sgfbram.cxx +++ b/svtools/source/filter.vcl/filter/sgfbram.cxx @@ -37,10 +37,6 @@ #include "sgffilt.hxx" #include "sgfbram.hxx" -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "SVTOOLS_FILTER4", "SVTOOLS_CODE" ) -#endif - /************************************************************************* |* |* operator>>( SvStream&, SgfHeader& ) diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index e175380244b3..293c6dab7964 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -110,20 +110,11 @@ // //////////////////////////////////////////////////////////////////////////////////////////////////// -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "svtools", "AUTO_CODE" ) -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// // Fuer Fontuebersetzung /////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// SgfFontLst* pSgfFonts = 0; -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "SVTOOLS_FILTER3", "SVTOOLS_CODE" ) -static void AntiMscBug() {} -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// // Fuer Kreisunterarten, Text und gedrehte Rechtecke /////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1137,7 +1128,3 @@ for n:=0 to 63 do end; */ -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "svtools", "AUTO_CODE" ) -#endif - diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx index 7a23e85f4dbe..d695e171a194 100644 --- a/svtools/source/filter.vcl/filter/sgvspln.cxx +++ b/svtools/source/filter.vcl/filter/sgvspln.cxx @@ -33,11 +33,6 @@ #include -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "SVTOOLS_FILTER2", "SVTOOLS_CODE" ) -#pragma optimize( "", off ) -#endif - #if defined( PM2 ) && defined( __BORLANDC__ ) #pragma option -Od #endif diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 4a0be80b55be..9a82cd486599 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -38,10 +38,6 @@ extern SgfFontLst* pSgfFonts; -#if defined( WIN ) && defined( MSC ) -#pragma code_seg( "SVTOOLS_FILTER1", "SVTOOLS_CODE" ) -#endif - #ifndef abs #define abs(x) ((x)<0 ? -(x) : (x)) #endif @@ -621,7 +617,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr switch (Atr.GetFont()) { case 92500: case 92501: case 92504: case 92505: { -#if defined(WIN) || defined(WNT) || defined(PM2) +#if defined(WNT) || defined(PM2) FNam=String::CreateFromAscii( "Times New Roman" ); // CG Times ist unter Windows und OS/2 Times New Roman #else FNam=String::CreateFromAscii( "Times" ); // ansonsten ist das einfach Times @@ -630,7 +626,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr aFont.SetFamily(FAMILY_ROMAN); } break; case 94021: case 94022: case 94023: case 94024: { -#if defined(WIN) || defined(WNT) +#if defined(WNT) FNam=String::CreateFromAscii( "Arial", 5 ); // Univers ist unter Windows Arial #else FNam=String::CreateFromAscii( "Helvetica" ); // und ansonsten Helvetica @@ -639,7 +635,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr StdBrei=47; } break; case 93950: case 93951: case 93952: case 93953: { -#if defined(WIN) || defined(WNT) +#if defined(WNT) FNam=String::CreateFromAscii( "Courier New" ); // Der Vector-Courierfont unter Windows heisst Courier New #else FNam=String::CreateFromAscii( "Courier" ); // ansonsten ist und bleibt Courier immer Courier diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter.vcl/jpeg/jpeg.h index deb06600474c..82a2f80a838c 100644 --- a/svtools/source/filter.vcl/jpeg/jpeg.h +++ b/svtools/source/filter.vcl/jpeg/jpeg.h @@ -51,11 +51,7 @@ struct JPEGCreateBitmapParam typedef struct my_error_mgr* my_error_ptr; typedef unsigned char BYTE; -#ifdef WIN -typedef unsigned char _huge* HPBYTE; -#else typedef unsigned char* HPBYTE; -#endif void* JPEGMalloc( size_t size ); void JPEGFree( void *ptr ); diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 25f23e2ef00b..4378e0acd234 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -57,10 +57,6 @@ UINT16 IMapObject::nActualTextEncoding = (UINT16) RTL_TEXTENCODING_DONTKNOW; /******************************************************************************/ -#ifdef WIN -#pragma optimize ( "", off ) -#endif - IMapObject::IMapObject() : bActive( false ) , nReadVersion( 0 ) @@ -1224,9 +1220,3 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) rIStm.SetNumberFormatInt( nOldFormat ); } - -#ifdef WIN -#pragma optimize ( "", on ) -#endif - - diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 9834fe0fcb76..587a31d4f098 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -28,9 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef WIN -#include -#endif #include // #include #include @@ -48,9 +45,6 @@ #include #include -#ifdef WIN -#include -#endif #include #include -- cgit From f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- svtools/AllLangResTarget_productregistration.mk | 50 ++++ svtools/AllLangResTarget_svt.mk | 79 +++++++ svtools/Executable_bmp.mk | 71 ++++++ svtools/Executable_bmpsum.mk | 67 ++++++ svtools/Executable_g2g.mk | 67 ++++++ svtools/Library_hatchwindowfactory.mk | 74 ++++++ svtools/Library_productregistration.mk | 75 ++++++ svtools/Library_svt.mk | 298 ++++++++++++++++++++++++ svtools/Makefile | 9 +- svtools/Module_svtools.mk | 48 ++++ svtools/Package_inc.mk | 180 ++++++++++++++ svtools/prj/target_exe_bmp.mk | 71 ------ svtools/prj/target_exe_bmpsum.mk | 67 ------ svtools/prj/target_exe_g2g.mk | 67 ------ svtools/prj/target_lib_hatchwindowfactory.mk | 74 ------ svtools/prj/target_lib_productregistration.mk | 75 ------ svtools/prj/target_lib_svt.mk | 298 ------------------------ svtools/prj/target_module_svtools.mk | 57 ----- svtools/prj/target_package_inc.mk | 180 -------------- svtools/prj/target_res_productregistration.mk | 50 ---- svtools/prj/target_res_svt.mk | 79 ------- 21 files changed, 1014 insertions(+), 1022 deletions(-) create mode 100644 svtools/AllLangResTarget_productregistration.mk create mode 100644 svtools/AllLangResTarget_svt.mk create mode 100644 svtools/Executable_bmp.mk create mode 100644 svtools/Executable_bmpsum.mk create mode 100644 svtools/Executable_g2g.mk create mode 100644 svtools/Library_hatchwindowfactory.mk create mode 100644 svtools/Library_productregistration.mk create mode 100644 svtools/Library_svt.mk create mode 100644 svtools/Module_svtools.mk create mode 100644 svtools/Package_inc.mk delete mode 100644 svtools/prj/target_exe_bmp.mk delete mode 100644 svtools/prj/target_exe_bmpsum.mk delete mode 100644 svtools/prj/target_exe_g2g.mk delete mode 100644 svtools/prj/target_lib_hatchwindowfactory.mk delete mode 100644 svtools/prj/target_lib_productregistration.mk delete mode 100644 svtools/prj/target_lib_svt.mk delete mode 100644 svtools/prj/target_module_svtools.mk delete mode 100644 svtools/prj/target_package_inc.mk delete mode 100644 svtools/prj/target_res_productregistration.mk delete mode 100644 svtools/prj/target_res_svt.mk (limited to 'svtools') diff --git a/svtools/AllLangResTarget_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk new file mode 100644 index 000000000000..af510d338c6e --- /dev/null +++ b/svtools/AllLangResTarget_productregistration.mk @@ -0,0 +1,50 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + +$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ + svt/productregistration \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) + +$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ + svtools/source/productregistration/registrationdlg.src \ +)) + + diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk new file mode 100644 index 000000000000..1e3e21b7ca6b --- /dev/null +++ b/svtools/AllLangResTarget_svt.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + +$(eval $(call gb_AllLangResTarget_add_srs,svt,\ + svt/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) + +$(eval $(call gb_SrsTarget_set_include,svt/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/uno \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/res,\ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/contnr/templwin.src \ + svtools/source/control/calendar.src \ + svtools/source/control/ctrlbox.src \ + svtools/source/control/ctrltool.src \ + svtools/source/control/filectrl.src \ + svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/colrdlg.src \ + svtools/source/dialogs/filedlg2.src \ + svtools/source/dialogs/formats.src \ + svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/so3res.src \ + svtools/source/dialogs/wizardmachine.src \ + svtools/source/filter.vcl/filter/dlgejpg.src \ + svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ + svtools/source/filter.vcl/filter/strings.src \ + svtools/source/java/javaerror.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/undo.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/uno/unoifac2.src \ +)) + + diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk new file mode 100644 index 000000000000..57b34292ff11 --- /dev/null +++ b/svtools/Executable_bmp.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmp)) + +$(eval $(call gb_Executable_set_include,bmp,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + stl \ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmp,\ + svtools/bmpmaker/bmp \ + svtools/bmpmaker/bmpcore \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk new file mode 100644 index 000000000000..ec0f90f2b04b --- /dev/null +++ b/svtools/Executable_bmpsum.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmpsum)) + +$(eval $(call gb_Executable_set_include,bmpsum,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + stl \ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ + svtools/bmpmaker/bmpsum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk new file mode 100644 index 000000000000..4bba4dc2644f --- /dev/null +++ b/svtools/Executable_g2g.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,g2g)) + +$(eval $(call gb_Executable_set_include,g2g,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + stl \ + vcl \ + tl \ + vos3 \ + svt \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,g2g,\ + svtools/bmpmaker/g2g \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + pthread \ + dl \ + X11 \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk new file mode 100644 index 000000000000..448517271e19 --- /dev/null +++ b/svtools/Library_hatchwindowfactory.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,hatchwindowfactory)) + +$(eval $(call gb_Library_set_include,hatchwindowfactory,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ + svtools/source/hatchwindow/hatchwindowfactory \ + svtools/source/hatchwindow/documentcloser \ + svtools/source/hatchwindow/ipwin \ + svtools/source/hatchwindow/hatchwindow \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk new file mode 100644 index 000000000000..7dc480c8ea5a --- /dev/null +++ b/svtools/Library_productregistration.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,productregistration)) + +$(eval $(call gb_Library_set_include,productregistration,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + svl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + stl \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,productregistration,\ + svtools/source/productregistration/productregistration \ + svtools/source/productregistration/registrationdlg \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk new file mode 100644 index 000000000000..8968775b8e7c --- /dev/null +++ b/svtools/Library_svt.mk @@ -0,0 +1,298 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svt)) + +$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) + +$(eval $(call gb_Library_set_include,svt,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svt,\ + $$(DEFS) \ + -DSVT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svt,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + jvmfwk \ + sal \ + sot \ + stl \ + svl \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ +)) + +ifeq ($(SYSTEM_JPEG),YES) +$(eval $(call gb_Library_add_linked_libs,svt,\ + jpeg \ +)) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,svt,\ + jpeglib \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,svt,\ + svtools/source/edit/svmedit \ + svtools/source/edit/svmedit2 \ + svtools/source/edit/textundo \ + svtools/source/edit/syntaxhighlight \ + svtools/source/edit/textwindowpeer \ + svtools/source/edit/sychconv \ + svtools/source/edit/xtextedt \ + svtools/source/edit/txtattr \ + svtools/source/edit/textdoc \ + svtools/source/edit/texteng \ + svtools/source/edit/textdata \ + svtools/source/edit/editsyntaxhighlighter \ + svtools/source/edit/textview \ + svtools/source/urlobj/inetimg \ + svtools/source/java/javainteractionhandler \ + svtools/source/java/javacontext \ + svtools/source/svhtml/htmlout \ + svtools/source/svhtml/htmlsupp \ + svtools/source/svhtml/parhtml \ + svtools/source/svhtml/htmlkywd \ + svtools/source/config/itemholder2 \ + svtools/source/config/optionsdrawinglayer \ + svtools/source/config/menuoptions \ + svtools/source/config/helpopt \ + svtools/source/config/htmlcfg \ + svtools/source/config/accessibilityoptions \ + svtools/source/config/printoptions \ + svtools/source/config/miscopt \ + svtools/source/config/extcolorcfg \ + svtools/source/config/colorcfg \ + svtools/source/config/fontsubstconfig \ + svtools/source/config/apearcfg \ + svtools/source/misc/acceleratorexecute \ + svtools/source/misc/chartprettypainter \ + svtools/source/misc/cliplistener \ + svtools/source/misc/dialogclosedlistener \ + svtools/source/misc/dialogcontrolling \ + svtools/source/misc/ehdl \ + svtools/source/misc/embedhlp \ + svtools/source/misc/embedtransfer \ + svtools/source/misc/helpagentwindow \ + svtools/source/misc/imagemgr \ + svtools/source/misc/imageresourceaccess \ + svtools/source/misc/imap \ + svtools/source/misc/imap2 \ + svtools/source/misc/imap3 \ + svtools/source/misc/itemdel \ + svtools/source/misc/langtab \ + svtools/source/misc/stringtransfer \ + svtools/source/misc/svtaccessiblefactory \ + svtools/source/misc/svtdata \ + svtools/source/misc/templatefoldercache \ + svtools/source/misc/transfer2 \ + svtools/source/misc/transfer \ + svtools/source/misc/unitconv \ + svtools/source/misc/wallitem \ + svtools/source/plugapp/ttprops \ + svtools/source/control/ctrlbox \ + svtools/source/control/valueacc \ + svtools/source/control/valueset \ + svtools/source/control/taskbar \ + svtools/source/control/urlcontrol \ + svtools/source/control/scriptedtext \ + svtools/source/control/headbar \ + svtools/source/control/fileurlbox \ + svtools/source/control/fmtfield \ + svtools/source/control/collatorres \ + svtools/source/control/indexentryres \ + svtools/source/control/filectrl \ + svtools/source/control/scrwin \ + svtools/source/control/taskbox \ + svtools/source/control/hyperlabel \ + svtools/source/control/filectrl2 \ + svtools/source/control/fixedhyper \ + svtools/source/control/taskstat \ + svtools/source/control/inettbc \ + svtools/source/control/calendar \ + svtools/source/control/roadmap \ + svtools/source/control/ctrltool \ + svtools/source/control/asynclink \ + svtools/source/control/stdctrl \ + svtools/source/control/ctrldll \ + svtools/source/control/tabbar \ + svtools/source/control/ruler \ + svtools/source/control/stdmenu \ + svtools/source/control/prgsbar \ + svtools/source/control/taskmisc \ + svtools/source/dialogs/insdlg \ + svtools/source/dialogs/roadmapwizard \ + svtools/source/dialogs/mcvmath \ + svtools/source/dialogs/logindlg \ + svtools/source/dialogs/wizdlg \ + svtools/source/dialogs/addresstemplate \ + svtools/source/dialogs/printdlg \ + svtools/source/dialogs/filedlg2 \ + svtools/source/dialogs/colctrl \ + svtools/source/dialogs/colrdlg \ + svtools/source/dialogs/wizardmachine \ + svtools/source/dialogs/prnsetup \ + svtools/source/dialogs/filedlg \ + svtools/source/dialogs/property \ + svtools/source/table/tablecontrol \ + svtools/source/table/tablegeometry \ + svtools/source/table/gridtablerenderer \ + svtools/source/table/tabledatawindow \ + svtools/source/table/defaultinputhandler \ + svtools/source/table/tablecontrol_impl \ + svtools/source/contnr/svlbox \ + svtools/source/contnr/svtabbx \ + svtools/source/contnr/ivctrl \ + svtools/source/contnr/templwin \ + svtools/source/contnr/svicnvw \ + svtools/source/contnr/contentenumeration \ + svtools/source/contnr/svimpbox \ + svtools/source/contnr/imivctl1 \ + svtools/source/contnr/svtreebx \ + svtools/source/contnr/fileview \ + svtools/source/contnr/svimpicn \ + svtools/source/contnr/svlbitm \ + svtools/source/contnr/ctrdll \ + svtools/source/contnr/tooltiplbox \ + svtools/source/contnr/treelist \ + svtools/source/contnr/imivctl2 \ + svtools/source/uno/unoiface \ + svtools/source/uno/genericunodialog \ + svtools/source/uno/unocontroltablemodel \ + svtools/source/uno/contextmenuhelper \ + svtools/source/uno/toolboxcontroller \ + svtools/source/uno/generictoolboxcontroller \ + svtools/source/uno/addrtempuno \ + svtools/source/uno/miscservices \ + svtools/source/uno/statusbarcontroller \ + svtools/source/uno/svtxgridcontrol \ + svtools/source/uno/unoimap \ + svtools/source/uno/unoevent \ + svtools/source/uno/treecontrolpeer \ + svtools/source/uno/framestatuslistener \ + svtools/source/brwbox/editbrowsebox \ + svtools/source/brwbox/brwhead \ + svtools/source/brwbox/brwbox3 \ + svtools/source/brwbox/brwbox1 \ + svtools/source/brwbox/ebbcontrols \ + svtools/source/brwbox/brwbox2 \ + svtools/source/brwbox/datwin \ + svtools/source/brwbox/editbrowsebox2 \ + svtools/source/svrtf/rtfkeywd \ + svtools/source/svrtf/svparser \ + svtools/source/svrtf/parrtf \ + svtools/source/svrtf/rtfout \ + svtools/source/filter.vcl/filter/dlgepng \ + svtools/source/filter.vcl/filter/filter2 \ + svtools/source/filter.vcl/filter/FilterConfigItem \ + svtools/source/filter.vcl/filter/sgvspln \ + svtools/source/filter.vcl/filter/filter \ + svtools/source/filter.vcl/filter/sgvtext \ + svtools/source/filter.vcl/filter/sgfbram \ + svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ + svtools/source/filter.vcl/filter/dlgexpor \ + svtools/source/filter.vcl/filter/fldll \ + svtools/source/filter.vcl/filter/sgvmain \ + svtools/source/filter.vcl/filter/FilterConfigCache \ + svtools/source/filter.vcl/filter/dlgejpg \ + svtools/source/filter.vcl/wmf/winwmf \ + svtools/source/filter.vcl/wmf/winmtf \ + svtools/source/filter.vcl/wmf/emfwr \ + svtools/source/filter.vcl/wmf/wmf \ + svtools/source/filter.vcl/wmf/enhwmf \ + svtools/source/filter.vcl/wmf/wmfwr \ + svtools/source/filter.vcl/igif/decode \ + svtools/source/filter.vcl/igif/gifread \ + svtools/source/filter.vcl/ixbm/xbmread \ + svtools/source/filter.vcl/jpeg/jpeg \ + svtools/source/filter.vcl/ixpm/xpmread \ + svtools/source/graphic/descriptor \ + svtools/source/graphic/graphic \ + svtools/source/graphic/graphicunofactory \ + svtools/source/graphic/grfattr \ + svtools/source/graphic/grfcache \ + svtools/source/graphic/grfmgr \ + svtools/source/graphic/grfmgr2 \ + svtools/source/graphic/provider \ + svtools/source/graphic/renderer \ + svtools/source/graphic/transformer \ +)) + +$(eval $(call gb_Library_add_cobjects,svt,\ + svtools/source/filter.vcl/jpeg/jpegc \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,svt,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svt,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + oleaut32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Makefile b/svtools/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk new file mode 100644 index 000000000000..bc760add6d26 --- /dev/null +++ b/svtools/Module_svtools.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svtools)) + +$(eval $(call gb_Module_add_targets,svtools,\ + AllLangResTarget_productregistration \ + AllLangResTarget_svt \ + Executable_bmp \ + Executable_bmpsum \ + Executable_g2g \ + Library_hatchwindowfactory \ + Library_productregistration \ + Library_svt \ + Package_inc \ +)) + +#todo: javapatchres +#todo: jpeg on mac in svtools/util/makefile.mk +#todo: deliver errtxt.src as ehdl.srs +#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog +#todo: map file + +# vim: set noet sw=4 ts=4: diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk new file mode 100644 index 000000000000..f47251f31590 --- /dev/null +++ b/svtools/Package_inc.mk @@ -0,0 +1,180 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk deleted file mode 100644 index 57b34292ff11..000000000000 --- a/svtools/prj/target_exe_bmp.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,bmp)) - -$(eval $(call gb_Executable_set_include,bmp,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(SRCDIR)/svtools/inc/svtools \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/pch \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - stl \ - vcl \ - tl \ - vos3 \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,bmp,\ - svtools/bmpmaker/bmp \ - svtools/bmpmaker/bmpcore \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk deleted file mode 100644 index ec0f90f2b04b..000000000000 --- a/svtools/prj/target_exe_bmpsum.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,bmpsum)) - -$(eval $(call gb_Executable_set_include,bmpsum,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/ \ - -I$(OUTDIR)/inc/offuh/ \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(SRCDIR)/svtools/inc/svtools/ \ -)) - -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - stl \ - vcl \ - tl \ - vos3 \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ - svtools/bmpmaker/bmpsum \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk deleted file mode 100644 index 4bba4dc2644f..000000000000 --- a/svtools/prj/target_exe_g2g.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,g2g)) - -$(eval $(call gb_Executable_set_include,g2g,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/ \ - -I$(OUTDIR)/inc/offuh/ \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(SRCDIR)/svtools/inc/svtools/ \ -)) - -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - stl \ - vcl \ - tl \ - vos3 \ - svt \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,g2g,\ - svtools/bmpmaker/g2g \ -)) -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - pthread \ - dl \ - X11 \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_hatchwindowfactory.mk b/svtools/prj/target_lib_hatchwindowfactory.mk deleted file mode 100644 index 448517271e19..000000000000 --- a/svtools/prj/target_lib_hatchwindowfactory.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,hatchwindowfactory)) - -$(eval $(call gb_Library_set_include,hatchwindowfactory,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ - svtools/source/hatchwindow/hatchwindowfactory \ - svtools/source/hatchwindow/documentcloser \ - svtools/source/hatchwindow/ipwin \ - svtools/source/hatchwindow/hatchwindow \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - kernel32 \ - msvcrt \ - oldnames \ - stl \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_productregistration.mk b/svtools/prj/target_lib_productregistration.mk deleted file mode 100644 index 7dc480c8ea5a..000000000000 --- a/svtools/prj/target_lib_productregistration.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,productregistration)) - -$(eval $(call gb_Library_set_include,productregistration,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - svl \ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - stl \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,productregistration,\ - svtools/source/productregistration/productregistration \ - svtools/source/productregistration/registrationdlg \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk deleted file mode 100644 index 8968775b8e7c..000000000000 --- a/svtools/prj/target_lib_svt.mk +++ /dev/null @@ -1,298 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,svt)) - -$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) - -$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) - -$(eval $(call gb_Library_set_include,svt,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(SRCDIR)/svtools/inc/svtools \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,svt,\ - $$(DEFS) \ - -DSVT_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,svt,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - i18nisolang1 \ - i18nutil \ - icuuc \ - jvmfwk \ - sal \ - sot \ - stl \ - svl \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ - vos3 \ -)) - -ifeq ($(SYSTEM_JPEG),YES) -$(eval $(call gb_Library_add_linked_libs,svt,\ - jpeg \ -)) -$(eval $(call gb_Library_set_ldflags,svt,\ - $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,svt,\ - jpeglib \ -)) -endif - -$(eval $(call gb_Library_add_exception_objects,svt,\ - svtools/source/edit/svmedit \ - svtools/source/edit/svmedit2 \ - svtools/source/edit/textundo \ - svtools/source/edit/syntaxhighlight \ - svtools/source/edit/textwindowpeer \ - svtools/source/edit/sychconv \ - svtools/source/edit/xtextedt \ - svtools/source/edit/txtattr \ - svtools/source/edit/textdoc \ - svtools/source/edit/texteng \ - svtools/source/edit/textdata \ - svtools/source/edit/editsyntaxhighlighter \ - svtools/source/edit/textview \ - svtools/source/urlobj/inetimg \ - svtools/source/java/javainteractionhandler \ - svtools/source/java/javacontext \ - svtools/source/svhtml/htmlout \ - svtools/source/svhtml/htmlsupp \ - svtools/source/svhtml/parhtml \ - svtools/source/svhtml/htmlkywd \ - svtools/source/config/itemholder2 \ - svtools/source/config/optionsdrawinglayer \ - svtools/source/config/menuoptions \ - svtools/source/config/helpopt \ - svtools/source/config/htmlcfg \ - svtools/source/config/accessibilityoptions \ - svtools/source/config/printoptions \ - svtools/source/config/miscopt \ - svtools/source/config/extcolorcfg \ - svtools/source/config/colorcfg \ - svtools/source/config/fontsubstconfig \ - svtools/source/config/apearcfg \ - svtools/source/misc/acceleratorexecute \ - svtools/source/misc/chartprettypainter \ - svtools/source/misc/cliplistener \ - svtools/source/misc/dialogclosedlistener \ - svtools/source/misc/dialogcontrolling \ - svtools/source/misc/ehdl \ - svtools/source/misc/embedhlp \ - svtools/source/misc/embedtransfer \ - svtools/source/misc/helpagentwindow \ - svtools/source/misc/imagemgr \ - svtools/source/misc/imageresourceaccess \ - svtools/source/misc/imap \ - svtools/source/misc/imap2 \ - svtools/source/misc/imap3 \ - svtools/source/misc/itemdel \ - svtools/source/misc/langtab \ - svtools/source/misc/stringtransfer \ - svtools/source/misc/svtaccessiblefactory \ - svtools/source/misc/svtdata \ - svtools/source/misc/templatefoldercache \ - svtools/source/misc/transfer2 \ - svtools/source/misc/transfer \ - svtools/source/misc/unitconv \ - svtools/source/misc/wallitem \ - svtools/source/plugapp/ttprops \ - svtools/source/control/ctrlbox \ - svtools/source/control/valueacc \ - svtools/source/control/valueset \ - svtools/source/control/taskbar \ - svtools/source/control/urlcontrol \ - svtools/source/control/scriptedtext \ - svtools/source/control/headbar \ - svtools/source/control/fileurlbox \ - svtools/source/control/fmtfield \ - svtools/source/control/collatorres \ - svtools/source/control/indexentryres \ - svtools/source/control/filectrl \ - svtools/source/control/scrwin \ - svtools/source/control/taskbox \ - svtools/source/control/hyperlabel \ - svtools/source/control/filectrl2 \ - svtools/source/control/fixedhyper \ - svtools/source/control/taskstat \ - svtools/source/control/inettbc \ - svtools/source/control/calendar \ - svtools/source/control/roadmap \ - svtools/source/control/ctrltool \ - svtools/source/control/asynclink \ - svtools/source/control/stdctrl \ - svtools/source/control/ctrldll \ - svtools/source/control/tabbar \ - svtools/source/control/ruler \ - svtools/source/control/stdmenu \ - svtools/source/control/prgsbar \ - svtools/source/control/taskmisc \ - svtools/source/dialogs/insdlg \ - svtools/source/dialogs/roadmapwizard \ - svtools/source/dialogs/mcvmath \ - svtools/source/dialogs/logindlg \ - svtools/source/dialogs/wizdlg \ - svtools/source/dialogs/addresstemplate \ - svtools/source/dialogs/printdlg \ - svtools/source/dialogs/filedlg2 \ - svtools/source/dialogs/colctrl \ - svtools/source/dialogs/colrdlg \ - svtools/source/dialogs/wizardmachine \ - svtools/source/dialogs/prnsetup \ - svtools/source/dialogs/filedlg \ - svtools/source/dialogs/property \ - svtools/source/table/tablecontrol \ - svtools/source/table/tablegeometry \ - svtools/source/table/gridtablerenderer \ - svtools/source/table/tabledatawindow \ - svtools/source/table/defaultinputhandler \ - svtools/source/table/tablecontrol_impl \ - svtools/source/contnr/svlbox \ - svtools/source/contnr/svtabbx \ - svtools/source/contnr/ivctrl \ - svtools/source/contnr/templwin \ - svtools/source/contnr/svicnvw \ - svtools/source/contnr/contentenumeration \ - svtools/source/contnr/svimpbox \ - svtools/source/contnr/imivctl1 \ - svtools/source/contnr/svtreebx \ - svtools/source/contnr/fileview \ - svtools/source/contnr/svimpicn \ - svtools/source/contnr/svlbitm \ - svtools/source/contnr/ctrdll \ - svtools/source/contnr/tooltiplbox \ - svtools/source/contnr/treelist \ - svtools/source/contnr/imivctl2 \ - svtools/source/uno/unoiface \ - svtools/source/uno/genericunodialog \ - svtools/source/uno/unocontroltablemodel \ - svtools/source/uno/contextmenuhelper \ - svtools/source/uno/toolboxcontroller \ - svtools/source/uno/generictoolboxcontroller \ - svtools/source/uno/addrtempuno \ - svtools/source/uno/miscservices \ - svtools/source/uno/statusbarcontroller \ - svtools/source/uno/svtxgridcontrol \ - svtools/source/uno/unoimap \ - svtools/source/uno/unoevent \ - svtools/source/uno/treecontrolpeer \ - svtools/source/uno/framestatuslistener \ - svtools/source/brwbox/editbrowsebox \ - svtools/source/brwbox/brwhead \ - svtools/source/brwbox/brwbox3 \ - svtools/source/brwbox/brwbox1 \ - svtools/source/brwbox/ebbcontrols \ - svtools/source/brwbox/brwbox2 \ - svtools/source/brwbox/datwin \ - svtools/source/brwbox/editbrowsebox2 \ - svtools/source/svrtf/rtfkeywd \ - svtools/source/svrtf/svparser \ - svtools/source/svrtf/parrtf \ - svtools/source/svrtf/rtfout \ - svtools/source/filter.vcl/filter/dlgepng \ - svtools/source/filter.vcl/filter/filter2 \ - svtools/source/filter.vcl/filter/FilterConfigItem \ - svtools/source/filter.vcl/filter/sgvspln \ - svtools/source/filter.vcl/filter/filter \ - svtools/source/filter.vcl/filter/sgvtext \ - svtools/source/filter.vcl/filter/sgfbram \ - svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ - svtools/source/filter.vcl/filter/dlgexpor \ - svtools/source/filter.vcl/filter/fldll \ - svtools/source/filter.vcl/filter/sgvmain \ - svtools/source/filter.vcl/filter/FilterConfigCache \ - svtools/source/filter.vcl/filter/dlgejpg \ - svtools/source/filter.vcl/wmf/winwmf \ - svtools/source/filter.vcl/wmf/winmtf \ - svtools/source/filter.vcl/wmf/emfwr \ - svtools/source/filter.vcl/wmf/wmf \ - svtools/source/filter.vcl/wmf/enhwmf \ - svtools/source/filter.vcl/wmf/wmfwr \ - svtools/source/filter.vcl/igif/decode \ - svtools/source/filter.vcl/igif/gifread \ - svtools/source/filter.vcl/ixbm/xbmread \ - svtools/source/filter.vcl/jpeg/jpeg \ - svtools/source/filter.vcl/ixpm/xpmread \ - svtools/source/graphic/descriptor \ - svtools/source/graphic/graphic \ - svtools/source/graphic/graphicunofactory \ - svtools/source/graphic/grfattr \ - svtools/source/graphic/grfcache \ - svtools/source/graphic/grfmgr \ - svtools/source/graphic/grfmgr2 \ - svtools/source/graphic/provider \ - svtools/source/graphic/renderer \ - svtools/source/graphic/transformer \ -)) - -$(eval $(call gb_Library_add_cobjects,svt,\ - svtools/source/filter.vcl/jpeg/jpegc \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,svt,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svt,\ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk deleted file mode 100644 index 88e6228b83e4..000000000000 --- a/svtools/prj/target_module_svtools.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,svtools,\ - $(call gb_AllLangResTarget_get_target,productregistration) \ - $(call gb_AllLangResTarget_get_target,svt) \ - $(call gb_Executable_get_target,bmp) \ - $(call gb_Executable_get_target,bmpsum) \ - $(call gb_Executable_get_target,g2g) \ - $(call gb_Library_get_target,hatchwindowfactory) \ - $(call gb_Library_get_target,productregistration) \ - $(call gb_Library_get_target,svt) \ - $(call gb_Package_get_target,svtools_inc) \ -)) - -$(eval $(call gb_Module_read_includes,svtools,\ - exe_bmp \ - exe_bmpsum \ - exe_g2g \ - lib_hatchwindowfactory \ - lib_productregistration \ - lib_svt \ - package_inc \ - res_productregistration \ - res_svt \ -)) - -#todo: javapatchres -#todo: jpeg on mac in svtools/util/makefile.mk -#todo: deliver errtxt.src as ehdl.srs -#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog -#todo: map file -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk deleted file mode 100644 index f47251f31590..000000000000 --- a/svtools/prj/target_package_inc.mk +++ /dev/null @@ -1,180 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk deleted file mode 100644 index af510d338c6e..000000000000 --- a/svtools/prj/target_res_productregistration.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) - -$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ - svt/productregistration \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) - -$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/svtools \ -)) - -$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ - svtools/source/productregistration/registrationdlg.src \ -)) - - diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk deleted file mode 100644 index 1e3e21b7ca6b..000000000000 --- a/svtools/prj/target_res_svt.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) - -$(eval $(call gb_AllLangResTarget_add_srs,svt,\ - svt/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) - -$(eval $(call gb_SrsTarget_set_include,svt/res,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/svtools/source/uno \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/svtools \ -)) - -$(eval $(call gb_SrsTarget_add_files,svt/res,\ - svtools/source/brwbox/editbrowsebox.src \ - svtools/source/contnr/fileview.src \ - svtools/source/contnr/svcontnr.src \ - svtools/source/contnr/templwin.src \ - svtools/source/control/calendar.src \ - svtools/source/control/ctrlbox.src \ - svtools/source/control/ctrltool.src \ - svtools/source/control/filectrl.src \ - svtools/source/dialogs/addresstemplate.src \ - svtools/source/dialogs/colrdlg.src \ - svtools/source/dialogs/filedlg2.src \ - svtools/source/dialogs/formats.src \ - svtools/source/dialogs/logindlg.src \ - svtools/source/dialogs/printdlg.src \ - svtools/source/dialogs/prnsetup.src \ - svtools/source/dialogs/so3res.src \ - svtools/source/dialogs/wizardmachine.src \ - svtools/source/filter.vcl/filter/dlgejpg.src \ - svtools/source/filter.vcl/filter/dlgepng.src \ - svtools/source/filter.vcl/filter/dlgexpor.src \ - svtools/source/filter.vcl/filter/strings.src \ - svtools/source/java/javaerror.src \ - svtools/source/misc/ehdl.src \ - svtools/source/misc/helpagent.src \ - svtools/source/misc/imagemgr.src \ - svtools/source/misc/langtab.src \ - svtools/source/misc/undo.src \ - svtools/source/plugapp/testtool.src \ - svtools/source/uno/unoifac2.src \ -)) - - -- cgit From 5fc7423878d02fac53b3140aff0d6d89fd74232d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- svtools/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 234ac49e0de37d01f777ca9f270d13e1858e6b8a Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Wed, 30 Jun 2010 09:48:27 +0200 Subject: codecleanup02: #i112685# Removed ifdefs and code for MAC --- svtools/inc/rtfout.hxx | 2 +- svtools/inc/svtools/htmlout.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx index 12a125635132..b9bfbc901848 100644 --- a/svtools/inc/rtfout.hxx +++ b/svtools/inc/rtfout.hxx @@ -41,7 +41,7 @@ class SvStream; class SVT_DLLPUBLIC RTFOutFuncs { public: -#if defined(MAC) || defined(UNX) +#if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else static const sal_Char __FAR_DATA sNewLine[]; // \015\012 diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index 888286b231ee..1a21f1154602 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -60,7 +60,7 @@ struct SVT_DLLPUBLIC HTMLOutContext struct HTMLOutFuncs { -#if defined(MAC) || defined(UNX) +#if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else static const sal_Char __FAR_DATA sNewLine[]; // \015\012 -- cgit From 839a386cb51ba43988142957c091140885a5d3f7 Mon Sep 17 00:00:00 2001 From: Malte Timmermann Date: Thu, 1 Jul 2010 09:13:15 +0200 Subject: codecleanup02: #i52551# Removed old stuff: VOS_NAMESPACE, use vos:: directly --- svtools/source/dialogs/filedlg2.cxx | 2 +- svtools/source/misc/ehdl.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools') diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index b0e77d658931..798ff87e02ac 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -347,7 +347,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn ) if ( pBtn == pHomeBtn ) { ::rtl::OUString aHomeDir; - NAMESPACE_VOS( OSecurity ) aSecurity; + vos:: OSecurity aSecurity; if ( aSecurity.getHomeDir( aHomeDir ) ) { DirEntry aFile ( aHomeDir ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index bf9e87d33a74..8834f5497e5a 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -64,7 +64,7 @@ static USHORT aWndFunc( { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); // aus den Flags die benoetigten WinBits ermitteln WinBits eBits=0; @@ -377,7 +377,7 @@ BOOL SfxErrorHandler::GetErrorString( */ { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); BOOL bRet = FALSE; rStr=String(SvtResId(RID_ERRHDL_CLASS)); @@ -454,7 +454,7 @@ BOOL SfxErrorContext::GetString(ULONG nErrId, String &rStr) } if( pMgr ) { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); ResId aResId( nResId, *pMgr ); -- cgit From bd7beb161d6fc36c3b5d653f0710df49aa5ff7f7 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 1 Jul 2010 17:18:09 +0200 Subject: vcl113: #i95420# when drawing native controls, also take their native sizes into account --- svtools/inc/svtools/svlbitm.hxx | 2 ++ svtools/source/contnr/svlbitm.cxx | 45 +++++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index c28b8d5db10c..5158c38fbd87 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -176,6 +176,8 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem USHORT nItemFlags; USHORT nImgArrOffs; USHORT nBaseOffs; + + void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 82321b53259e..bcdc21bfe9f7 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -406,7 +406,7 @@ BOOL SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry ) } void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, - SvLBoxEntry* ) + SvLBoxEntry* pEntry ) { DBG_CHKTHIS(SvLBoxButton,0); USHORT nIndex = eKind == SvLBoxButtonKind_staticImage @@ -422,10 +422,13 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, if( rDev.GetOutDevType() == OUTDEV_WINDOW ) pWin = (Window*) &rDev; - if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL) ) + ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; + if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) ) { + Size aSize(pData->Width(), pData->Height()); + ImplAdjustBoxSize( aSize, eCtrlType, pWin ); ImplControlValue aControlValue; - Region aCtrlRegion( Rectangle(rPos, Size(pData->Width(), pData->Height())) ); + Region aCtrlRegion( Rectangle( rPos, aSize ) ); ControlState nState = 0; //states CTRL_STATE_DEFAULT, CTRL_STATE_PRESSED and CTRL_STATE_ROLLOVER are not implemented @@ -459,13 +462,47 @@ void SvLBoxButton::Clone( SvLBoxItem* pSource ) pData = ((SvLBoxButton*)pSource)->pData; } +void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Window* i_pParent ) +{ + if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) ) + { + ImplControlValue aControlValue; + Region aCtrlRegion( Rectangle( Point( 0, 0 ), io_rSize ) ); + ControlState nState = CTRL_STATE_ENABLED; + + aControlValue.setTristateVal( BUTTONVALUE_ON ); + + Region aNativeBounds, aNativeContent; + bool bNativeOK = i_pParent->GetNativeControlRegion( i_eType, + PART_ENTIRE_CONTROL, + aCtrlRegion, + nState, + aControlValue, + rtl::OUString(), + aNativeBounds, + aNativeContent ); + if( bNativeOK ) + { + Size aContentSize( aNativeContent.GetBoundRect().GetSize() ); + // leave a little space around the box image (looks better + if( aContentSize.Height() + 2 > io_rSize.Height() ) + io_rSize.Height() = aContentSize.Height() + 2; + } + } +} + void SvLBoxButton::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) { DBG_CHKTHIS(SvLBoxButton,0); if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); - pViewData->aSize = Size( pData->Width(), pData->Height() ); + Size aSize( pData->Width(), pData->Height() ); + + ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; + if ( eKind != SvLBoxButtonKind_staticImage && pView ) + ImplAdjustBoxSize( aSize, eCtrlType, pView ); + pViewData->aSize = aSize; } bool SvLBoxButton::CheckModification() const -- cgit From 959ca18eeb1d4b8f0b5ec5e2c0bd8558db4f18db Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 1 Jul 2010 20:17:02 +0200 Subject: vcl113: small cleanup --- svtools/source/contnr/svlbitm.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'svtools') diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index bcdc21bfe9f7..633cdc903ef6 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -418,15 +418,11 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, //Native drawing /// BOOL bNativeOK = FALSE; - Window *pWin = NULL; - if( rDev.GetOutDevType() == OUTDEV_WINDOW ) - pWin = (Window*) &rDev; - ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; - if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) ) + if ( nIndex != SV_BMP_STATICIMAGE && rDev.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) ) { Size aSize(pData->Width(), pData->Height()); - ImplAdjustBoxSize( aSize, eCtrlType, pWin ); + ImplAdjustBoxSize( aSize, eCtrlType, &rDev ); ImplControlValue aControlValue; Region aCtrlRegion( Rectangle( rPos, aSize ) ); ControlState nState = 0; @@ -442,7 +438,7 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, else if ( IsStateTristate() ) aControlValue.setTristateVal( BUTTONVALUE_MIXED ); - bNativeOK = pWin->DrawNativeControl( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL, + bNativeOK = rDev.DrawNativeControl( eCtrlType, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, rtl::OUString() ); } -- cgit From 32c76a4434c49e687c0a6e955f521586f9c75be5 Mon Sep 17 00:00:00 2001 From: Caol?n McNamara Date: Tue, 6 Jul 2010 11:54:12 +0100 Subject: cmcfixes76: #i112969# WaE --- svtools/source/uno/toolboxcontroller.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 92ae93f5080d..bdb2256a07e8 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -806,7 +806,7 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::u { case TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE: { - sal_Bool aNewValue; + sal_Bool aNewValue(sal_False); aValue >>= aNewValue; if (aNewValue != m_bSupportVisiable) { -- cgit From f4e0343a4dc083f8c255cf40f567e635e6fe7eaf Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 7 Jul 2010 18:09:58 +0200 Subject: CWS gnumake2: fixing all module makefiles (copy from tools) --- svtools/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'svtools') diff --git a/svtools/Makefile b/svtools/Makefile index 60d34122e271..b198cc3d4c32 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,13 +25,10 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From 7ae66cbe2015930650f7d3b90695a0d331f618d2 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 8 Jul 2010 13:00:42 +0200 Subject: fix a warning --- svtools/source/contnr/svlbitm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 633cdc903ef6..53c15c5c2601 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -406,7 +406,7 @@ BOOL SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry ) } void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, - SvLBoxEntry* pEntry ) + SvLBoxEntry* /*pEntry*/ ) { DBG_CHKTHIS(SvLBoxButton,0); USHORT nIndex = eKind == SvLBoxButtonKind_staticImage -- cgit From 13650e71469d579a91f3de3eefa977e825567b57 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 8 Jul 2010 13:58:34 +0200 Subject: CWS gnumake2: using gnu make directly from build.pl --- svtools/prj/build.lst | 29 ++--------------------------- svtools/prj/gbuild.lst | 4 ---- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 svtools/prj/gbuild.lst (limited to 'svtools') diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index 4b2cd9f9b26b..17542856e75c 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,29 +1,4 @@ st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL -st svtools\source\graphic nmake - all st_svtgraphic st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL -st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\util nmake - all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL -st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/gbuild.lst b/svtools/prj/gbuild.lst deleted file mode 100644 index 17542856e75c..000000000000 --- a/svtools/prj/gbuild.lst +++ /dev/null @@ -1,4 +0,0 @@ -st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL -st svtools usr1 - all st_mkout NULL -st svtools\prj nmake - all st_prj NULL - -- cgit From 22e9afcab567030e0b1d029400dd85851b2d86e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- svtools/inc/svtools/helpid.hrc | 116 ++++++++++++++--------------- svtools/source/contnr/templwin.cxx | 6 +- svtools/source/control/inettbc.cxx | 3 +- svtools/source/dialogs/addresstemplate.cxx | 3 +- svtools/source/dialogs/filedlg2.cxx | 63 ++++++---------- svtools/source/dialogs/wizardmachine.cxx | 6 +- svtools/source/misc/helpagentwindow.cxx | 3 +- 7 files changed, 86 insertions(+), 114 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 1ffb7a99fb32..3c9a38d94bff 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -34,84 +34,84 @@ // Help-Ids -------------------------------------------------------------- -#define HID_FILEDLG_OPENDLG (HID_SVTOOLS_START + 0) -#define HID_FILEDLG_PATHDLG (HID_SVTOOLS_START + 1) -#define HID_FILEDLG_DIR (HID_SVTOOLS_START + 2) -#define HID_FILEDLG_EDIT (HID_SVTOOLS_START + 3) -#define HID_FILEDLG_DIRS (HID_SVTOOLS_START + 4) -#define HID_FILEDLG_DRIVE (HID_SVTOOLS_START + 5) -#define HID_FILEDLG_DRIVES (HID_SVTOOLS_START + 6) -#define HID_FILEDLG_NEWDIR (HID_SVTOOLS_START + 7) -#define HID_FILEDLG_HOME (HID_SVTOOLS_START + 8) -#define HID_FILEDLG_FILE (HID_SVTOOLS_START + 9) -#define HID_FILEDLG_FILES (HID_SVTOOLS_START + 10) -#define HID_FILEDLG_PATH (HID_SVTOOLS_START + 11) -#define HID_FILEDLG_TYPE (HID_SVTOOLS_START + 12) -#define HID_FILEDLG_TYPES (HID_SVTOOLS_START + 13) +#define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" +#define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" +#define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" +#define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT" +#define HID_FILEDLG_DIRS "SVT_HID_FILEDLG_DIRS" +#define HID_FILEDLG_DRIVE "SVT_HID_FILEDLG_DRIVE" +#define HID_FILEDLG_DRIVES "SVT_HID_FILEDLG_DRIVES" +#define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR" +#define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME" +#define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE" +#define HID_FILEDLG_FILES "SVT_HID_FILEDLG_FILES" +#define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" +#define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" +#define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" // HelpID's fuer die Textkomponente -#define HID_TEXTCPNT_OPEN_LINK (HID_SVTOOLS_START + 14) -#define HID_TEXTCPNT_OPEN_LINK_NEW (HID_SVTOOLS_START + 15) -#define HID_TEXTCPNT_DOWNLOAD (HID_SVTOOLS_START + 16) -#define HID_TEXTCPNT_ADD_BOOKMARK (HID_SVTOOLS_START + 17) -#define HID_TEXTCPNT_COPY_LINK (HID_SVTOOLS_START + 18) +#define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" +#define HID_TEXTCPNT_OPEN_LINK_NEW "SVT_HID_TEXTCPNT_OPEN_LINK_NEW" +#define HID_TEXTCPNT_DOWNLOAD "SVT_HID_TEXTCPNT_DOWNLOAD" +#define HID_TEXTCPNT_ADD_BOOKMARK "SVT_HID_TEXTCPNT_ADD_BOOKMARK" +#define HID_TEXTCPNT_COPY_LINK "SVT_HID_TEXTCPNT_COPY_LINK" // HelpID's fuer RegisterDialog -#define HID_LIMITED_DIALOG (HID_SVTOOLS_START + 20) +#define HID_LIMITED_DIALOG "SVT_HID_LIMITED_DIALOG" // Help ids of template dialog -#define HID_TEMPLATEDLG_DIALOG (HID_SVTOOLS_START + 21) -#define HID_TEMPLATEDLG_ICONCTRL (HID_SVTOOLS_START + 22) -#define HID_TEMPLATEDLG_FILEVIEW (HID_SVTOOLS_START + 23) -#define HID_TEMPLATEDLG_TB_BACK (HID_SVTOOLS_START + 24) -#define HID_TEMPLATEDLG_TB_PREV (HID_SVTOOLS_START + 25) -#define HID_TEMPLATEDLG_TB_PRINT (HID_SVTOOLS_START + 26) -#define HID_TEMPLATEDLG_TB_DOCINFO (HID_SVTOOLS_START + 27) -#define HID_TEMPLATEDLG_TB_PREVIEW (HID_SVTOOLS_START + 28) +#define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG" +#define HID_TEMPLATEDLG_ICONCTRL "SVT_HID_TEMPLATEDLG_ICONCTRL" +#define HID_TEMPLATEDLG_FILEVIEW "SVT_HID_TEMPLATEDLG_FILEVIEW" +#define HID_TEMPLATEDLG_TB_BACK "SVT_HID_TEMPLATEDLG_TB_BACK" +#define HID_TEMPLATEDLG_TB_PREV "SVT_HID_TEMPLATEDLG_TB_PREV" +#define HID_TEMPLATEDLG_TB_PRINT "SVT_HID_TEMPLATEDLG_TB_PRINT" +#define HID_TEMPLATEDLG_TB_DOCINFO "SVT_HID_TEMPLATEDLG_TB_DOCINFO" +#define HID_TEMPLATEDLG_TB_PREVIEW "SVT_HID_TEMPLATEDLG_TB_PREVIEW" -#define HID_ADDRTEMPL_FIELD_ASSIGNMENT (HID_SVTOOLS_START + 29) +#define HID_ADDRTEMPL_FIELD_ASSIGNMENT "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT" // Help ids for the filepicker dialogs -#define HID_EXPLORERDLG_FILE (HID_SVTOOLS_START + 30) +#define HID_EXPLORERDLG_FILE "SVT_HID_EXPLORERDLG_FILE" // help ids for fileview contextmenu -#define HID_FILEVIEW_MENU_DELETE (HID_SVTOOLS_START + 31) -#define HID_FILEVIEW_MENU_RENAME (HID_SVTOOLS_START + 32) +#define HID_FILEVIEW_MENU_DELETE "SVT_HID_FILEVIEW_MENU_DELETE" +#define HID_FILEVIEW_MENU_RENAME "SVT_HID_FILEVIEW_MENU_RENAME" // help ids for the different modi of the file picker dialog // FREE -#define HID_FILESAVE_LEVELUP (HID_SVTOOLS_START + 34) -#define HID_FILESAVE_CREATEDIRECTORY (HID_SVTOOLS_START + 35) -#define HID_FILESAVE_DEFAULTDIRECTORY (HID_SVTOOLS_START + 36) -#define HID_FILESAVE_FILEVIEW (HID_SVTOOLS_START + 37) -#define HID_FILESAVE_TEMPLATE (HID_SVTOOLS_START + 38) -#define HID_FILESAVE_FILEURL (HID_SVTOOLS_START + 39) -#define HID_FILESAVE_FILETYPE (HID_SVTOOLS_START + 40) -#define HID_FILESAVE_DOSAVE (HID_SVTOOLS_START + 41) -#define HID_FILESAVE_AUTOEXTENSION (HID_SVTOOLS_START + 42) -#define HID_FILESAVE_SAVEWITHPASSWORD (HID_SVTOOLS_START + 43) -#define HID_FILESAVE_CUSTOMIZEFILTER (HID_SVTOOLS_START + 44) -#define HID_FILESAVE_SELECTION (HID_SVTOOLS_START + 45) -#define HID_FILESAVE_DIALOG (HID_SVTOOLS_START + 46) -#define HID_FILESAVE_DOPLAY (HID_SVTOOLS_START + 47) - -#define HID_FILEOPEN_READONLY (HID_SVTOOLS_START + 48) -#define HID_FILEOPEN_VERSION (HID_SVTOOLS_START + 49) -#define HID_FILEOPEN_IMAGE_TEMPLATE (HID_SVTOOLS_START + 50) - -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) +#define HID_FILESAVE_LEVELUP "SVT_HID_FILESAVE_LEVELUP" +#define HID_FILESAVE_CREATEDIRECTORY "SVT_HID_FILESAVE_CREATEDIRECTORY" +#define HID_FILESAVE_DEFAULTDIRECTORY "SVT_HID_FILESAVE_DEFAULTDIRECTORY" +#define HID_FILESAVE_FILEVIEW "SVT_HID_FILESAVE_FILEVIEW" +#define HID_FILESAVE_TEMPLATE "SVT_HID_FILESAVE_TEMPLATE" +#define HID_FILESAVE_FILEURL "SVT_HID_FILESAVE_FILEURL" +#define HID_FILESAVE_FILETYPE "SVT_HID_FILESAVE_FILETYPE" +#define HID_FILESAVE_DOSAVE "SVT_HID_FILESAVE_DOSAVE" +#define HID_FILESAVE_AUTOEXTENSION "SVT_HID_FILESAVE_AUTOEXTENSION" +#define HID_FILESAVE_SAVEWITHPASSWORD "SVT_HID_FILESAVE_SAVEWITHPASSWORD" +#define HID_FILESAVE_CUSTOMIZEFILTER "SVT_HID_FILESAVE_CUSTOMIZEFILTER" +#define HID_FILESAVE_SELECTION "SVT_HID_FILESAVE_SELECTION" +#define HID_FILESAVE_DIALOG "SVT_HID_FILESAVE_DIALOG" +#define HID_FILESAVE_DOPLAY "SVT_HID_FILESAVE_DOPLAY" + +#define HID_FILEOPEN_READONLY "SVT_HID_FILEOPEN_READONLY" +#define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" +#define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" + +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" // uniqueid for the helpagent window (testtool) -#define HID_HELPAGENT_WINDOW (HID_SVTOOLS_START + 51) +#define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" // registration dialog -#define HID_REGISTRATION_DIALOG (HID_SVTOOLS_START + 52) +#define HID_REGISTRATION_DIALOG "SVT_HID_REGISTRATION_DIALOG" -#define HID_PRINTDIALOG_TOFILE (HID_SVTOOLS_START + 53) +#define HID_PRINTDIALOG_TOFILE "SVT_HID_PRINTDIALOG_TOFILE" -#define HID_WIZARD_NEXT (HID_SVTOOLS_START + 54) -#define HID_WIZARD_PREVIOUS (HID_SVTOOLS_START + 55) +#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT" +#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS" #endif diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 578150967727..47b5ab9aa4b9 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -346,8 +346,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : aDummyHeaderBar.Show(); aIconCtrl.SetAccessibleName( String( RTL_CONSTASCII_USTRINGPARAM("Groups") ) ); - // FIMXE: HELPID - aIconCtrl.SetHelpId( "" /*HID_TEMPLATEDLG_ICONCTRL*/ ); + aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL ); aIconCtrl.SetChoiceWithCursor( TRUE ); aIconCtrl.SetSelectionMode( SINGLE_SELECTION ); aIconCtrl.Show(); @@ -610,8 +609,7 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) : { aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP ); - // FIXME: HELPID - aFileView.SetHelpId( "" /*HID_TEMPLATEDLG_FILEVIEW*/ ); + aFileView.SetHelpId( HID_TEMPLATEDLG_FILEVIEW ); aFileView.Show(); aFileView.SetPosPixel( Point( 0, 0 ) ); aFileView.EnableAutoResize(); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 85325911114f..6781efc070fe 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -858,8 +858,7 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - // FIXME: HELPID - SetHelpId( ""/*SID_OPENURL*/ ); + SetHelpId( ".uno:OpenURL" ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 82b8cd2c5c04..2849ddb71d10 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -609,8 +609,7 @@ void AssignmentPersistentData::Commit() m_pImpl->pFields[row * 2 + column]->SetDropDownLineCount(15); m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect)); - // FIXME: HELPID - m_pImpl->pFields[row * 2 + column]->SetHelpId( "" /*HID_ADDRTEMPL_FIELD_ASSIGNMENT*/); + m_pImpl->pFields[row * 2 + column]->SetHelpId(HID_ADDRTEMPL_FIELD_ASSIGNMENT); } } diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 1f6af3f36660..86ad4f40ecd3 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -132,8 +132,7 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pNewDirBtn->Enable( bCreateDir ); } - // FIXME: HELPID - pDlg->SetHelpId( ""/*HID_FILEDLG_PATHDLG*/ ); + pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); @@ -174,35 +173,29 @@ void ImpPathDialog::InitControls() long nH = 0; UniString aEmptyStr; - // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - // FIXME: HELPID - INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), ""/*HID_FILEDLG_EDIT*/ ); + INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT ); aPnt.Y() += aEDSiz.Height() + a3Siz.Height(); #ifndef UNX long nLbH2 = pDlg->LogicToPixel( Size( 0, 60 ), MAP_APPFONT ).Height(); - // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS ); aPnt.Y() += nLbH1 + a6Siz.Height(); - // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); + aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES ); nH = aPnt.Y() + aEDSiz.Height() + a6Siz.Height(); #else long nNewH = nLbH1 + 3 * a3Siz.Height() + aFTSiz.Height() + aEDSiz.Height(); - // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, HID_FILEDLG_DIRS ); nH = aPnt.Y() + nNewH + a6Siz.Height(); pDriveTitle = NULL; pDriveList = NULL; @@ -238,14 +231,12 @@ void ImpPathDialog::InitControls() INITCONTROL( pCancelBtn, CancelButton, 0, aPnt, aBtnSiz, aCancelStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aNewDirStr, ""/*HID_FILEDLG_NEWDIR*/ ); + aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); #if defined(UNX) || defined(OS2) aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pHomeBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aHomeDirStr, ""/*HID_FILEDLG_HOME*/ ); + aPnt, aBtnSiz, aHomeDirStr, HID_FILEDLG_HOME ); #else pHomeBtn = NULL; #endif @@ -723,8 +714,7 @@ ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits, RESOURCE_TYPE if ( nType == WINDOW_FILEDIALOG ) InitControls(); - // FIXME: HELPID - pDlg->SetHelpId( ""/*HID_FILEDLG_OPENDLG*/ ); + pDlg->SetHelpId( HID_FILEDLG_OPENDLG ); } @@ -752,47 +742,36 @@ void ImpFileDialog::InitControls() const int nW = 160; const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen - // FIXME: HELPID INITCONTROL( pFileTitel, FixedText, 0, - Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), ""/*HID_FILEDLG_FILE*/ ); - // FIXME: HELPID + Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), HID_FILEDLG_FILE ); INITCONTROL( pEdit, Edit, WB_BORDER, - Point(10, 31), Size(nW, 20), aEmptyStr, ""/*HID_FILEDLG_EDIT*/ ); // aMask() - // FIXME: HELPID + Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask() INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER, - Point(10, 58), Size(nW, 180-nH), aEmptyStr, ""/*HID_FILEDLG_FILES*/ ); + Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES ); - // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); - // FIXME: HELPID + Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); INITCONTROL( pDirPath, FixedInfo, WB_PATHELLIPSIS, - Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), ""/*HID_FILEDLG_PATH*/ ); - // FIXME: HELPID + Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), HID_FILEDLG_PATH ); INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, HID_FILEDLG_DIRS ); - // FIXME: HELPID INITCONTROL( pTypeTitel, FixedText, 0, - Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), ""/*HID_FILEDLG_TYPE*/ ); + Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), HID_FILEDLG_TYPE ); #ifndef UNX - // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); - // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); - // FIXME: HELPID + Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); + Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_DRIVES ); pNewDirBtn = NULL; pHomeBtn = NULL; #else - // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); pDriveTitle = NULL; pDriveList = NULL; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 24c68a9cdb00..393509734a62 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -177,8 +177,7 @@ namespace svt if (_nButtonFlags & WZB_PREVIOUS) { m_pPrevPage = new PushButton(this, WB_TABSTOP); - // FIXME: HELPID - m_pPrevPage->SetHelpId( "" /*HID_WIZARD_PREVIOUS*/ ); + m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); m_pPrevPage->Show(); @@ -195,8 +194,7 @@ namespace svt if (_nButtonFlags & WZB_NEXT) { m_pNextPage = new PushButton(this, WB_TABSTOP); - // FIXME: HELPID - m_pNextPage->SetHelpId( "" /*HID_WIZARD_NEXT*/ ); + m_pNextPage->SetHelpId( HID_WIZARD_NEXT ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); m_pNextPage->Show(); diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 930d3412c632..55800a213a2e 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -109,8 +109,7 @@ namespace svt AlwaysEnableInput( TRUE, TRUE ); // unique id for the testtool - // FIXME: HELPID - SetUniqueId( ""/*HID_HELPAGENT_WINDOW*/ ); + SetUniqueId( HID_HELPAGENT_WINDOW ); } //-------------------------------------------------------------------- -- cgit From 0d57686448dd908fad2650f6eee75482a27c9b6a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 16:10:51 +0200 Subject: CWS changehid: #i111784#: remove superfluous PatchResIds --- svtools/inc/svtools/svtdata.hxx | 17 +--- svtools/source/java/javainteractionhandler.cxx | 109 +++---------------------- svtools/source/misc/svtdata.cxx | 18 ---- 3 files changed, 11 insertions(+), 133 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 9faadaff7305..cf3c259e3e31 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -40,11 +40,10 @@ class ImpSvtData public: SfxItemDesruptorList_Impl * pItemDesruptList; ResMgr * pResMgr; - ResMgr * pPatchResMgr; private: ImpSvtData(): - pItemDesruptList(0), pResMgr(0), pPatchResMgr(0) + pItemDesruptList(0), pResMgr(0) {} ~ImpSvtData(); @@ -52,24 +51,10 @@ private: public: ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - ResMgr * GetPatchResMgr(); - ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); static ImpSvtData & GetSvtData(); }; -//============================================================================ - -class SvpResId: public ResId -{ -public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - class SvtResId: public ResId { diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index ec34ed07f25d..499d2c1f502c 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -147,28 +147,10 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // No suitable JRE found vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaNotFound_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND); - SvpResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - SvpResId pidString(STR_WARNING_JAVANOTFOUND); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); - + WarningBox aWarningBox( NULL, SvtResId(WARNINGBOX_JAVANOTFOUND)); + String aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); - } else { @@ -182,25 +164,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // javavendors.xml was updated and Java has not been configured yet vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bInvalidSettings_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_INVALIDJAVASETTINGS); - SvpResId pidPatchWBX(WARNINGBOX_INVALIDJAVASETTINGS); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - SvpResId pidString(STR_WARNING_INVALIDJAVASETTINGS); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); - + WarningBox aWarningBox( NULL, SvtResId(WARNINGBOX_INVALIDJAVASETTINGS)); + String aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); } @@ -216,28 +181,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idQBX = SvtResId( QBX_JAVADISABLED ); - SvpResId pidPatchQBX(QBX_JAVADISABLED); - pidPatchQBX.SetRT(RSC_QUERYBOX); - ResMgr *pMgrQB = pidPatchQBX.GetResMgr(); - - if (pMgrQB && pMgrQB->IsAvailable(pidPatchQBX)) - idQBX = pidPatchQBX; - - QueryBox aQueryBox(NULL, idQBX); - - String aTitle; - - SvpResId pidString(STR_QUESTION_JAVADISABLED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED )); - + QueryBox aQueryBox(NULL, SvtResId( QBX_JAVADISABLED )); + String aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED )); aQueryBox.SetText( aTitle ); nResult = aQueryBox.Execute(); if ( nResult == RET_YES ) @@ -260,25 +205,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // Java not correctly installed, or damaged vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bVMCreationFailure_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_JVMCREATIONFAILED); - SvpResId pidPatchEBX(ERRORBOX_JVMCREATIONFAILED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox( NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_JVMCREATIONFAILED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED)); - + ErrorBox aErrorBox( NULL, SvtResId(ERRORBOX_JVMCREATIONFAILED)); + String aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED)); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } @@ -295,25 +223,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque //before it can be used. vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bRestartRequired_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_RESTARTREQUIRED); - SvpResId pidPatchEBX(ERRORBOX_RESTARTREQUIRED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox(NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_RESTARTREQUIRED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED)); - + ErrorBox aErrorBox(NULL, SvtResId(ERRORBOX_RESTARTREQUIRED)); + String aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED)); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 65715f635883..4d00eeca2c07 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -61,24 +61,6 @@ ResMgr * ImpSvtData::GetResMgr() return GetResMgr(Application::GetSettings().GetUILocale()); } -ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale) -{ - if (!pPatchResMgr) - { - pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale); - } - return pPatchResMgr; -} - -ResMgr * ImpSvtData::GetPatchResMgr() -{ - return GetPatchResMgr(Application::GetSettings().GetUILocale()); -} - -SvpResId::SvpResId( USHORT nId ) : - ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() ) -{ -} //============================================================================ // static -- cgit From e05c938a71a1e9698d036a8e6dae5d2a208ddd07 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- svtools/inc/svtools/helpid.hrc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 3c9a38d94bff..f19cf1a17aa3 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -28,12 +28,6 @@ #ifndef _SVT_HELPID_HRC #define _SVT_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- - #define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" #define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" #define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" -- cgit From a929816d90303defcded933ef0337f2191fa2cec Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- svtools/source/dialogs/printdlg.cxx | 8 -------- svtools/source/uno/wizard/unowizard.cxx | 14 +++++++++----- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'svtools') diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 532fd3f61bb2..dba5ed627952 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -28,26 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_APP_HXX #include -#endif -#ifndef _VCL_PRINT_HXX #include -#endif #include #include #include - #include "printdlg.hrc" #include "controldims.hrc" #include #include #include #include -#include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 8b1ac67a8cfc..3316b05fb98b 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -42,6 +42,7 @@ #include #include #include +#include //...................................................................................................................... namespace svt { namespace uno @@ -208,10 +209,11 @@ namespace svt { namespace uno static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + INetURLObject aHID( _rHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ @@ -219,7 +221,9 @@ namespace svt { namespace uno { ::rtl::OUStringBuffer aBuffer; ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - aBuffer.appendAscii( "HID:" ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + aBuffer.appendAscii( INET_HID_SCHEME ); aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } -- cgit From 74284c8e763f19cd9f7891c5c836e0a53abf06b3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 20 Jul 2010 16:48:23 +0200 Subject: CWS gnumake2: using GNUMAKE variable from configure --- svtools/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 93a3eed87acd6581f851ff92a3332de8e0ff8c29 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Jul 2010 12:48:45 +0200 Subject: gnumake2: some more checks for module makefiles --- svtools/Makefile | 10 +++++++++- svtools/prj/makefile.mk | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/Makefile b/svtools/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 9307b32be5c14515bb030afd6308acdfe7ffe011 Mon Sep 17 00:00:00 2001 From: os Date: Wed, 28 Jul 2010 12:29:06 +0200 Subject: #i84723# overlapping in ruler prevented (from gang65) --- svtools/source/control/ruler.cxx | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) mode change 100644 => 100755 svtools/source/control/ruler.cxx (limited to 'svtools') diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx old mode 100644 new mode 100755 index 6fcbd92597ba..011dd4cd7956 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -468,6 +468,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) BOOL bNoTicks = FALSE; // Groessenvorberechnung + // Sizes calculation BOOL bVertRight = FALSE; if ( mnWinStyle & WB_HORZ ) nTickWidth = aPixSize.Width(); @@ -486,19 +487,21 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) } long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width(); if ( nMaxWidth < 0 ) - nMaxWidth *= -1; + nMaxWidth = -nMaxWidth; nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit; UniString aNumStr( UniString::CreateFromInt32( nMaxWidth ) ); long nTxtWidth = GetTextWidth( aNumStr ); - if ( (nTxtWidth*2) > nTickWidth ) + + const long nTextOff = 4; + if ( nTickWidth < nTxtWidth+nTextOff ) { + // Calculate the scale of the ruler long nMulti = 1; long nOrgTick3 = nTick3; - long nTextOff = 2; while ( nTickWidth < nTxtWidth+nTextOff ) { long nOldMulti = nMulti; - if ( !nTickWidth ) + if ( !nTickWidth ) //If nTickWidth equals 0 nMulti *= 10; else if ( nMulti < 10 ) nMulti++; @@ -516,8 +519,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) bNoTicks = TRUE; break; } - if ( nMulti >= 100 ) - nTextOff = 4; + nTick3 = nOrgTick3 * nMulti; aPixSize = maVirDev.LogicToPixel( Size( nTick3, nTick3 ), maMapMode ); if ( mnWinStyle & WB_HORZ ) @@ -541,7 +543,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) { if ( nStart > nMin ) { - // Nur 0 malen, wenn Margin1 nicht gleich dem NullPunkt ist + // 0 is only painted when Margin1 is not equal to zero if ( (mpData->nMargin1Style & RULER_STYLE_INVISIBLE) || (mpData->nMargin1 != 0) ) { aNumStr = (sal_Unicode)'0'; @@ -564,7 +566,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) else n = aPixSize.Height(); - // Tick3 - Ausgabe (Text) + // Tick3 - Output (Text) if ( !(nTick % nTick3) ) { aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit ); @@ -573,7 +575,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) nX = nStart+n; //different orientation needs a different starting position nY = bVertRight ? nCenter+nTxtHeight2 : nCenter-nTxtHeight2; - if ( nX < nMax ) + + // Check if we can display full number + if ( nX < (nMax-nTxtWidth2) ) { if ( mnWinStyle & WB_HORZ ) nX -= nTxtWidth2; @@ -582,7 +586,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) ImplVDrawText( nX, nY, aNumStr ); } nX = nStart-n; - if ( nX > nMin ) + if ( nX > (nMin+nTxtWidth2) ) { if ( mnWinStyle & WB_HORZ ) nX -= nTxtWidth2; @@ -591,7 +595,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) ImplVDrawText( nX, nY, aNumStr ); } } - // Tick/Tick2 - Ausgabe (Striche) + // Tick/Tick2 - Output (Strokes) else { if ( !(nTick % aImplRulerUnitTab[mnUnitIndex].nTick2) ) @@ -1258,7 +1262,7 @@ void Ruler::ImplFormat() Size aVirDevSize; BOOL b3DLook = !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO); - // VirtualDevice initialisieren + // VirtualDevice initialize if ( mnWinStyle & WB_HORZ ) { aVirDevSize.Width() = mnVirWidth; @@ -1387,15 +1391,15 @@ void Ruler::ImplFormat() if ( nP2 < nVirRight ) nMax--; - // Beschriftung ausgeben + // Draw captions ImplDrawTicks( nMin, nMax, nStart, nCenter ); } - // Spalten ausgeben + // Draw borders if ( mpData->pBorders ) ImplDrawBorders( nVirLeft, nP2, nVirTop, nVirBottom ); - // Einzuege ausgeben + // Draw indents if ( mpData->pIndents ) ImplDrawIndents( nVirLeft, nP2, nVirTop-1, nVirBottom+1 ); @@ -2888,7 +2892,7 @@ void Ruler::SetMargin2( long nPos, USHORT nMarginStyle ) void Ruler::SetLines( USHORT n, const RulerLine* pLineAry ) { - // Testen, ob sich was geaendert hat + // To determine if what has changed if ( mpData->nLines == n ) { USHORT i = n; @@ -2907,18 +2911,18 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry ) return; } - // Neue Werte setzen und neu ausgeben + // New values and new share issue BOOL bMustUpdate; if ( IsReallyVisible() && IsUpdateMode() ) bMustUpdate = TRUE; else bMustUpdate = FALSE; - // Alte Linien loeschen + // Delete old lines if ( bMustUpdate ) ImplInvertLines(); - // Neue Daten setzen + // New data set if ( !n || !pLineAry ) { if ( !mpData->pLines ) -- cgit From c80e8fd6f78dfc860f67c0b72481066eff3ce8c1 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 29 Jul 2010 20:08:54 +0200 Subject: vmiklos01: #i113532# add defines for new rtf keywords --- svtools/inc/rtfkeywd.hxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'svtools') diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx index 5ccd9149bd68..60963c58abbc 100644 --- a/svtools/inc/rtfkeywd.hxx +++ b/svtools/inc/rtfkeywd.hxx @@ -39,6 +39,7 @@ #define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" #define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" #define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" +#define OOO_STRING_SVTOOLS_RTF_ATNDATE "\\atndate" #define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" #define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" #define OOO_STRING_SVTOOLS_RTF_B "\\b" @@ -976,12 +977,15 @@ #define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" #define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" #define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" +#define OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE "\\shpbxignore" #define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" #define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" #define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" +#define OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE "\\shpbyignore" #define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" #define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" #define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" +#define OOO_STRING_SVTOOLS_RTF_SHPINST "\\shpinst" #define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" #define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" #define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" @@ -993,6 +997,7 @@ #define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" #define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" #define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" +#define OOO_STRING_SVTOOLS_RTF_SP "\\sp" #define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" #define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" #define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" @@ -1138,4 +1143,11 @@ #define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" #define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" +// Support for nested tables +#define OOO_STRING_SVTOOLS_RTF_ITAP "\\itap" +#define OOO_STRING_SVTOOLS_RTF_NESTCELL "\\nestcell" +#define OOO_STRING_SVTOOLS_RTF_NESTTABLEPROPRS "\\nesttableprops" +#define OOO_STRING_SVTOOLS_RTF_NESTROW "\\nestrow" +#define OOO_STRING_SVTOOLS_RTF_NONESTTABLES "\\nonesttables" + #endif // _RTFKEYWD_HXX -- cgit From deee1f03fb16af83c642121a5682af3398d90ece Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 30 Jul 2010 13:29:03 +0200 Subject: DEV300 masterfix: #i10000# fix merge problem --- svtools/source/contnr/svlbitm.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index ab5a71d88c32..d260f984c2b0 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -463,12 +463,12 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) ) { ImplControlValue aControlValue; - Region aCtrlRegion( Rectangle( Point( 0, 0 ), io_rSize ) ); + Rectangle aCtrlRegion( Point( 0, 0 ), io_rSize ); ControlState nState = CTRL_STATE_ENABLED; aControlValue.setTristateVal( BUTTONVALUE_ON ); - Region aNativeBounds, aNativeContent; + Rectangle aNativeBounds, aNativeContent; bool bNativeOK = i_pParent->GetNativeControlRegion( i_eType, PART_ENTIRE_CONTROL, aCtrlRegion, @@ -479,7 +479,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo aNativeContent ); if( bNativeOK ) { - Size aContentSize( aNativeContent.GetBoundRect().GetSize() ); + Size aContentSize( aNativeContent.GetSize() ); // leave a little space around the box image (looks better if( aContentSize.Height() + 2 > io_rSize.Height() ) io_rSize.Height() = aContentSize.Height() + 2; -- cgit From af820cae74c9fc08d7da6c304aec432c23cc8811 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 30 Jul 2010 12:58:40 +0100 Subject: cmcfixes77: #i113543# automatic icons in menus entry stuck --- svtools/source/config/menuoptions.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 70d9d1623ef2..2e63be347fbe 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -314,8 +314,15 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) // We need values from ALL notified configuration keys. DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); - sal_Bool bMenuIcons = true; - sal_Bool bSystemMenuIcons = true; + sal_Bool bMenuIcons = sal_True; + sal_Bool bSystemMenuIcons = sal_True; + if (m_nMenuIcons == 2) + bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus()); + else + { + bSystemMenuIcons = sal_False; + bMenuIcons = m_nMenuIcons ? sal_True : sal_False; + } // Step over list of property names and get right value from coreesponding value list to set it on internal members! sal_Int32 nCount = seqPropertyNames.getLength(); -- cgit From 9c3d0de22682058f525c69e2caca7a9fbace452a Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 9 Aug 2010 17:09:53 +0200 Subject: vcl114: #i113753# fix ResId assertion --- svtools/source/java/javainteractionhandler.cxx | 27 +++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'svtools') diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index ec34ed07f25d..2d1112d54d49 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -150,20 +150,25 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque //We first try to get the patch resource svp680xxx.res //If the resource is not found then svt680xxx.res is used ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND); - SvpResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; + ResMgr* pPatchMgr = ImpSvtData::GetSvtData().GetPatchResMgr(); + if( pPatchMgr ) + { + ResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND, *pPatchMgr); + pidPatchWBX.SetRT(RSC_WARNINGBOX); + if ( pPatchMgr->IsAvailable(pidPatchWBX)) + idWBX = pidPatchWBX; + } WarningBox aWarningBox( NULL, idWBX); String aTitle; - SvpResId pidString(STR_WARNING_JAVANOTFOUND); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else + if( pPatchMgr ) + { + ResId pidString(STR_WARNING_JAVANOTFOUND, *pPatchMgr); + pidString.SetRT(RSC_STRING); + if( pPatchMgr->IsAvailable(pidString)) + aTitle = String(pidString); + } + if( ! aTitle.Len() ) aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); aWarningBox.SetText( aTitle ); -- cgit From a9c8d32d6f96b327b2e8e46eadd6a7c454c02f9b Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 9 Aug 2010 17:39:22 +0200 Subject: vcl114: #i113755# remove unused svp resource --- svtools/inc/svtools/svtdata.hxx | 16 +--- svtools/source/java/javainteractionhandler.cxx | 108 +++---------------------- svtools/source/misc/svtdata.cxx | 19 ----- 3 files changed, 11 insertions(+), 132 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 9faadaff7305..1501afbb6157 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -40,11 +40,10 @@ class ImpSvtData public: SfxItemDesruptorList_Impl * pItemDesruptList; ResMgr * pResMgr; - ResMgr * pPatchResMgr; private: ImpSvtData(): - pItemDesruptList(0), pResMgr(0), pPatchResMgr(0) + pItemDesruptList(0), pResMgr(0) {} ~ImpSvtData(); @@ -52,25 +51,12 @@ private: public: ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - ResMgr * GetPatchResMgr(); - ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); static ImpSvtData & GetSvtData(); }; //============================================================================ -class SvpResId: public ResId -{ -public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - - class SvtResId: public ResId { public: diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 2d1112d54d49..dc01de750b06 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -147,29 +147,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // No suitable JRE found vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaNotFound_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND); - ResMgr* pPatchMgr = ImpSvtData::GetSvtData().GetPatchResMgr(); - if( pPatchMgr ) - { - ResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND, *pPatchMgr); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - if ( pPatchMgr->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - } - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - if( pPatchMgr ) - { - ResId pidString(STR_WARNING_JAVANOTFOUND, *pPatchMgr); - pidString.SetRT(RSC_STRING); - if( pPatchMgr->IsAvailable(pidString)) - aTitle = String(pidString); - } - if( ! aTitle.Len() ) - aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); + WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) ); + String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) ); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); @@ -187,24 +166,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // javavendors.xml was updated and Java has not been configured yet vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bInvalidSettings_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_INVALIDJAVASETTINGS); - SvpResId pidPatchWBX(WARNINGBOX_INVALIDJAVASETTINGS); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - SvpResId pidString(STR_WARNING_INVALIDJAVASETTINGS); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); + WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) ); + String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); @@ -221,27 +184,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idQBX = SvtResId( QBX_JAVADISABLED ); - SvpResId pidPatchQBX(QBX_JAVADISABLED); - pidPatchQBX.SetRT(RSC_QUERYBOX); - ResMgr *pMgrQB = pidPatchQBX.GetResMgr(); - - if (pMgrQB && pMgrQB->IsAvailable(pidPatchQBX)) - idQBX = pidPatchQBX; - - QueryBox aQueryBox(NULL, idQBX); - - String aTitle; - - SvpResId pidString(STR_QUESTION_JAVADISABLED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED )); + QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) ); + String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) ); aQueryBox.SetText( aTitle ); nResult = aQueryBox.Execute(); @@ -265,24 +209,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // Java not correctly installed, or damaged vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bVMCreationFailure_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_JVMCREATIONFAILED); - SvpResId pidPatchEBX(ERRORBOX_JVMCREATIONFAILED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox( NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_JVMCREATIONFAILED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED)); + ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) ); + String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) ); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); @@ -300,24 +228,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque //before it can be used. vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bRestartRequired_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_RESTARTREQUIRED); - SvpResId pidPatchEBX(ERRORBOX_RESTARTREQUIRED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox(NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_RESTARTREQUIRED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED)); + ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) ); + String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) ); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 65715f635883..7a04b3276c9f 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -61,25 +61,6 @@ ResMgr * ImpSvtData::GetResMgr() return GetResMgr(Application::GetSettings().GetUILocale()); } -ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale) -{ - if (!pPatchResMgr) - { - pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale); - } - return pPatchResMgr; -} - -ResMgr * ImpSvtData::GetPatchResMgr() -{ - return GetPatchResMgr(Application::GetSettings().GetUILocale()); -} - -SvpResId::SvpResId( USHORT nId ) : - ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() ) -{ -} - //============================================================================ // static ImpSvtData & ImpSvtData::GetSvtData() -- cgit From 55d4534fea590f636abda2d4c5352e498fcdb4a9 Mon Sep 17 00:00:00 2001 From: sj Date: Fri, 13 Aug 2010 17:20:35 +0200 Subject: pdfprint: #i113625# using GraphicProvider instead of svtools filter --- svtools/inc/svtools/filter.hxx | 56 +-- svtools/source/filter.vcl/filter/filter2.cxx | 591 ++++++++++++--------------- 2 files changed, 258 insertions(+), 389 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index 49ec77adfea5..8c6f014d4219 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -134,16 +134,6 @@ class Graphic; #define GFF_EMF ( (USHORT)0x00f8 ) #define GFF_XXX ( (USHORT)0xffff ) -// --------------- -// - RequestInfo - -// --------------- - -struct RequestInfo -{ - BYTE* pBuffer; - ULONG nRealBufferSize; -}; - // --------------------- // - GraphicDescriptor - // --------------------- @@ -151,29 +141,18 @@ struct RequestInfo class SVT_DLLPUBLIC GraphicDescriptor { SvStream* pFileStm; - Link aReqLink; + String aPathExt; Size aPixSize; Size aLogSize; - SvStream* pMemStm; - SvStream* pBaseStm; - ULONG nStmPos; USHORT nBitsPerPixel; USHORT nPlanes; USHORT nFormat; BOOL bCompressed; - BOOL bDataReady; - BOOL bLinked; - BOOL bLinkChanged; - BOOL bWideSearch; - BOOL bBaseStm; - long nExtra1; - long nExtra2; + BOOL bOwnStream; void ImpConstruct(); -//#if 0 // _SOLAR__PRIVATE - BOOL ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ); BOOL ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ); BOOL ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ); @@ -199,27 +178,11 @@ class SVT_DLLPUBLIC GraphicDescriptor BOOL ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo ); BOOL ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo ); -//#endif - GraphicDescriptor( const GraphicDescriptor& ); GraphicDescriptor& operator=( const GraphicDescriptor& ); -protected: - - BOOL IsDataReady() const; - BOOL IsWideSearch() const; - SvStream& GetSearchStream() const; - const String& GetPathExtension() const; - public: - // Default-Ctor, um anschliessend einen Link zu setzen, mit dem - // die Daten vom Aufrufer im ::Detect() angefordert werden. - // da einige Formate ( Mtf's ) keinen eindeutigen Header besitzen, - // ist es sinnvoll den vollen Filenamen (inkl. Ext. ) mitanzugeben, - // da so das Format ueber die Extension ermittelt werden kann - GraphicDescriptor( const String* pPath = NULL ); - // Ctor, um einen Filenamen zu setzen. Es muss ::Detect() gerufen werden, // um das File zu identifizieren; // wenn das File keinen eindeutigen Header besitzt ( Mtf's ) wird das @@ -261,21 +224,6 @@ public: // zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist BOOL IsCompressed() const { return bCompressed; } - // setzt den LinkHdl zum Setzen der Bytes; - // der Handler muss einen Pointer auf die RequestInfo-Struktur - // zurueckgeben; die Anzahl der minimal zur Verfuegung zu stellenden - // Daten muss im Handler ueber ::GetRequestedByteCount() erfragt werden; - // die tatsaechlich zur Verfuegung gestellte BYTE-Anzahl - // wird in der RequestInfo-Struktur gesetzt - void SetRequestHdl( const Link& rRequestHdl ); - - // gibt den LinkHdl zum Setzen der Bytes zurueck - const Link& GetRequestHdl() const { return aReqLink; } - - // muss im ReqHdl gerufen werden, um zu erfahren, wieviele - // Bytes _mindestens_ bereitgestellt werden muessen - ULONG GetRequestedByteCount() const; - // gibt die Filternummer des Filters zurueck, // der im GraphicFilter zum Lesen dieses Formats // benoetigt wird diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index de2bef64ba6e..f8c9508363bc 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -42,29 +42,6 @@ BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG ); - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -GraphicDescriptor::GraphicDescriptor( const String* pPath ) : - pFileStm ( NULL ) -{ - ImpConstruct(); - - if ( pPath ) - { - INetURLObject aURL( *pPath, INET_PROT_FILE ); - aPathExt = aURL.GetFileExtension().toAsciiLowerCase(); - } - bLinked = TRUE; - bLinkChanged = FALSE; - bWideSearch = FALSE; -} - - /************************************************************************* |* |* @@ -73,19 +50,10 @@ GraphicDescriptor::GraphicDescriptor( const String* pPath ) : GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ), - aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ) + aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ), + bOwnStream( TRUE ) { - if ( pFileStm ) - { - nStmPos = 0; - pFileStm->Seek( nStmPos ); - bDataReady = TRUE; - } - ImpConstruct(); - - if ( pFileStm && !pFileStm->GetError() ) - bDataReady = TRUE; } /************************************************************************* @@ -95,7 +63,8 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : \************************************************************************/ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) : - pFileStm ( NULL ) + pFileStm ( &rInStream ), + bOwnStream ( FALSE ) { ImpConstruct(); @@ -104,15 +73,8 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) INetURLObject aURL( *pPath ); aPathExt = aURL.GetFileExtension().toAsciiLowerCase(); } - nStmPos = rInStream.Tell(); - pBaseStm = &rInStream; - bBaseStm = TRUE; - - if ( !pBaseStm->GetError() ) - bDataReady = TRUE; } - /************************************************************************* |* |* @@ -121,10 +83,10 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) GraphicDescriptor::~GraphicDescriptor() { - delete pFileStm; + if ( bOwnStream ) + delete pFileStm; } - /************************************************************************* |* |* @@ -134,22 +96,9 @@ GraphicDescriptor::~GraphicDescriptor() BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo ) { BOOL bRet = FALSE; - - // Link-Status ueberpruefen - if ( bLinked && bLinkChanged ) - { - DBG_ASSERT( aReqLink.IsSet(), "Wo ist der RequestHandler???" ); - pMemStm = (SvStream*) aReqLink.Call( this ); - if ( pMemStm ) - { - nStmPos = pMemStm->Tell(); - bDataReady = TRUE; - } - } - - if ( bDataReady ) + if ( pFileStm && !pFileStm->GetError() ) { - SvStream& rStm = GetSearchStream(); + SvStream& rStm = *pFileStm; UINT16 nOldFormat = rStm.GetNumberFormatInt(); if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE; @@ -175,96 +124,13 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo ) else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE; else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE; else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE; - - // diese Formate lassen sich nur bei WideSearch im gesamten - // Stream ermitteln - else if ( bWideSearch ) - { - if ( ImpDetectPCD( rStm, bExtendedInfo ) ) - bRet = TRUE; - } + else if ( ImpDetectPCD( rStm, bExtendedInfo ) ) bRet = TRUE; rStm.SetNumberFormatInt( nOldFormat ); - rStm.Seek( nStmPos ); } - return bRet; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -BOOL GraphicDescriptor::IsDataReady() const -{ - return bDataReady; -} - - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -BOOL GraphicDescriptor::IsWideSearch() const -{ - return bWideSearch; -} - - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -SvStream& GraphicDescriptor::GetSearchStream() const -{ - DBG_ASSERT( bDataReady, "Was laeuft hier falsch???" ); - - if ( bLinked ) - return *pMemStm; - else if ( bBaseStm ) - return *pBaseStm; - else - return *pFileStm; -} - - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -void GraphicDescriptor::SetRequestHdl( const Link& rRequestLink ) -{ - aReqLink = rRequestLink; - bLinkChanged = TRUE; -} - - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -ULONG GraphicDescriptor::GetRequestedByteCount() const -{ - return DATA_SIZE; -} - - -/******************************************************************************/ -/* IMP-Methoden */ -/* */ - - /************************************************************************* |* |* @@ -273,17 +139,10 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const void GraphicDescriptor::ImpConstruct() { - if ( !pFileStm ) - pFileStm = new SvStream(); nFormat = GFF_NOT; nBitsPerPixel = 0; nPlanes = 0; bCompressed = FALSE; - bDataReady = FALSE; - bLinked = FALSE; - bWideSearch = TRUE; - bBaseStm = FALSE; - pMemStm = NULL; } @@ -297,10 +156,9 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) { UINT16 nTemp16; BOOL bRet = FALSE; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rStm.Seek( nStmPos ); - rStm >> nTemp16; // OS/2-BitmapArray @@ -364,7 +222,7 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) } } } - + rStm.Seek( nStmPos ); return bRet; } @@ -382,10 +240,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) BOOL bRet = FALSE; BYTE cByte; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rStm.Seek( nStmPos ); - rStm >> n32; + if ( n32 == 0x38464947 ) { rStm >> n16; @@ -412,7 +270,7 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) } } } - + rStm.Seek( nStmPos ); return bRet; } @@ -423,125 +281,189 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) |* \************************************************************************/ +// returns the next jpeg marker, a return value of 0 represents an error +sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm ) +{ + sal_uInt8 nByte; + do + { + do + { + rStm >> nByte; + if ( rStm.IsEof() || rStm.GetError() ) // as 0 is not allowed as marker, + return 0; // we can use it as errorcode + } + while ( nByte != 0xff ); + do + { + rStm >> nByte; + if ( rStm.IsEof() || rStm.GetError() ) + return 0; + } + while( nByte == 0xff ); + } + while( nByte == 0 ); // 0xff00 represents 0xff and not a marker, + // the marker detection has to be restartet. + return nByte; +} + BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) { UINT32 nTemp32; BOOL bRet = FALSE; BYTE cByte = 0; - BOOL bM_COM; - rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - rStm.Seek( nStmPos ); + sal_Int32 nStmPos = rStm.Tell(); + rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nTemp32; - // compare upper 28 bits + // compare upper 24 bits if( 0xffd8ff00 == ( nTemp32 & 0xffffff00 ) ) { nFormat = GFF_JPG; - return TRUE; - } - - bM_COM = ( nTemp32 == 0xffd8fffe ); - if ( ( nTemp32 == 0xffd8ffe0 ) || bM_COM ) - { - if( !bM_COM ) - { - rStm.SeekRel( 2 ); - rStm >> nTemp32; - } + bRet = TRUE; - if( bM_COM || ( nTemp32 == 0x4a464946 ) ) + if ( bExtendedInfo ) { - nFormat = GFF_JPG; - bRet = TRUE; + rStm.SeekRel( -2 ); - if( bExtendedInfo ) - { - MapMode aMap; - UINT16 nTemp16; - ULONG nCount = 9; - ULONG nMax; - ULONG nResX; - ULONG nResY; - BYTE cUnit; - - // Groesse des verbleibenden Puffers ermitteln - if ( bLinked ) - nMax = static_cast< SvMemoryStream& >(rStm).GetEndOfData() - - 16; - else - nMax = DATA_SIZE - 16; - - // max. 8K - nMax = Min( nMax, (ULONG) 8192 ); + sal_uInt32 nError( rStm.GetError() ); - // Res-Unit ermitteln - rStm.SeekRel( 3 ); - rStm >> cUnit; - - // ResX ermitteln - rStm >> nTemp16; - nResX = nTemp16; + sal_Bool bScanFailure = sal_False; + sal_Bool bScanFinished = sal_False; - // ResY ermitteln - rStm >> nTemp16; - nResY = nTemp16; - - // SOF0/1-Marker finden, aber dabei - // nicht mehr als DATA_SIZE Pixel lesen, falls - // kein WideSearch - do + while( !bScanFailure && !bScanFinished && !rStm.IsEof() && !rStm.GetError() ) + { + sal_uInt8 nMarker = ImpDetectJPG_GetNextMarker( rStm ); + switch( nMarker ) { - while ( ( cByte != 0xff ) && - ( bWideSearch || ( nCount++ < nMax ) ) ) + // fixed size marker, not having a two byte length parameter + case 0xd0 : // RST0 + case 0xd1 : + case 0xd2 : + case 0xd3 : + case 0xd4 : + case 0xd5 : + case 0xd6 : + case 0xd7 : // RST7 + case 0x01 : // TEM + break; + + case 0xd8 : // SOI (has already been checked, there should not be a second one) + case 0x00 : // marker is invalid, we should stop now + bScanFailure = sal_True; + break; + + case 0xd9 : // EOI + bScanFinished = sal_True; + break; + + // per default we assume marker segments conaining a length parameter + default : { - rStm >> cByte; - } - - while ( ( cByte == 0xff ) && - ( bWideSearch || ( nCount++ < nMax ) ) ) - { - rStm >> cByte; - } - } - while ( ( cByte != 0xc0 ) && - ( cByte != 0xc1 ) && - ( bWideSearch || ( nCount < nMax ) ) ); - - // wir haben den SOF0/1-Marker - if ( ( cByte == 0xc0 ) || ( cByte == 0xc1 ) ) - { - // Hoehe einlesen - rStm.SeekRel( 3 ); - rStm >> nTemp16; - aPixSize.Height() = nTemp16; + sal_uInt16 nLength; + rStm >> nLength; - // Breite einlesen - rStm >> nTemp16; - aPixSize.Width() = nTemp16; - - // Bit/Pixel einlesen - rStm >> cByte; - nBitsPerPixel = ( cByte == 3 ? 24 : cByte == 1 ? 8 : 0 ); + if ( nLength < 2 ) + bScanFailure = sal_True; + else + { + sal_uInt32 nNextMarkerPos = rStm.Tell() + nLength - 2; + switch( nMarker ) + { + case 0xe0 : // APP0 Marker + { + if ( nLength == 16 ) + { + sal_Int32 nIdentifier; + rStm >> nIdentifier; + if ( nIdentifier == 0x4a464946 ) // JFIF Identifier + { + sal_uInt8 nStringTerminator; + sal_uInt8 nMajorRevision; + sal_uInt8 nMinorRevision; + sal_uInt8 nUnits; + sal_uInt16 nHorizontalResolution; + sal_uInt16 nVerticalResolution; + sal_uInt8 nHorzThumbnailPixelCount; + sal_uInt8 nVertThumbnailPixelCount; + + rStm >> nStringTerminator + >> nMajorRevision + >> nMinorRevision + >> nUnits + >> nHorizontalResolution + >> nVerticalResolution + >> nHorzThumbnailPixelCount + >> nVertThumbnailPixelCount; + + // setting the logical size + if ( nUnits && nHorizontalResolution && nVerticalResolution ) + { + MapMode aMap; + aMap.SetMapUnit( nUnits == 1 ? MAP_INCH : MAP_CM ); + aMap.SetScaleX( Fraction( 1, nHorizontalResolution ) ); + aMap.SetScaleY( Fraction( 1, nVerticalResolution ) ); + aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) ); + } + } + } + } + break; - // logische Groesse setzen - if ( cUnit && nResX && nResY ) - { - aMap.SetMapUnit( cUnit == 1 ? MAP_INCH : MAP_CM ); - aMap.SetScaleX( Fraction( 1, nResX ) ); - aMap.SetScaleY( Fraction( 1, nResY ) ); - aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, - MapMode( MAP_100TH_MM ) ); + // Start of Frame Markers + case 0xc0 : // SOF0 + case 0xc1 : // SOF1 + case 0xc2 : // SOF2 + case 0xc3 : // SOF3 + case 0xc5 : // SOF5 + case 0xc6 : // SOF6 + case 0xc7 : // SOF7 + case 0xc9 : // SOF9 + case 0xca : // SOF10 + case 0xcb : // SOF11 + case 0xcd : // SOF13 + case 0xce : // SOF14 + case 0xcf : // SOF15 + { + sal_uInt8 nSamplePrecision; + sal_uInt16 nNumberOfLines; + sal_uInt16 nSamplesPerLine; + sal_uInt8 nNumberOfImageComponents; + sal_uInt8 nComponentsIdentifier; + sal_uInt8 nHorizontalSamplingFactor; + sal_uInt8 nVerticalSamplingFactor; + sal_uInt8 nQuantizationTableDestinationSelector; + rStm >> nSamplePrecision + >> nNumberOfLines + >> nSamplesPerLine + >> nNumberOfImageComponents + >> nComponentsIdentifier + >> nHorizontalSamplingFactor + >> nQuantizationTableDestinationSelector; + nVerticalSamplingFactor = nHorizontalSamplingFactor & 0xf; + nHorizontalSamplingFactor >>= 4; + + aPixSize.Height() = nNumberOfLines; + aPixSize.Width() = nSamplesPerLine; + nBitsPerPixel = ( nNumberOfImageComponents == 3 ? 24 : nNumberOfImageComponents == 1 ? 8 : 0 ); + nPlanes = 1; + + bScanFinished = sal_True; + } + break; + } + rStm.Seek( nNextMarkerPos ); + } } - - // Planes immer 1 - nPlanes = 1; + break; } } + rStm.SetError( nError ); } } - + rStm.Seek( nStmPos ); return bRet; } @@ -556,37 +478,26 @@ BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL ) { BOOL bRet = FALSE; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rStm.Seek( nStmPos ); - if ( bWideSearch ) - { - UINT32 nTemp32; - UINT16 nTemp16; - BYTE cByte; + UINT32 nTemp32; + UINT16 nTemp16; + BYTE cByte; - rStm.SeekRel( 2048 ); - rStm >> nTemp32; - rStm >> nTemp16; - rStm >> cByte; + rStm.SeekRel( 2048 ); + rStm >> nTemp32; + rStm >> nTemp16; + rStm >> cByte; - if ( ( nTemp32 == 0x5f444350 ) && - ( nTemp16 == 0x5049 ) && - ( cByte == 0x49 ) ) - { - nFormat = GFF_PCD; - bRet = TRUE; - } - } - else + if ( ( nTemp32 == 0x5f444350 ) && + ( nTemp16 == 0x5049 ) && + ( cByte == 0x49 ) ) { - bRet = aPathExt.CompareToAscii( "pcd", 3 ) == COMPARE_EQUAL; - if ( bRet ) - { - nFormat = GFF_PCD; - } + nFormat = GFF_PCD; + bRet = TRUE; } - + rStm.Seek( nStmPos ); return bRet; } @@ -608,10 +519,10 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) BOOL bRet = FALSE; BYTE cByte; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rStm.Seek( nStmPos ); - rStm >> cByte; + if ( cByte == 0x0a ) { nFormat = GFF_PCX; @@ -675,6 +586,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) } } + rStm.Seek( nStmPos ); return bRet; } @@ -690,10 +602,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) UINT32 nTemp32; BOOL bRet = FALSE; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - rStm.Seek( nStmPos ); - rStm >> nTemp32; + if ( nTemp32 == 0x89504e47 ) { rStm >> nTemp32; @@ -726,55 +638,52 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) nPlanes = 1; bCompressed = TRUE; - if ( bWideSearch ) - { - UINT32 nLen32; + UINT32 nLen32; - rStm.SeekRel( 8 ); + rStm.SeekRel( 8 ); - // so lange ueberlesen, bis wir den pHYs-Chunk haben oder - // den Anfang der Bilddaten + // so lange ueberlesen, bis wir den pHYs-Chunk haben oder + // den Anfang der Bilddaten + rStm >> nLen32; + rStm >> nTemp32; + while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) ) + { + rStm.SeekRel( 4 + nLen32 ); rStm >> nLen32; rStm >> nTemp32; - while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) ) - { - rStm.SeekRel( 4 + nLen32 ); - rStm >> nLen32; - rStm >> nTemp32; - } + } - if ( nTemp32 == 0x70485973 ) - { - ULONG nXRes; - ULONG nYRes; + if ( nTemp32 == 0x70485973 ) + { + ULONG nXRes; + ULONG nYRes; - // horizontale Aufloesung - rStm >> nTemp32; - nXRes = nTemp32; + // horizontale Aufloesung + rStm >> nTemp32; + nXRes = nTemp32; - // vertikale Aufloesung - rStm >> nTemp32; - nYRes = nTemp32; + // vertikale Aufloesung + rStm >> nTemp32; + nYRes = nTemp32; - // Unit einlesen - rStm >> cByte; + // Unit einlesen + rStm >> cByte; - if ( cByte ) - { - if ( nXRes ) - aLogSize.Width() = ( aPixSize.Width() * 100000 ) / - nTemp32; + if ( cByte ) + { + if ( nXRes ) + aLogSize.Width() = ( aPixSize.Width() * 100000 ) / + nTemp32; - if ( nYRes ) - aLogSize.Height() = ( aPixSize.Height() * 100000 ) / - nTemp32; - } + if ( nYRes ) + aLogSize.Height() = ( aPixSize.Height() * 100000 ) / + nTemp32; } } } } } - + rStm.Seek( nStmPos ); return bRet; } @@ -792,7 +701,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) BYTE cByte1; BYTE cByte2; - rStm.Seek( nStmPos ); + sal_Int32 nStmPos = rStm.Tell(); rStm >> cByte1; rStm >> cByte2; if ( cByte1 == cByte2 ) @@ -829,14 +738,14 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) rStm >> nTemp32; rStm.SeekRel( ( nCount = ( nTemp32 + 2 ) ) - 0x08 ); - if ( bWideSearch || ( nCount < nMax ) ) + if ( nCount < nMax ) { // Tag's lesen, bis wir auf Tag256 ( Width ) treffen // nicht mehr Bytes als DATA_SIZE lesen rStm >> nTemp16; while ( nTemp16 != 256 ) { - bOk = bWideSearch || ( nCount < nMax ); + bOk = nCount < nMax; if ( !bOk ) { break; @@ -912,7 +821,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) } } } - + rStm.Seek( nStmPos ); return bRet; } @@ -965,11 +874,12 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL ) bRet = TRUE; else { + sal_Int32 nStmPos = rStm.Tell(); BYTE nFirst, nSecond; - rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) ) bRet = TRUE; + rStm.Seek( nStmPos ); } if ( bRet ) @@ -992,11 +902,12 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; - rStm.Seek( nStmPos ); + BYTE nFirst, nSecond; + sal_Int32 nStmPos = rStm.Tell(); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) ) bRet = TRUE; + rStm.Seek( nStmPos ); } if ( bRet ) @@ -1020,10 +931,11 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL ) else { BYTE nFirst, nSecond; - rStm.Seek( nStmPos ); + sal_Int32 nStmPos = rStm.Tell(); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) ) bRet = TRUE; + rStm.Seek( nStmPos ); } if ( bRet ) @@ -1041,16 +953,17 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL ) BOOL GraphicDescriptor::ImpDetectRAS( SvStream& rStm, BOOL ) { UINT32 nMagicNumber; - rStm.Seek( nStmPos ); + BOOL bRet = FALSE; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nMagicNumber; if ( nMagicNumber == 0x59a66a95 ) { nFormat = GFF_RAS; - return TRUE; + bRet = TRUE; } - else - return FALSE; + rStm.Seek( nStmPos ); + return bRet; } /************************************************************************* @@ -1079,7 +992,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) BOOL bRet = FALSE; UINT32 nMagicNumber; - rStm.Seek( nStmPos ); + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nMagicNumber; if ( nMagicNumber == 0x38425053 ) @@ -1123,6 +1036,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) if ( bRet ) nFormat = GFF_PSD; + rStm.Seek( nStmPos ); return bRet; } @@ -1139,8 +1053,9 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL ) sal_uInt32 nFirstLong; sal_uInt8 nFirstBytes[20]; + BOOL bRet = FALSE; - rStm.Seek( nStmPos ); + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nFirstLong; rStm.SeekRel( -4 ); @@ -1151,10 +1066,10 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL ) && ImplSearchEntry( &nFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) ) { nFormat = GFF_EPS; - return TRUE; + bRet = TRUE; } - else - return FALSE; + rStm.Seek( nStmPos ); + return bRet; } /************************************************************************* @@ -1201,9 +1116,11 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL ) nFormat = GFF_PCT; else { + sal_Int32 nStmPos = rStm.Tell(); + BYTE sBuf[4]; - rStm.Seek( nStmPos + 522 ); + rStm.SeekRel( 522 ); rStm.Read( sBuf, 3 ); if( !rStm.GetError() ) @@ -1215,6 +1132,7 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL ) nFormat = GFF_PCT; } } + rStm.Seek( nStmPos ); } return bRet; @@ -1230,18 +1148,20 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL ) BOOL GraphicDescriptor::ImpDetectSGF( SvStream& rStm, BOOL ) { BOOL bRet = FALSE; - if( aPathExt.CompareToAscii( "sgf", 3 ) == COMPARE_EQUAL ) bRet = TRUE; else { + sal_Int32 nStmPos = rStm.Tell(); + BYTE nFirst, nSecond; - rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if( nFirst == 'J' && nSecond == 'J' ) bRet = TRUE; + + rStm.Seek( nStmPos ); } if( bRet ) @@ -1279,9 +1199,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) BOOL bRet = FALSE; BYTE cByte; + sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rStm.Seek( nStmPos ); - rStm >> n32; if ( n32 == 0x44475653 ) { @@ -1342,7 +1261,7 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) } } } - + rStm.Seek( nStmPos ); return bRet; } @@ -1417,3 +1336,5 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat ) return String( aKeyName, RTL_TEXTENCODING_ASCII_US ); } + + -- cgit From 3b20bee998a483d34bbed70bd8a297715f289df9 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 16 Aug 2010 19:01:41 +0200 Subject: pdfprint: fix a warning --- svtools/source/filter.vcl/filter/filter2.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index f8c9508363bc..d91ec1a19772 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -311,7 +311,6 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) { UINT32 nTemp32; BOOL bRet = FALSE; - BYTE cByte = 0; sal_Int32 nStmPos = rStm.Tell(); -- cgit From c86fd8453e7fc925cb8f0f8ffff7990896da71ec Mon Sep 17 00:00:00 2001 From: sj Date: Thu, 19 Aug 2010 18:12:04 +0200 Subject: impress186: #i4499# added default resolution unit (metric/non-metric) depending to the tools/options setting --- svtools/source/filter.vcl/filter/exportdialog.cxx | 42 +++++++++++++++++++++-- svtools/source/filter.vcl/filter/exportdialog.hxx | 4 +++ 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 1e2c669afa33..36ce7b63c87d 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -76,6 +76,7 @@ #define FORMAT_SVG 16 #define FORMAT_SVM 17 +#define UNIT_DEFAULT -1 #define UNIT_INCH 0 #define UNIT_CM 1 #define UNIT_MM 2 @@ -140,6 +141,33 @@ static MapUnit GetMapUnit( sal_Int32 nUnit ) return aMapUnit; } +sal_Int32 ExportDialog::GetDefaultUnit() +{ + sal_Int32 nDefaultUnit = UNIT_CM; + switch( mrFltCallPara.eFieldUnit ) + { +// case FUNIT_NONE : +// case FUNIT_PERCENT : +// case FUNIT_CUSTOM : + default: nDefaultUnit = UNIT_CM; break; + + case FUNIT_MILE : // PASSTHROUGH INTENDED + case FUNIT_FOOT : + case FUNIT_TWIP : + case FUNIT_PICA : nDefaultUnit = UNIT_INCH; break; + + case FUNIT_KM : // PASSTHROUGH INTENDED + case FUNIT_M : + case FUNIT_100TH_MM : nDefaultUnit = UNIT_CM; break; + + case FUNIT_INCH : nDefaultUnit = UNIT_INCH; break; + case FUNIT_CM : nDefaultUnit = UNIT_CM; break; + case FUNIT_MM : nDefaultUnit = UNIT_MM; break; + case FUNIT_POINT : nDefaultUnit = UNIT_POINT; break; + } + return nDefaultUnit; +} + static basegfx::B2DRange GetShapeRangeForXShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< graphic::XPrimitiveFactory2D >& rxPrimitiveFactory2D, const uno::Sequence< beans::PropertyValue >& rViewInformation ) { @@ -166,6 +194,9 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd if ( nUnit < 0 ) nUnit = UNIT_CM; + if ( ( mnInitialResolutionUnit == UNIT_DEFAULT ) && ( nUnit == GetDefaultUnit() ) ) + nUnit = UNIT_DEFAULT; + // updating ui configuration if ( mbIsPixelFormat ) { @@ -627,6 +658,10 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, aFilterConfigPath.Append( maExt ); mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); + mnInitialResolutionUnit = mbIsPixelFormat + ? mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), UNIT_DEFAULT ) + : mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), UNIT_DEFAULT ); + mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxFilesizeForRealtimePreview" ) ), 0 ); maFtEstimatedSize.SetText( String( RTL_CONSTASCII_USTRINGPARAM( " \n " ) ) ); @@ -745,9 +780,10 @@ void ExportDialog::createSizeControls( vcl::RowOrColumn& rLayout ) xColumn->setMinimumSize( nIndex, aLbMax ); } - sal_Int32 nUnit = mbIsPixelFormat - ? mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), UNIT_PIXEL ) - : mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), UNIT_CM ); + sal_Int32 nUnit = mnInitialResolutionUnit; + if ( nUnit == UNIT_DEFAULT ) + nUnit = GetDefaultUnit(); + if ( !mbIsPixelFormat ) { maLbSizeX.RemoveEntry( UNIT_PIXEL ); // removing pixel diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter.vcl/filter/exportdialog.hxx index a9692e646746..20a9ac3ea832 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.hxx +++ b/svtools/source/filter.vcl/filter/exportdialog.hxx @@ -156,6 +156,8 @@ private: sal_Bool mbExportSelection; sal_Bool mbPreserveAspectRatio; + sal_Int32 mnInitialResolutionUnit; + // for pixel graphics it always contains the pixel count com::sun::star::awt::Size maResolution; // it always contains the number of pixels per meter @@ -198,6 +200,8 @@ private: com::sun::star::awt::Size GetOriginalSize(); + sal_Int32 GetDefaultUnit(); + public: ExportDialog( FltCallDialogParameter& rPara, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr, -- cgit From c2823b2321863724e0357c10f23a24cb8021073d Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 25 Aug 2010 20:45:55 +0200 Subject: impress186: #i4499# fixed compile error --- svtools/source/filter.vcl/filter/exportdialog.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 36ce7b63c87d..94e778c9be84 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -1226,23 +1226,23 @@ void ExportDialog::updatePreview() Size aSize; if ( fXRatio > 1.0 ) { - aSize.Width() = Max( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = ::std::max( maSize.Width, aFixedBitmapSize.Width() ); aSize.Width() /= fXRatio; } else { - aSize.Width() = Min( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = ::std::min( maSize.Width, aFixedBitmapSize.Width() ); aSize.Width() /= fXRatio; } if ( fYRatio > 1.0 ) { - aSize.Height() = Max( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = ::std::max( maSize.Height, aFixedBitmapSize.Height() ); aSize.Height() /= fYRatio; } else { - aSize.Height() = Min( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = ::std::min( maSize.Height, aFixedBitmapSize.Height() ); aSize.Height() /= fYRatio; } -- cgit From c67e63ceaacf2af96fdc1a32584629e89bf083d8 Mon Sep 17 00:00:00 2001 From: sj Date: Thu, 26 Aug 2010 11:18:29 +0200 Subject: impress186: #i4499# fixed compile error --- svtools/source/filter.vcl/filter/exportdialog.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 94e778c9be84..c04b587b6278 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -1226,23 +1226,23 @@ void ExportDialog::updatePreview() Size aSize; if ( fXRatio > 1.0 ) { - aSize.Width() = ::std::max( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); aSize.Width() /= fXRatio; } else { - aSize.Width() = ::std::min( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); aSize.Width() /= fXRatio; } if ( fYRatio > 1.0 ) { - aSize.Height() = ::std::max( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); aSize.Height() /= fYRatio; } else { - aSize.Height() = ::std::min( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); aSize.Height() /= fYRatio; } -- cgit From 96315579c14ca9f80a03b59bf277b19378c237aa Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 27 Aug 2010 13:46:58 +0200 Subject: whitespace cleanup. --- svtools/source/control/inettbc.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) mode change 100644 => 100755 svtools/source/control/inettbc.cxx (limited to 'svtools') diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx old mode 100644 new mode 100755 index 02a578629039..3a78eb7da95d --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -41,10 +41,7 @@ #include #include #include - -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_ -#include -#endif +#include #include #include #include @@ -426,7 +423,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, uno::Reference< XDynamicResultSet > xDynResultSet; ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; if ( bOnlyDirectories ) - eInclude = INCLUDE_FOLDERS_ONLY; + eInclude = INCLUDE_FOLDERS_ONLY; xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude ); @@ -654,7 +651,7 @@ void SvtMatchContext_Impl::run() { // if text input is a directory, it must be part of the match list! Until then it is scanned if ( UCBContentHelper::IsFolder( aMainURL ) && aURLObject.hasFinalSlash() ) - Insert( aText, aMatch ); + Insert( aText, aMatch ); else // otherwise the parent folder will be taken aURLObject.removeSegment(); @@ -1314,7 +1311,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( return sal_False; // no such user #else pPasswd = getpwnam( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr() ); - if( pPasswd ) + if( pPasswd ) aParseTilde = String::CreateFromAscii( pPasswd->pw_dir ); else return sal_False; // no such user -- cgit From a5dde485a2387fa6de8a75855efc741b478c44e4 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 27 Aug 2010 15:29:33 +0200 Subject: #i114146# - auto completion must match url schemes case insensitive. --- svtools/source/control/inettbc.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 3a78eb7da95d..d5bbb94e2103 100755 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -162,7 +162,7 @@ SvtMatchContext_Impl::SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ) : aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) ) , aBaseURL( pBoxP->aBaseURL ) - , aText( rText ) + , aText( rText ) , pBox( pBoxP ) , bStop( FALSE ) , bOnlyDirectories( pBoxP->bOnlyDirectories ) @@ -681,6 +681,7 @@ void SvtMatchContext_Impl::run() aCurObj.SetURL( *aPickList.GetObject( nPos ) ); aCurObj.SetSmartURL( aCurObj.GetURLNoPass()); aCurMainURL = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + if( eProt != INET_PROT_NOT_VALID && aCurObj.GetProtocol() != eProt ) continue; @@ -705,7 +706,7 @@ void SvtMatchContext_Impl::run() { // try if text matches the scheme String aScheme( INetURLObject::GetScheme( aCurObj.GetProtocol() ) ); - if ( aText.CompareTo( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() ) + if ( aText.CompareIgnoreCaseToAscii( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() ) { if( bFull ) aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); @@ -724,7 +725,7 @@ void SvtMatchContext_Impl::run() aCurString.Erase( 0, aScheme.Len() ); } - if( aText.CompareTo( aCurString, aText.Len() )== COMPARE_EQUAL ) + if( aText.CompareIgnoreCaseToAscii( aCurString, aText.Len() )== COMPARE_EQUAL ) { if( bFull ) aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); -- cgit From acbb009ba0992ec4ad4c9848c0b0ac9ee81effa4 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Thu, 2 Sep 2010 15:13:41 +0200 Subject: gnumake2: move make 3.81 check into configure --- svtools/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'svtools') diff --git a/svtools/Makefile b/svtools/Makefile index 3225bc97e12c..c19100ee9a5b 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,10 +25,6 @@ # #************************************************************************* -ifneq ($(MAKE_VERSION),3.81) -$(error You need at least GNU Make 3.81!) -endif - ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif -- cgit From cda727307f4b2c4d31c0d9a013e9501327faaae5 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 3 Sep 2010 17:53:47 +0200 Subject: dba34a: removed SvLBox'es (and friends) Set/GetWindowBits. They were used in parallel to Window's Set/GetStyle, with WB_* values which overlapped with existing (generic) WB_* bits. Since this overlapping has been removed, there's no need to have both Style and WindowBits at those classes. Should remove some source of confusion and error (and, well, perhaps introduce some new errors :) ). --- svtools/inc/svtools/svicnvw.hxx | 3 +-- svtools/inc/svtools/svlbox.hxx | 1 - svtools/inc/svtools/svtreebx.hxx | 12 +++------- svtools/source/contnr/svicnvw.cxx | 10 ++++---- svtools/source/contnr/svimpbox.cxx | 44 ++++++++++++++++++---------------- svtools/source/contnr/svimpicn.cxx | 19 +++++++-------- svtools/source/contnr/svlbox.cxx | 2 -- svtools/source/contnr/svtreebx.cxx | 37 ++++++++++++++++------------ svtools/source/inc/svimpbox.hxx | 4 ++-- svtools/source/inc/svimpicn.hxx | 3 +-- svtools/source/uno/treecontrolpeer.cxx | 24 +++++++++---------- 11 files changed, 77 insertions(+), 82 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx index ac15f0b55be6..68a76d25e108 100644 --- a/svtools/inc/svtools/svicnvw.hxx +++ b/svtools/inc/svtools/svicnvw.hxx @@ -89,7 +89,6 @@ class SvIconView : public SvLBox SvImpIconView* pImp; Image aCollapsedEntryBmp; Image aExpandedEntryBmp; - WinBits nWinBits; USHORT nIcnVwFlags; void SetModel( SvLBoxTreeList* ); @@ -111,6 +110,7 @@ protected: virtual void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); virtual void Command( const CommandEvent& rCEvt ); virtual void PreparePaint( SvLBoxEntry* ); + virtual void StateChanged( StateChangedType nStateChange ); public: @@ -203,7 +203,6 @@ public: SvLBoxEntry* GetEntryFromLogicPos( const Point& rDocPos ) const; - void SetWindowBits( WinBits nWinStyle ); virtual void PaintEntry( SvLBoxEntry* ); virtual void PaintEntry( SvLBoxEntry*, const Point& rDocPos ); Rectangle GetFocusRect( SvLBoxEntry* ); diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index f33784f45397..5b1f13120756 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -290,7 +290,6 @@ class SVT_DLLPUBLIC SvLBox protected: - WinBits nWindowStyle; Link aExpandedHdl; Link aExpandingHdl; Link aSelectHdl; diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx index 787e0956888f..79402cb13f23 100644 --- a/svtools/inc/svtools/svtreebx.hxx +++ b/svtools/inc/svtools/svtreebx.hxx @@ -39,11 +39,6 @@ class TabBar; #define SV_TAB_BORDER 8 -#define WB_HASBUTTONSATROOT ((WinBits)0x0800) -#define WB_NOINITIALSELECTION WB_DROPDOWN -#define WB_HIDESELECTION WB_NOHIDESELECTION -#define WB_FORCE_MAKEVISIBLE WB_SPIN - #define SV_LISTBOX_ID_TREEBOX 1 // fuer SvLBox::IsA() #define SV_ENTRYHEIGHTOFFS_PIXEL 2 @@ -97,9 +92,11 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox USHORT nTabFlagMask=0xffff, BOOL bHasClipRegion=FALSE ); - SVT_DLLPRIVATE void InitTreeView( WinBits nWinStyle ); + SVT_DLLPRIVATE void InitTreeView(); SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab, USHORT nEmptyWidth ); + SVT_DLLPRIVATE void ImplInitStyle(); + #endif protected: @@ -318,9 +315,6 @@ public: SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); } SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);} - void SetWindowBits( WinBits nWinStyle ); - WinBits GetWindowBits() const { return nWindowStyle; } - void PaintEntry( SvLBoxEntry* ); long PaintEntry( SvLBoxEntry*, long nLine, USHORT nTabFlagMask=0xffff ); diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index b16cd67d12a5..5556d299b2c2 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -50,7 +50,6 @@ SvIcnVwDataEntry::~SvIcnVwDataEntry() SvIconView::SvIconView( Window* pParent, WinBits nWinStyle ) : SvLBox( pParent, nWinStyle | WB_BORDER ) { - nWinBits = nWinStyle; nIcnVwFlags = 0; pImp = new SvImpIconView( this, GetModel(), nWinStyle | WB_ICON ); pImp->mpViewData = 0; @@ -72,8 +71,6 @@ SvIconView::SvIconView( Window* pParent , const ResId& rResId ) : SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) ); SetDefaultFont(); pImp->SetSelectionMode( GetSelectionMode() ); - pImp->SetWindowBits( nWindowStyle ); - nWinBits = nWindowStyle; } SvIconView::~SvIconView() @@ -403,10 +400,11 @@ SvLBoxEntry* SvIconView::GetEntryFromLogicPos( const Point& rDocPos ) const } -void SvIconView::SetWindowBits( WinBits nWinStyle ) +void SvIconView::StateChanged( StateChangedType i_nStateChange ) { - nWinBits = nWinStyle; - pImp->SetWindowBits( nWinStyle ); + SvLBox::StateChanged( i_nStateChange ); + if ( i_nStateChange == STATE_CHANGE_STYLE ) + pImp->SetStyle( GetStyle() ); } void SvIconView::PaintEntry( SvLBoxEntry* pEntry ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 35324d551858..fc50d7dda4ad 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -83,7 +83,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n pTree = pLBTree; aSelEng.SetFunctionSet( (FunctionSet*)&aFctSet ); aSelEng.ExpandSelectionOnMouseMove( FALSE ); - SetWindowBits( nWinStyle ); + SetStyle( nWinStyle ); SetSelectionMode( SINGLE_SELECTION ); SetDragDropMode( 0 ); @@ -253,10 +253,10 @@ void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ) } } -void SvImpLBox::SetWindowBits( WinBits nWinStyle ) +void SvImpLBox::SetStyle( WinBits i_nWinStyle ) { - nWinBits = nWinStyle; - if((nWinStyle & WB_SIMPLEMODE) && aSelEng.GetSelectionMode()==MULTIPLE_SELECTION) + m_nStyle = i_nWinStyle; + if ( ( m_nStyle & WB_SIMPLEMODE) && ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) ) aSelEng.AddAlways( TRUE ); } @@ -952,7 +952,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) // erst die Linien Zeichnen, dann clippen! pView->SetClipRegion(); - if( nWinBits & ( WB_HASLINES | WB_HASLINESATROOT ) ) + if( m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT ) ) DrawNet(); pView->SetClipRegion( aClipRegion ); @@ -969,7 +969,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) { // do not select if multiselection or explicit set BOOL bNotSelect = ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) - || ( ( nWinBits & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION ); + || ( ( m_nStyle & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION ); SetCursor( pStartEntry, bNotSelect ); } @@ -994,7 +994,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop ) if( bInView && (!bMoveToTop || pStartEntry == pEntry) ) return; // ist schon sichtbar - if( pStartEntry || (nWinBits & WB_FORCE_MAKEVISIBLE) ) + if( pStartEntry || (m_nStyle & WB_FORCE_MAKEVISIBLE) ) nFlags &= (~F_FILLING); if( !bInView ) { @@ -1132,7 +1132,7 @@ void SvImpLBox::DrawNet() pView->DrawLine( aPos1, aPos2 ); } // Sichtbar im Control ? - if( n>= nOffs && ((nWinBits & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry))) + if( n>= nOffs && ((m_nStyle & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry))) { // kann aPos1 recyclet werden ? if( !pView->IsExpanded(pEntry) ) @@ -1154,7 +1154,7 @@ void SvImpLBox::DrawNet() nY += nEntryHeight; pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry )); } - if( nWinBits & WB_HASLINESATROOT ) + if( m_nStyle & WB_HASLINESATROOT ) { pEntry = pView->First(); aPos1.X() = pView->GetTabPos( pEntry, pFirstDynamicTab); @@ -1248,7 +1248,8 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize ) Size aOSize( pView->Control::GetOutputSizePixel() ); - BOOL bVerSBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0; + const WinBits nWindowStyle = pView->GetStyle(); + BOOL bVerSBar = ( nWindowStyle & WB_VSCROLL ) != 0; BOOL bHorBar = FALSE; long nMaxRight = aOSize.Width(); //GetOutputSize().Width(); Point aOrigin( pView->GetMapMode().GetOrigin() ); @@ -1256,7 +1257,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize ) nMaxRight += aOrigin.X() - 1; long nVis = nMostRight - aOrigin.X(); if( pTabBar || ( - (pView->nWindowStyle & WB_HSCROLL) && + (nWindowStyle & WB_HSCROLL) && (nVis < nMostRight || nMaxRight < nMostRight) )) bHorBar = TRUE; @@ -1274,7 +1275,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize ) nMaxRight -= nVerSBarWidth; if( !bHorBar ) { - if( (pView->nWindowStyle & WB_HSCROLL) && + if( (nWindowStyle & WB_HSCROLL) && (nVis < nMostRight || nMaxRight < nMostRight) ) bHorBar = TRUE; } @@ -1439,7 +1440,7 @@ void SvImpLBox::FillView() void SvImpLBox::ShowVerSBar() { - BOOL bVerBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0; + BOOL bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0; ULONG nVis = 0; if( !bVerBar ) nVis = pView->GetVisibleCount(); @@ -1681,7 +1682,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect ) return; /* - if( (nWinBits & WB_HIDESELECTION) && pEntry && !pView->HasFocus() ) + if( (m_nStyle & WB_HIDESELECTION) && pEntry && !pView->HasFocus() ) { SvViewData* pViewData = pView->GetViewData( pEntry ); pViewData->SetCursored( bSelect ); @@ -1943,7 +1944,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) // die Linien invalidieren /* if( (bEntryVisible || bPrevEntryVisible) && - (nWinBits & ( WB_HASLINES | WB_HASLINESATROOT )) ) + (m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT )) ) { SvLBoxTab* pTab = pView->GetFirstDynamicTab(); if( pTab ) @@ -2265,6 +2266,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) SvLBoxEntry* pNewCursor; + const WinBits nWindowStyle = pView->GetStyle(); switch( aCode ) { case KEY_UP: @@ -2348,7 +2350,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor ); } } - else if( pView->nWindowStyle & WB_HSCROLL ) + else if( nWindowStyle & WB_HSCROLL ) { long nThumb = aHorSBar.GetThumbPos(); nThumb += aHorSBar.GetLineSize(); @@ -2379,7 +2381,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor ); } } - else if ( pView->nWindowStyle & WB_HSCROLL ) + else if ( nWindowStyle & WB_HSCROLL ) { long nThumb = aHorSBar.GetThumbPos(); nThumb -= aHorSBar.GetLineSize(); @@ -2520,7 +2522,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) case KEY_F8: if( bShift && pView->GetSelectionMode()==MULTIPLE_SELECTION && - !(nWinBits & WB_SIMPLEMODE)) + !(m_nStyle & WB_SIMPLEMODE)) { if( aSelEng.IsAlwaysAdding() ) aSelEng.AddAlways( FALSE ); @@ -2698,7 +2700,7 @@ void __EXPORT SvImpLBox::GetFocus() // if( bSimpleTravel && !pView->IsSelected(pCursor) ) // pView->Select( pCursor, TRUE ); } - if( nWinBits & WB_HIDESELECTION ) + if( m_nStyle & WB_HIDESELECTION ) { SvLBoxEntry* pEntry = pView->FirstSelected(); while( pEntry ) @@ -2731,7 +2733,7 @@ void __EXPORT SvImpLBox::LoseFocus() pView->SetEntryFocus( pCursor,FALSE ); ShowCursor( FALSE ); - if( nWinBits & WB_HIDESELECTION ) + if( m_nStyle & WB_HIDESELECTION ) { SvLBoxEntry* pEntry = pView->FirstSelected(); while( pEntry ) @@ -3029,7 +3031,7 @@ void SvImpLBox::SetSelectionMode( SelectionMode eSelMode ) bSimpleTravel = TRUE; else bSimpleTravel = FALSE; - if( (nWinBits & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) ) + if( (m_nStyle & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) ) aSelEng.AddAlways( TRUE ); } diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index d1e471953663..0d335429d564 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -708,7 +708,7 @@ public: SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree, - WinBits nWinStyle ) : + WinBits i_nWinStyle ) : aVerSBar( pCurView, WB_DRAG | WB_VSCROLL ), aHorSBar( pCurView, WB_DRAG | WB_HSCROLL ) { @@ -716,7 +716,7 @@ SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree, pModel = pTree; pCurParent = 0; pZOrderList = new SvPtrarr; - SetWindowBits( nWinStyle ); + SetStyle( i_nWinStyle ); nHorDist = 0; nVerDist = 0; nFlags = 0; @@ -785,13 +785,12 @@ void SvImpIconView::Clear( BOOL bInCtor ) AdjustScrollBars(); } -void SvImpIconView::SetWindowBits( WinBits nWinStyle ) +void SvImpIconView::SetStyle( const WinBits i_nWinStyle ) { - nWinBits = nWinStyle; nViewMode = VIEWMODE_TEXT; - if( nWinStyle & WB_NAME ) + if( i_nWinStyle & WB_NAME ) nViewMode = VIEWMODE_NAME; - if( nWinStyle & WB_ICON ) + if( i_nWinStyle & WB_ICON ) nViewMode = VIEWMODE_ICON; } @@ -1754,8 +1753,8 @@ void SvImpIconView::AdjustScrollBars() else nVisibleHeight = nRealHeight; - bool bVerSBar = (pView->nWindowStyle & WB_VSCROLL) ? true : false; - bool bHorSBar = (pView->nWindowStyle & WB_HSCROLL) ? true : false; + bool bVerSBar = (pView->GetStyle() & WB_VSCROLL) ? true : false; + bool bHorSBar = (pView->GetStyle() & WB_HSCROLL) ? true : false; USHORT nResult = 0; if( nVirtHeight ) @@ -1903,7 +1902,7 @@ BOOL SvImpIconView::CheckHorScrollBar() return FALSE; const MapMode& rMapMode = pView->GetMapMode(); Point aOrigin( rMapMode.GetOrigin() ); - if(!(pView->nWindowStyle & WB_HSCROLL) && !aOrigin.X() ) + if(!(pView->GetStyle() & WB_HSCROLL) && !aOrigin.X() ) { long nWidth = aOutputSize.Width(); USHORT nCount = pZOrderList->Count(); @@ -1941,7 +1940,7 @@ BOOL SvImpIconView::CheckVerScrollBar() return FALSE; const MapMode& rMapMode = pView->GetMapMode(); Point aOrigin( rMapMode.GetOrigin() ); - if(!(pView->nWindowStyle & WB_VSCROLL) && !aOrigin.Y() ) + if(!(pView->GetStyle() & WB_VSCROLL) && !aOrigin.Y() ) { long nDeepest = 0; long nHeight = aOutputSize.Height(); diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index a69253c69629..a8bb6055768e 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -699,7 +699,6 @@ SvLBox::SvLBox( Window* pParent, WinBits nWinStyle ) : DropTargetHelper( this ), DragSourceHelper( this ), eSelMode( NO_SELECTION ) { DBG_CTOR(SvLBox,0); - nWindowStyle = nWinStyle; nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK; nImpFlags = 0; pTargetEntry = 0; @@ -724,7 +723,6 @@ SvLBox::SvLBox( Window* pParent, const ResId& rResId ) : DBG_CTOR(SvLBox,0); pTargetEntry = 0; nImpFlags = 0; - nWindowStyle = 0; pLBoxImpl = new SvLBox_Impl( *this ); nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK; nDragDropMode = 0; diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index a8635c99d127..f4780fbf08ad 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -65,10 +65,10 @@ DBG_NAME(SvTreeListBox) #define SV_LBOX_DEFAULT_INDENT_PIXEL 20 SvTreeListBox::SvTreeListBox( Window* pParent, WinBits nWinStyle ) - : SvLBox(pParent,nWinStyle ) + : SvLBox( pParent, nWinStyle ) { DBG_CTOR(SvTreeListBox,0); - InitTreeView( nWinStyle ); + InitTreeView(); SetSublistOpenWithLeftRight(); } @@ -78,13 +78,13 @@ SvTreeListBox::SvTreeListBox( Window* pParent , const ResId& rResId ) { DBG_CTOR(SvTreeListBox,0); - InitTreeView( 0 ); + InitTreeView(); Resize(); SetSublistOpenWithLeftRight(); } -void SvTreeListBox::InitTreeView( WinBits nWinStyle ) +void SvTreeListBox::InitTreeView() { DBG_CHKTHIS(SvTreeListBox,0); pCheckButtonData = NULL; @@ -102,7 +102,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle ) nTreeFlags = TREEFLAG_RECALCTABS; nIndent = SV_LBOX_DEFAULT_INDENT_PIXEL; nEntryHeightOffs = SV_ENTRYHEIGHTOFFS_PIXEL; - pImp = new SvImpLBox( this, GetModel(), nWinStyle ); + pImp = new SvImpLBox( this, GetModel(), GetStyle() ); aContextBmpMode = SVLISTENTRYFLAG_EXPANDED; nContextBmpWidthMax = 0; @@ -110,7 +110,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle ) SetSpaceBetweenEntries( 0 ); SetLineColor(); InitSettings( TRUE, TRUE, TRUE ); - SetWindowBits( nWinStyle ); + ImplInitStyle(); SetTabs(); } @@ -227,8 +227,9 @@ void SvTreeListBox::SetTabs() EndEditing( TRUE ); nTreeFlags &= (~TREEFLAG_RECALCTABS); nFocusWidth = -1; - BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0; - BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT | + const WinBits nStyle( GetStyle() ); + BOOL bHasButtons = (nStyle & WB_HASBUTTONS)!=0; + BOOL bHasButtonsAtRoot = (nStyle & (WB_HASLINESATROOT | WB_HASBUTTONSATROOT))!=0; long nStartPos = TAB_STARTPOS; long nNodeWidthPixel = GetExpandedNodeBmp().GetSizePixel().Width(); @@ -1492,12 +1493,14 @@ SvLBoxEntry* SvTreeListBox::GetCurEntry() const return pImp->GetCurEntry(); } -void SvTreeListBox::SetWindowBits( WinBits nWinStyle ) +void SvTreeListBox::ImplInitStyle() { DBG_CHKTHIS(SvTreeListBox,0); - nWindowStyle = nWinStyle; + + const WinBits nWindowStyle = GetStyle(); + nTreeFlags |= TREEFLAG_RECALCTABS; - if( nWinStyle & WB_SORT ) + if( nWindowStyle & WB_SORT ) { GetModel()->SetSortMode( SortAscending ); GetModel()->SetCompareHdl( LINK(this,SvTreeListBox,DefaultCompare)); @@ -1508,9 +1511,9 @@ void SvTreeListBox::SetWindowBits( WinBits nWinStyle ) GetModel()->SetCompareHdl( Link() ); } #ifdef OS2 - nWinStyle |= WB_VSCROLL; + nWindowStyle |= WB_VSCROLL; #endif - pImp->SetWindowBits( nWinStyle ); + pImp->SetStyle( nWindowStyle ); pImp->Resize(); Invalidate(); } @@ -1578,8 +1581,9 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags, BOOL bInUse = pEntry->HasInUseEmphasis(); // wenn eine ClipRegion von aussen gesetzt wird, dann // diese nicht zuruecksetzen - BOOL bResetClipRegion = !bHasClipRegion; - BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0; + const WinBits nWindowStyle = GetStyle(); + const BOOL bResetClipRegion = !bHasClipRegion; + const BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0; const StyleSettings& rSettings = GetSettings().GetStyleSettings(); Font aHighlightFont( GetFont() ); @@ -2367,6 +2371,7 @@ void SvTreeListBox::ModelNotification( USHORT nActionId, SvListEntry* pEntry1, long SvTreeListBox::GetTextOffset() const { DBG_CHKTHIS(SvTreeListBox,0); + const WinBits nWindowStyle = GetStyle(); BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0; BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT | WB_HASBUTTONSATROOT))!=0; @@ -2519,6 +2524,8 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt ) void SvTreeListBox::StateChanged( StateChangedType i_nStateChange ) { SvLBox::StateChanged( i_nStateChange ); + if ( i_nStateChange == STATE_CHANGE_STYLE ) + ImplInitStyle(); } void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground) diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 92b9f960b65c..6919944daef4 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -153,7 +153,7 @@ private: USHORT nFlags; USHORT nCurTabPos; - WinBits nWinBits; + WinBits m_nStyle; ExtendedWinBits nExtendedWinBits; BOOL bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION BOOL bUpdateMode : 1; @@ -264,7 +264,7 @@ public: ~SvImpLBox(); void Clear(); - void SetWindowBits( WinBits nWinStyle ); + void SetStyle( WinBits i_nWinStyle ); void SetExtendedWindowBits( ExtendedWinBits _nBits ); ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; } void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx index 20f98d2bcbbd..7d5c2b1b41e3 100644 --- a/svtools/source/inc/svimpicn.hxx +++ b/svtools/source/inc/svimpicn.hxx @@ -96,7 +96,6 @@ class SvImpIconView nGridDY; long nHorSBarHeight, nVerSBarWidth; - WinBits nWinBits; int nViewMode; long nHorDist; long nVerDist; @@ -171,7 +170,7 @@ public: ~SvImpIconView(); void Clear( BOOL bInCtor = FALSE ); - void SetWindowBits( WinBits nWinStyle ); + void SetStyle( const WinBits i_nWinStyle ); void SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent ) { pModel = pTree; SetCurParent(pParent); } void EntryInserted( SvLBoxEntry*); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index d1ea854cce61..f37d5f80ed68 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1327,12 +1327,12 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An sal_Bool bEnabled = sal_False; if ( aValue >>= bEnabled ) { - WinBits nStyle = rTree.GetWindowBits(); + WinBits nStyle = rTree.GetStyle(); if ( bEnabled ) nStyle |= WB_HIDESELECTION; else nStyle &= ~WB_HIDESELECTION; - rTree.SetWindowBits( nStyle ); + rTree.SetStyle( nStyle ); } } break; @@ -1390,11 +1390,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An sal_Bool bEnabled = false; if( aValue >>= bEnabled ) { - WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINES); + WinBits nBits = rTree.GetStyle() & (~WB_HASLINES); if( bEnabled ) nBits |= WB_HASLINES; - if( nBits != rTree.GetWindowBits() ) - rTree.SetWindowBits( nBits ); + if( nBits != rTree.GetStyle() ) + rTree.SetStyle( nBits ); } break; } @@ -1403,11 +1403,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An sal_Bool bEnabled = false; if( aValue >>= bEnabled ) { - WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINESATROOT); + WinBits nBits = rTree.GetStyle() & (~WB_HASLINESATROOT); if( bEnabled ) nBits |= WB_HASLINESATROOT; - if( nBits != rTree.GetWindowBits() ) - rTree.SetWindowBits( nBits ); + if( nBits != rTree.GetStyle() ) + rTree.SetStyle( nBits ); } break; } @@ -1428,7 +1428,7 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru switch(nPropId) { case BASEPROPERTY_HIDEINACTIVESELECTION: - return Any( ( rTree.GetWindowBits() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False ); + return Any( ( rTree.GetStyle() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False ); case BASEPROPERTY_TREE_SELECTIONTYPE: { @@ -1456,9 +1456,9 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru case BASEPROPERTY_TREE_ROOTDISPLAYED: return Any( mbIsRootDisplayed ); case BASEPROPERTY_TREE_SHOWSHANDLES: - return Any( (rTree.GetWindowBits() & WB_HASLINES) != 0 ? sal_True : sal_False ); + return Any( (rTree.GetStyle() & WB_HASLINES) != 0 ? sal_True : sal_False ); case BASEPROPERTY_TREE_SHOWSROOTHANDLES: - return Any( (rTree.GetWindowBits() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False ); + return Any( (rTree.GetStyle() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False ); } } return VCLXWindow::getProperty( PropertyName ); @@ -1527,7 +1527,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, : SvTreeListBox( pParent, nWinStyle ) , mxPeer( pPeer ) { - SetWindowBits( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL ); + SetStyle( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL ); SetNodeDefaultImages(); SetSelectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) ); SetDeselectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) ); -- cgit From 741985f6fa860412496e14970b09c15cfebc732d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 4 Sep 2010 17:24:00 +0100 Subject: cmcfixes78: #i113054# WaE --- svtools/source/uno/wizard/unowizard.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 9440c0e69f26..147b11aceb11 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -414,7 +414,7 @@ namespace svt { namespace uno ::osl::MutexGuard aGuard( m_aMutex ); WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog ); - ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!" ); + ENSURE_OR_RETURN( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!", Reference< XWizardPage >() ); return pWizardImpl->getCurrentWizardPage(); } -- cgit From a3c8a0ed0c5c6be1cb5c940750222f6381608bd7 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 10 Sep 2010 13:10:07 +0200 Subject: sb129: #i113189# change UNO components to use passive registration --- svtools/prj/d.lst | 3 ++ .../hatchwindow/hatchwindowfactory.component | 38 +++++++++++++++++ svtools/source/hatchwindow/hatchwindowfactory.cxx | 39 ----------------- svtools/source/hatchwindow/makefile.mk | 8 ++++ svtools/source/productregistration/makefile.mk | 8 ++++ .../productregistration/productregistration.cxx | 19 --------- .../productregistration.uno.component | 34 +++++++++++++++ svtools/source/uno/miscservices.cxx | 49 ---------------------- svtools/util/makefile.mk | 8 ++++ svtools/util/svt.component | 49 ++++++++++++++++++++++ 10 files changed, 148 insertions(+), 107 deletions(-) create mode 100644 svtools/source/hatchwindow/hatchwindowfactory.component create mode 100644 svtools/source/productregistration/productregistration.uno.component create mode 100644 svtools/util/svt.component (limited to 'svtools') diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst index b46ddef72311..7b9c6a1957e3 100644 --- a/svtools/prj/d.lst +++ b/svtools/prj/d.lst @@ -38,3 +38,6 @@ dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\b *.xml %_DEST%\xml%_EXT%\*.xml +..\%__SRC%\misc\hatchwindowfactory.component %_DEST%\xml%_EXT%\hatchwindowfactory.component +..\%__SRC%\misc\productregistration.uno.component %_DEST%\xml%_EXT%\productregistration.uno.component +..\%__SRC%\misc\svt.component %_DEST%\xml%_EXT%\svt.component diff --git a/svtools/source/hatchwindow/hatchwindowfactory.component b/svtools/source/hatchwindow/hatchwindowfactory.component new file mode 100644 index 000000000000..153fc8796281 --- /dev/null +++ b/svtools/source/hatchwindow/hatchwindowfactory.component @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index f8dbddff3761..0eec027167c2 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -112,45 +112,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * /* pServiceManager */, void * pRegistryKey) -{ - if (pRegistryKey) - { - uno::Reference< registry::XRegistryKey> xRegistryKey ( - reinterpret_cast< registry::XRegistryKey* >(pRegistryKey)); - uno::Reference< registry::XRegistryKey> xNewKey; - - // OHatchWindowFactory registration - - xNewKey = xRegistryKey->createKey ( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OHatchWindowFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - uno::Sequence< ::rtl::OUString > aServices = - OHatchWindowFactory::impl_staticGetSupportedServiceNames(); - for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - - // ODocumentCloser registration - - xNewKey = xRegistryKey->createKey ( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - ODocumentCloser::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - aServices = ODocumentCloser::impl_staticGetSupportedServiceNames(); - for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - - return sal_True; - } - return sal_False; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) { diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk index 316e4ab1bfe2..3c736bc4e66a 100644 --- a/svtools/source/hatchwindow/makefile.mk +++ b/svtools/source/hatchwindow/makefile.mk @@ -63,3 +63,11 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/hatchwindowfactory.component + +$(MISC)/hatchwindowfactory.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk index a26e8feca753..b6e119601697 100644 --- a/svtools/source/productregistration/makefile.mk +++ b/svtools/source/productregistration/makefile.mk @@ -76,3 +76,11 @@ RESLIB1SRSFILES=\ .INCLUDE : target.mk + +ALLTAR : $(MISC)/productregistration.uno.component + +$(MISC)/productregistration.uno.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 39629f5c3f77..cb3a9b7a7702 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -461,25 +461,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * /* pServiceManager */, void * pRegistryKey) -{ - if (pRegistryKey) - { - Reference< XRegistryKey > xRegistryKey ( - reinterpret_cast< XRegistryKey* >( pRegistryKey )); - Reference< XRegistryKey > xNewKey; - - xNewKey = xRegistryKey->createKey( - OUString::createFromAscii( "/" PRODREG_IMPLNAME "/UNO/SERVICES" )); - xNewKey->createKey( - OUString::createFromAscii( PRODREG_SERVNAME )); - - return sal_True; - } - return sal_False; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) { diff --git a/svtools/source/productregistration/productregistration.uno.component b/svtools/source/productregistration/productregistration.uno.component new file mode 100644 index 000000000000..da2cfd37c483 --- /dev/null +++ b/svtools/source/productregistration/productregistration.uno.component @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index e16a1ecb56dc..34984976bf07 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -101,55 +101,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * pServiceManager, void * _pRegistryKey ) -{ - if (_pRegistryKey) - { - Reference< XRegistryKey > xRegistryKey ( - reinterpret_cast< XRegistryKey* >( _pRegistryKey )); - Reference< XRegistryKey > xNewKey; - uno::Sequence< ::rtl::OUString > aServices; - - xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) ); - xNewKey->createKey( - OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) ); - - xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" ) ); - xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) ); - - // GraphicProvider - xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - GraphicProvider::getImplementationName_Static() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - aServices = GraphicProvider::getSupportedServiceNames_Static(); - int i; - for( i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[ i ] ); - - // GraphicRendererVCL - xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - GraphicRendererVCL::getImplementationName_Static() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() ); - for( i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[ i ] ); - - if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( _pRegistryKey ), serviceDecl ) ) - return false; - - return ::cppu::component_writeInfoHelper( pServiceManager, _pRegistryKey, s_aServiceEntries ); - } - return sal_False; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey) { diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index f9c14a540410..27b46488a16c 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -190,3 +190,11 @@ ALL: $(SLB)$/svt.lib \ .INCLUDE : target.mk + +ALLTAR : $(MISC)/svt.component + +$(MISC)/svt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svt.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svt.component diff --git a/svtools/util/svt.component b/svtools/util/svt.component new file mode 100644 index 000000000000..e15970547a38 --- /dev/null +++ b/svtools/util/svt.component @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + -- cgit From 1d29a2121c1fbd720af089f670b605f778301f37 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 13 Sep 2010 18:56:26 +0200 Subject: dba34a: #i100000# --- svtools/source/contnr/svimpbox.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'svtools') diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index fc50d7dda4ad..7de5f38fab69 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #ifndef _SVTOOLS_HRC #include -- cgit From b1fb8ecaafaeeb353b53f07c03aaf7dc58dccd96 Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Fri, 17 Sep 2010 19:06:31 +0200 Subject: svarray --- svtools/inc/svtools/syntaxhighlight.hxx | 5 +---- svtools/source/edit/editsyntaxhighlighter.cxx | 2 +- svtools/source/edit/syntaxhighlight.cxx | 5 +---- svtools/source/edit/textdata.cxx | 10 +++++----- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index 8cf7126fa24c..e406c33fc54f 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -57,8 +57,6 @@ #include #include -#include - // Token-Typen TT_... enum TokenTypes @@ -79,8 +77,7 @@ enum TokenTypes struct HighlightPortion { UINT16 nBegin; UINT16 nEnd; TokenTypes tokenType; }; - -SV_DECL_VARARR(HighlightPortions, HighlightPortion, 0, 16) +typedef std::vector HighlightPortions; ///////////////////////////////////////////////////////////////////////// // Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 01bb7ad41682..af38c444c0f2 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -193,7 +193,7 @@ void MultiLineEditSyntaxHighlight::UpdateData() GetTextEngine()->RemoveAttribs( nLine, TRUE ); HighlightPortions aPortions; aHighlighter.getHighlightPortions( nLine, aLine, aPortions ); - for ( USHORT i = 0; i < aPortions.Count(); i++ ) + for ( size_t i = 0; i < aPortions.size(); i++ ) { HighlightPortion& r = aPortions[i]; GetTextEngine()->SetAttrib( TextAttribFontColor( GetColorValue(r.tokenType) ), nLine, r.nBegin, r.nEnd, TRUE ); diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx index 5729eb712bfe..87585f5b2587 100644 --- a/svtools/source/edit/syntaxhighlight.cxx +++ b/svtools/source/edit/syntaxhighlight.cxx @@ -34,9 +34,6 @@ #include -SV_IMPL_VARARR(HighlightPortions, HighlightPortion) - - // ########################################################################## // ATTENTION: all these words needs to be in small caps // ########################################################################## @@ -849,7 +846,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( UINT32 nParseLine, const String portion.nEnd = (UINT16)(pEndPos - mpStringBegin); portion.tokenType = eType; - portions.Insert(portion, portions.Count()); + portions.push_back(portion); } } diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx index 32bdfe40a3fb..cb33ea7d50e6 100644 --- a/svtools/source/edit/textdata.cxx +++ b/svtools/source/edit/textdata.cxx @@ -37,7 +37,7 @@ SV_IMPL_PTRARR( TextLines, TextLinePtr ); SV_IMPL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo ); - // ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TextSelection // ------------------------------------------------------------------------- @@ -66,7 +66,7 @@ void TextSelection::Justify() } - // ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TETextPortionList // ------------------------------------------------------------------------- TETextPortionList::TETextPortionList() @@ -129,7 +129,7 @@ USHORT TETextPortionList::GetPortionStartIndex( USHORT nPortion ) */ - // ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TEParaPortion // ------------------------------------------------------------------------- TEParaPortion::TEParaPortion( TextNode* pN ) @@ -254,7 +254,7 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedL } } - // ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TEParaPortions // ------------------------------------------------------------------------- TEParaPortions::TEParaPortions() @@ -274,7 +274,7 @@ void TEParaPortions::Reset() clear(); } - // ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class IdleFormatter // ------------------------------------------------------------------------- IdleFormatter::IdleFormatter() -- cgit From 4d4e18c04461b3ab0ff8b3b09878420ab9ba31b1 Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Wed, 22 Sep 2010 00:20:04 +0200 Subject: svarray: #i112395#: replace svarray with from STL --- svtools/inc/svtools/parrtf.hxx | 4 ++-- svtools/source/svrtf/parrtf.cxx | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx index 179f5a28259a..b96e3937231d 100644 --- a/svtools/inc/svtools/parrtf.hxx +++ b/svtools/inc/svtools/parrtf.hxx @@ -30,7 +30,7 @@ #include "svtools/svtdllapi.h" #include -#include +#include struct RtfParserState_Impl { @@ -42,7 +42,7 @@ struct RtfParserState_Impl {} }; -SV_DECL_VARARR( RtfParserStates_Impl, RtfParserState_Impl, 16, 16 ) +typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl; class SVT_DLLPUBLIC SvRTFParser : public SvParser { diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 1c578d160307..1787238730dc 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -44,8 +44,6 @@ const int MAX_TOKEN_LEN = 128; #define RTF_ISDIGIT( c ) (c >= '0' && c <= '9') #define RTF_ISALPHA( c ) ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ) -SV_IMPL_VARARR( RtfParserStates_Impl, RtfParserState_Impl ) - SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize ) : SvParser( rIn, nStackSize ), eUNICodeSet( RTL_TEXTENCODING_MS_1252 ), // default ist ANSI-CodeSet @@ -175,14 +173,13 @@ int SvRTFParser::_GetNextToken() nUCharOverread = (BYTE)nTokenValue; #if 1 //cmc: other ifdef breaks #i3584 - aParserStates[ aParserStates.Count()-1]. + aParserStates.top(). nUCharOverread = nUCharOverread; #else if( !nUCharOverread ) - nUCharOverread = aParserStates[ - aParserStates.Count()-1].nUCharOverread; + nUCharOverread = aParserStates.top().nUCharOverread; else - aParserStates[ aParserStates.Count()-1]. + aParserStates.top(). nUCharOverread = nUCharOverread; #endif } @@ -252,11 +249,10 @@ int SvRTFParser::_GetNextToken() if( 0 <= nOpenBrakets ) { RtfParserState_Impl aState( nUCharOverread, GetSrcEncoding() ); - aParserStates.Insert( - aState, sal::static_int_cast< USHORT >(nOpenBrakets) ); + aParserStates.push( aState ); } ++nOpenBrakets; - DBG_ASSERT( nOpenBrakets == aParserStates.Count(), + DBG_ASSERT( nOpenBrakets == aParserStates.size(), "ParserStateStack unequal to bracket count" ); nRet = nNextCh; } @@ -266,12 +262,11 @@ int SvRTFParser::_GetNextToken() --nOpenBrakets; if( 0 <= nOpenBrakets ) { - aParserStates.Remove( - sal::static_int_cast< USHORT >(nOpenBrakets) ); - if( aParserStates.Count() ) + aParserStates.pop(); + if( !aParserStates.empty() ) { const RtfParserState_Impl& rRPS = - aParserStates[ aParserStates.Count() - 1 ]; + aParserStates.top(); nUCharOverread = rRPS.nUCharOverread; SetSrcEncoding( rRPS.eCodeSet ); } @@ -281,7 +276,7 @@ int SvRTFParser::_GetNextToken() SetSrcEncoding( GetCodeSet() ); } } - DBG_ASSERT( nOpenBrakets == aParserStates.Count(), + DBG_ASSERT( nOpenBrakets == aParserStates.size(), "ParserStateStack unequal to bracket count" ); nRet = nNextCh; break; @@ -690,8 +685,8 @@ void SvRTFParser::SetEncoding( rtl_TextEncoding eEnc ) if (eEnc == RTL_TEXTENCODING_DONTKNOW) eEnc = GetCodeSet(); - if (aParserStates.Count()) - aParserStates[aParserStates.Count() - 1].eCodeSet = eEnc; + if (!aParserStates.empty()) + aParserStates.top().eCodeSet = eEnc; SetSrcEncoding(eEnc); } -- cgit From 053897811bca93bc94557e6fcd75021b8daebdcb Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 22 Sep 2010 13:36:14 +0200 Subject: vcl115: #i114666# fix some warnings (thanks pjanik!) --- svtools/source/filter.vcl/filter/exportdialog.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index c04b587b6278..20cc46a30ab5 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -396,7 +396,7 @@ awt::Size ExportDialog::GetOriginalSize() } } } - return awt::Size( aShapesRange.getWidth(), aShapesRange.getHeight() ); + return awt::Size( static_cast(aShapesRange.getWidth()), static_cast(aShapesRange.getHeight()) ); } void ExportDialog::GetGraphicSource() @@ -1227,23 +1227,23 @@ void ExportDialog::updatePreview() if ( fXRatio > 1.0 ) { aSize.Width() = maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); - aSize.Width() /= fXRatio; + aSize.Width() /= static_cast(fXRatio); } else { aSize.Width() = maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); - aSize.Width() /= fXRatio; + aSize.Width() /= static_cast(fXRatio); } if ( fYRatio > 1.0 ) { aSize.Height() = maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); - aSize.Height() /= fYRatio; + aSize.Height() /= static_cast(fYRatio); } else { aSize.Height() = maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); - aSize.Height() /= fYRatio; + aSize.Height() /= static_cast(fYRatio); } if ( aSize.Width() < maSize.Width ) @@ -1260,7 +1260,7 @@ void ExportDialog::updatePreview() Bitmap aCroppedBitmap( maBitmap ); aCroppedBitmap.Crop( Rectangle( aPos, aSize ) ); aSize = aCroppedBitmap.GetSizePixel(); - aSize = Size( aSize.Width() * fXRatio, aSize.Height() * fYRatio ); + aSize = Size( static_cast(aSize.Width() * fXRatio), static_cast(aSize.Height() * fYRatio) ); aCroppedBitmap.Scale( aSize ); if ( aSize.Width() > aFixedBitmapSize.Width() ) @@ -1347,7 +1347,7 @@ void ExportDialog::updateControls() case 0 : nResolution = maResolution.Width / 100; break; // pixels / cm case 2 : nResolution = maResolution.Width; break; // pixels / meter default: - case 1 : nResolution = maResolution.Width * 0.0254; break; // pixels / inch + case 1 : nResolution = static_cast< sal_Int32 >(maResolution.Width * 0.0254); break; // pixels / inch } maNfResolution.SetValue( nResolution ); -- cgit From 6af5de845541bef97f45a5bab770642c433d1a4c Mon Sep 17 00:00:00 2001 From: os Date: Thu, 23 Sep 2010 15:51:45 +0200 Subject: shape properties wzDescription and wzName support added --- svtools/inc/rtfkeywd.hxx | 1 + svtools/inc/rtftoken.h | 2 +- svtools/source/svrtf/rtfkey2.cxx | 1 + svtools/source/svrtf/rtfkeywd.cxx | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx index 60963c58abbc..de59e1d8faf9 100644 --- a/svtools/inc/rtfkeywd.hxx +++ b/svtools/inc/rtfkeywd.hxx @@ -1121,6 +1121,7 @@ #define OOO_STRING_SVTOOLS_RTF_SHP "\\shp" #define OOO_STRING_SVTOOLS_RTF_SN "\\sn" #define OOO_STRING_SVTOOLS_RTF_SV "\\sv" +#define OOO_STRING_SVTOOLS_RTF_SP "\\sp" // Support for overline attributes #define OOO_STRING_SVTOOLS_RTF_OL "\\ol" diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h index e75254487312..f292682a0236 100644 --- a/svtools/inc/rtftoken.h +++ b/svtools/inc/rtftoken.h @@ -1258,7 +1258,7 @@ enum RTF_TOKEN_IDS { RTF_SOUTLVL, // shapes - RTF_SHP, RTF_SN, RTF_SV + RTF_SHP, RTF_SN, RTF_SV, RTF_SP /* RTF_SHPLEFT, RTF_SHPTOP, diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx index 03a7667f48e2..a4335302f475 100644 --- a/svtools/source/svrtf/rtfkey2.cxx +++ b/svtools/source/svrtf/rtfkey2.cxx @@ -1128,6 +1128,7 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" ); /* sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" ); diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 27ce3643f8cf..9b29951ddbbf 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -1160,6 +1160,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { */ {{OOO_STRING_SVTOOLS_RTF_SN}, RTF_SN}, {{OOO_STRING_SVTOOLS_RTF_SV}, RTF_SV}, + {{OOO_STRING_SVTOOLS_RTF_SP}, RTF_SP}, // Support for overline attributes {{OOO_STRING_SVTOOLS_RTF_OL}, RTF_OL}, -- cgit From 9f5cef4435e7db234b879e9130cf4e9cddf6f835 Mon Sep 17 00:00:00 2001 From: sj Date: Fri, 24 Sep 2010 17:25:04 +0200 Subject: impress201: #114721# applied patch... improved detection of pict graphics --- svtools/source/filter.vcl/filter/filter.cxx | 44 +++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index db1f4c11cf94..60b4b7f5a2f1 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -552,16 +552,48 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B if( !bTest || ( rFormatExtension.CompareToAscii( "PCT", 3 ) == COMPARE_EQUAL ) ) { bSomethingTested = TRUE; - BYTE sBuf[4]; + BYTE sBuf[3]; + // store number format + sal_uInt16 oldNumberFormat = rStream.GetNumberFormatInt(); sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes - for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 ) + for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 ) { - rStream.Seek( nStreamPos + nOffset ); + short y1,x1,y2,x2; + bool bdBoxOk = true; + + rStream.Seek( nStreamPos + nOffset); + // size of the pict in version 1 pict ( 2bytes) : ignored + rStream.SeekRel(2); + // bounding box (bytes 2 -> 9) + rStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN); + rStream >> y1 >> x1 >> y2 >> x2; + rStream.SetNumberFormatInt(oldNumberFormat); // reset format + + if (x1 > x2 || y1 > y2 || // bad bdbox + (x1 == x2 && y1 == y2) || // 1 pixel picture + x2-x1 > 2048 || y2-y1 > 2048 ) // picture anormaly big + bdBoxOk = false; + + // read version op rStream.Read( sBuf,3 ); - if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && ( sBuf[ 2 ] == 0x01 || sBuf[ 2 ] == 0x02 ) ) + // see http://developer.apple.com/legacy/mac/library/documentation/mac/pdf/Imaging_With_QuickDraw/Appendix_A.pdf + // normal version 2 - page A23 and A24 + if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x02) { - rFormatExtension = UniString::CreateFromAscii( "PCT", 3 ); - return TRUE; + rFormatExtension = UniString::CreateFromAscii( "PCT", 3 ); + return TRUE; + } + // normal version 1 - page A25 + else if (sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 && bdBoxOk) { + rFormatExtension = UniString::CreateFromAscii( "PCT", 3 ); + return TRUE; + } + // previous code kept in order to do not break any compatibility + // probably eroneous + else if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x01 && bdBoxOk) + { + rFormatExtension = UniString::CreateFromAscii( "PCT", 3 ); + return TRUE; } } } -- cgit From 2768b48ed3ad36fd31c38b2cbb5b0b7c37afebf2 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 27 Sep 2010 23:21:07 +0200 Subject: dba34a: #i31275# allow 'select as you type' aka 'quick selection' for tree list boxes (SvLBox derivees, to be precise), and enable this for Base main window, and the stylist --- svtools/inc/svtools/svlbox.hxx | 29 +++++++++++----- svtools/source/contnr/svicnvw.cxx | 1 + svtools/source/contnr/svimpbox.cxx | 25 ++++++++++---- svtools/source/contnr/svlbox.cxx | 71 ++++++++++++++++++++++++++++++++------ 4 files changed, 100 insertions(+), 26 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index 5b1f13120756..95fbd9f014d1 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -47,6 +47,7 @@ #include #endif #include +#include #include #include #include @@ -253,10 +254,12 @@ DECLARE_SVTREELIST(SvLBoxTreeList, SvLBoxEntry*) class SvLBox; struct SvLBox_Impl { - bool m_bIsEmptyTextAllowed; - bool m_bEntryMnemonicsEnabled; - Link* m_pLink; - ::vcl::MnemonicEngine m_aMnemonicEngine; + bool m_bIsEmptyTextAllowed; + bool m_bEntryMnemonicsEnabled; + bool m_bDoingQuickSelection; + Link* m_pLink; + ::vcl::MnemonicEngine m_aMnemonicEngine; + ::vcl::QuickSelectionEngine m_aQuickSelectionEngine; SvLBox_Impl( SvLBox& _rBox ); }; @@ -267,6 +270,7 @@ class SVT_DLLPUBLIC SvLBox ,public DropTargetHelper ,public DragSourceHelper ,public ::vcl::IMnemonicEntryList + ,public ::vcl::ISearchableStringList { friend class SvLBoxEntry; @@ -375,11 +379,18 @@ protected: // for asynchronous D&D sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView ); - // IMnemonicEntryList - virtual const void* FirstSearchEntry( String& _rEntryText ); - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ); - virtual void SelectSearchEntry( const void* _pEntry ); - virtual void ExecuteSearchEntry( const void* _pEntry ); + void OnCurrentEntryChanged(); + + // IMnemonicEntryList + virtual const void* FirstSearchEntry( String& _rEntryText ) const; + virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const; + virtual void SelectSearchEntry( const void* _pEntry ); + virtual void ExecuteSearchEntry( const void* _pEntry ) const; + + // ISearchableStringList + virtual ::vcl::StringEntryIdentifier CurrentEntry( String& _out_entryText ) const; + virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const; + virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); public: diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index 5556d299b2c2..6fd0f5bf0c9c 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -467,6 +467,7 @@ void SvIconView::SelectAll( BOOL bSelect, BOOL ) void SvIconView::SetCurEntry( SvLBoxEntry* _pEntry ) { pImp->SetCursor( _pEntry ); + OnCurrentEntryChanged(); } SvLBoxEntry* SvIconView::GetCurEntry() const diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 7de5f38fab69..c251903d02bd 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -684,6 +684,8 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect ) } } nFlags &= (~F_DESEL_ALL); + + pView->OnCurrentEntryChanged(); } void SvImpLBox::ShowCursor( BOOL bShow ) @@ -2484,13 +2486,17 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) else if ( !bShift /*&& !bMod1*/ ) { if ( aSelEng.IsAddMode() ) + { // toggle selection pView->Select( pCursor, !pView->IsSelected( pCursor ) ); - else + } + else if ( !pView->IsSelected( pCursor ) ) { SelAllDestrAnch( FALSE ); pView->Select( pCursor, TRUE ); } + else + bKeyUsed = FALSE; } else bKeyUsed = FALSE; @@ -2571,8 +2577,8 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) case KEY_A: if( bMod1 ) SelAllDestrAnch( TRUE ); -// else -// bKeyUsed = FALSE; #105907# assume user wants to use quicksearch with key "a", so key is handled! + else + bKeyUsed = FALSE; break; case KEY_SUBTRACT: @@ -2683,10 +2689,15 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) break; default: - if( bMod1 || rKeyCode.GetGroup() == KEYGROUP_FKEYS ) - // #105907# CTRL or Function key is pressed, assume user don't want to use quicksearch... - // if there are groups of keys which should not be handled, they can be added here - bKeyUsed = FALSE; + // is there any reason why we should eat the events here? The only place where this is called + // is from SvTreeListBox::KeyInput. If we set bKeyUsed to TRUE here, then the key input + // is just silenced. However, we want SvLBox::KeyInput to get a chance, to do the QuickSelection + // handling. + // (The old code here which intentionally set bKeyUsed to TRUE said this was because of "quick search" + // handling, but actually there was no quick search handling anymore. We just re-implemented it.) + // #i31275# / 2009-06-16 / frank.schoenheit@sun.com + bKeyUsed = FALSE; + break; } return bKeyUsed; } diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index a8bb6055768e..11e19c6bab3c 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -685,6 +685,7 @@ SvLBox_Impl::SvLBox_Impl( SvLBox& _rBox ) ,m_bEntryMnemonicsEnabled( false ) ,m_pLink( NULL ) ,m_aMnemonicEngine( _rBox ) + ,m_aQuickSelectionEngine( _rBox ) { } @@ -1249,6 +1250,12 @@ ULONG SvLBox::SelectChilds( SvLBoxEntry* , BOOL ) return 0; } +void SvLBox::OnCurrentEntryChanged() +{ + if ( !pLBoxImpl->m_bDoingQuickSelection ) + pLBoxImpl->m_aQuickSelectionEngine.Reset(); +} + void SvLBox::SelectAll( BOOL /* bSelect */ , BOOL /* bPaint */ ) { DBG_CHKTHIS(SvLBox,0); @@ -1533,15 +1540,14 @@ void SvLBox::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -const void* SvLBox::FirstSearchEntry( String& _rEntryText ) +const void* SvLBox::FirstSearchEntry( String& _rEntryText ) const { SvLBoxEntry* pEntry = GetCurEntry(); if ( pEntry ) pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) ); else { - if ( !pEntry ) - pEntry = FirstSelected(); + pEntry = FirstSelected(); if ( !pEntry ) pEntry = First(); } @@ -1552,11 +1558,23 @@ const void* SvLBox::FirstSearchEntry( String& _rEntryText ) return pEntry; } -const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) +const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const { SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pCurrentSearchEntry ) ); - pEntry = Next( pEntry ); + if ( ( ( GetChildCount( pEntry ) > 0 ) + || ( pEntry->HasChildsOnDemand() ) + ) + && !IsExpanded( pEntry ) + ) + { + pEntry = NextSibling( pEntry ); + } + else + { + pEntry = Next( pEntry ); + } + if ( !pEntry ) pEntry = First(); @@ -1570,7 +1588,7 @@ void SvLBox::SelectSearchEntry( const void* _pEntry ) { SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); DBG_ASSERT( pEntry, "SvLBox::SelectSearchEntry: invalid entry!" ); - if ( pEntry ) + if ( !pEntry ) return; SelectAll( FALSE ); @@ -1578,17 +1596,50 @@ void SvLBox::SelectSearchEntry( const void* _pEntry ) Select( pEntry ); } -void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) +void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const { // nothing to do here, we have no "execution" } +::vcl::StringEntryIdentifier SvLBox::CurrentEntry( String& _out_entryText ) const +{ + // always accept the current entry if there is one + SvLBoxEntry* pCurrentEntry( GetCurEntry() ); + if ( pCurrentEntry ) + { + _out_entryText = GetEntryText( pCurrentEntry ); + return pCurrentEntry; + } + return FirstSearchEntry( _out_entryText ); +} + +::vcl::StringEntryIdentifier SvLBox::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const +{ + return NextSearchEntry( _currentEntry, _out_entryText ); +} + +void SvLBox::SelectEntry( ::vcl::StringEntryIdentifier _entry ) +{ + SelectSearchEntry( _entry ); +} + bool SvLBox::HandleKeyInput( const KeyEvent& _rKEvt ) { - if ( !IsEntryMnemonicsEnabled() ) - return false; + if ( IsEntryMnemonicsEnabled() + && pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt ) + ) + return true; + + if ( ( GetStyle() & WB_QUICK_SEARCH ) != 0 ) + { + pLBoxImpl->m_bDoingQuickSelection = true; + const bool bHandled = pLBoxImpl->m_aQuickSelectionEngine.HandleKeyEvent( _rKEvt ); + pLBoxImpl->m_bDoingQuickSelection = false; + if ( bHandled ) + return true; + } - return pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt ); + return false; } SvLBoxEntry* SvLBox::GetEntry( const Point&, BOOL ) const -- cgit From 23bfb3338707c9499f5ed9bedc4826b24ca1511e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 29 Sep 2010 18:06:23 +0200 Subject: fix a merge problem --- svtools/source/filter.vcl/filter/filter2.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'svtools') diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index 5accda061df0..d91ec1a19772 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -1115,6 +1115,8 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL ) nFormat = GFF_PCT; else { + sal_Int32 nStmPos = rStm.Tell(); + BYTE sBuf[4]; rStm.SeekRel( 522 ); -- cgit From 3645e96db1ef4aa0e781337b9c478ebf60369890 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 5 Oct 2010 16:38:28 +0200 Subject: CWS changehid: remove duplicated definitions of HIDs --- svtools/inc/svtools/helpid.hrc | 25 ++++++++++++++++++++++--- svtools/util/hidother.src | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index f19cf1a17aa3..ecf8ba4b1bf7 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -42,6 +42,28 @@ #define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" #define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" #define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" +#define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SVT_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SVT_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "SVT_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SVT_HID_FILEDLG_READ_ONLY" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SVT_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SVT_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SVT_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SVT_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SVT_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SVT_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SVT_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_FILEDLG_EDIT_FAVORITES "SVT_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SVT_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_FILEDLG_EXPORTASPDF "SVT_HID_FILEDLG_EXPORTASPDF" // HelpID's fuer die Textkomponente #define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" @@ -93,9 +115,6 @@ #define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" #define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" -#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" -#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" - // uniqueid for the helpagent window (testtool) #define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src index 77dd98115221..03aea7ebdf7e 100644 --- a/svtools/util/hidother.src +++ b/svtools/util/hidother.src @@ -57,3 +57,23 @@ hidspecial HID_PRINTDIALOG_TOFILE { HelpID = HID_PRINTDIALOG_TOFIL hidspecial HID_WIZARD_NEXT { HelpID = HID_WIZARD_NEXT; }; hidspecial HID_WIZARD_PREVIOUS { HelpID = HID_WIZARD_PREVIOUS; }; +hidspecial HID_FILEDLG_LINK_CB { HelpID = HID_FILEDLG_LINK_CB; }; +hidspecial HID_FILEDLG_PREVIEW_CB { HelpID = HID_FILEDLG_PREVIEW_CB; }; +hidspecial HID_FILEDLG_FILE { HelpID = HID_FILEDLG_FILE; }; +hidspecial HID_FILEDLG_MANAGER { HelpID = HID_FILEDLG_MANAGER; }; +hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; }; +hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; +hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; +hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; +hidspecial HID_FILEDLG_AUTOCOMPLETEBOX { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; }; +hidspecial HID_FILEDLG_SAVE_BTN { HelpID = HID_FILEDLG_SAVE_BTN; }; +hidspecial HID_FILEDLG_SAVE_FILENAME { HelpID = HID_FILEDLG_SAVE_FILENAME; }; +hidspecial HID_FILEDLG_SAVE_FILETYPE { HelpID = HID_FILEDLG_SAVE_FILETYPE; }; +hidspecial HID_FILEDLG_INSERT_BTN { HelpID = HID_FILEDLG_INSERT_BTN; }; +hidspecial HID_FILEDLG_PATH_BTN { HelpID = HID_FILEDLG_PATH_BTN; }; +hidspecial HID_FILEDLG_PATH_FILENAME { HelpID = HID_FILEDLG_PATH_FILENAME; }; +hidspecial HID_FILEDLG_FOLDER_BTN { HelpID = HID_FILEDLG_FOLDER_BTN; }; +hidspecial HID_FILEDLG_FOLDER_FILENAME { HelpID = HID_FILEDLG_FOLDER_FILENAME; }; +hidspecial HID_FILEDLG_SRCHFOLDER_BTN { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; }; -- cgit From 7fcbcc4b70c1e905e6cdd08ab79ea8ebd0720a5b Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 11 Oct 2010 13:59:41 +0200 Subject: dba34b: during #i112779#: don't hold an extra BitmapEx in ImageControl, use base classes Image instead --- svtools/source/uno/unoiface.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 2d22d9cedb33..18ab6f804d0c 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1652,7 +1652,7 @@ void SVTXRoadmap::ImplSetNewImage() { OSL_PRECOND( GetWindow(), "SVTXRoadmap::ImplSetNewImage: window is required to be not-NULL!" ); ::svt::ORoadmap* pButton = static_cast< ::svt::ORoadmap* >( GetWindow() ); - pButton->SetRoadmapBitmap( GetBitmap() ); + pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() ); } void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) -- cgit From e1b5342bdc0b933e334a24e91ad370b04f9f2f79 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- svtools/bmpmaker/bmp.src | 8 ++++++++ svtools/source/contnr/fileview.src | 4 ++++ svtools/source/contnr/templwin.src | 2 ++ svtools/source/dialogs/addresstemplate.src | 5 +++++ svtools/source/dialogs/colrdlg.src | 13 ++++++++++++ svtools/source/dialogs/printdlg.src | 16 +++++++++++++++ svtools/source/dialogs/prnsetup.src | 4 ++++ svtools/source/filter.vcl/filter/exportdialog.src | 24 ++++++++++++++++++++++ svtools/source/plugapp/testtool.src | 7 +++++++ .../source/productregistration/registrationdlg.src | 4 ++++ svtools/workben/unodialog/roadmapskeleton.src | 5 +++++ 11 files changed, 92 insertions(+) mode change 100755 => 100644 svtools/source/filter.vcl/filter/exportdialog.src (limited to 'svtools') diff --git a/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src index 7431d2e335a4..30ff9488a805 100644 --- a/svtools/bmpmaker/bmp.src +++ b/svtools/bmpmaker/bmp.src @@ -27,6 +27,7 @@ #include "bmp.hrc" ModalDialog DLG_PATH { + HelpID = "svtools:ModalDialog:DLG_PATH"; OutputSize = TRUE; SVLook = TRUE; Size = MAP_APPFONT( 301, 104 ); @@ -54,36 +55,42 @@ ModalDialog DLG_PATH { Text = "Bitmap-Pfad:"; }; Edit EDT_SRS { + HelpID = "svtools:Edit:DLG_PATH:EDT_SRS"; Border = TRUE; Pos = MAP_APPFONT( 65, 14 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_RES { + HelpID = "svtools:Edit:DLG_PATH:EDT_RES"; Border = TRUE; Pos = MAP_APPFONT( 65, 29 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_OUT { + HelpID = "svtools:Edit:DLG_PATH:EDT_OUT"; Border = TRUE; Pos = MAP_APPFONT( 65, 44 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; PushButton BTN_SRS { + HelpID = "svtools:PushButton:DLG_PATH:BTN_SRS"; Pos = MAP_APPFONT( 228, 14 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_RES { + HelpID = "svtools:PushButton:DLG_PATH:BTN_RES"; Pos = MAP_APPFONT( 228, 29 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_OUT { + HelpID = "svtools:PushButton:DLG_PATH:BTN_OUT"; Pos = MAP_APPFONT( 228, 44 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -106,6 +113,7 @@ ModalDialog DLG_PATH { Text = "Sprache"; }; ListBox LB_LANG { + HelpID = "svtools:ListBox:DLG_PATH:LB_LANG"; Border = TRUE; Pos = MAP_APPFONT( 12, 76 ); Size = MAP_APPFONT( 231, 70 ); diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index f40530c10347..bcb282f44615 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.src @@ -110,6 +110,7 @@ Menu RID_FILEVIEW_CONTEXTMENU ModalDialog DLG_SVT_QUERYDELETE { + HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -142,6 +143,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_YES { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES"; Pos = MAP_APPFONT ( 6 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -151,6 +153,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_ALL { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL"; Pos = MAP_APPFONT ( 59 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -160,6 +163,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_NO { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO"; Pos = MAP_APPFONT ( 112 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index 048d052c18d8..45f9803539a1 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -289,12 +289,14 @@ ModalDialog DLG_DOCTEMPLATE }; PushButton BTN_DOCTEMPLATE_MANAGE { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE"; Pos = MAP_APPFONT( 6, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Organi~ze..."; }; PushButton BTN_DOCTEMPLATE_EDIT { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT"; Pos = MAP_APPFONT( 59, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "~Edit"; diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..cbbb56d220f7 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -39,6 +39,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE { + HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE"; SVLook = TRUE ; OutputSize = TRUE ; Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_DATASOURCE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 13 ) ; Size = MAP_APPFONT ( 96, 55 ) ; @@ -73,6 +75,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; PushButton PB_ADMINISTATE_DATASOURCES { + HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES"; Text [ en-US ] = "~Address Data Source..."; SVLook = TRUE ; Pos = MAP_APPFONT ( 204, 13 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_TABLE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 30 ) ; Size = MAP_APPFONT ( 96, 55 ) ; @@ -121,6 +125,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; \ ListBox LB_FIELD_BASE + row * 2 + column \ { \ + HelpID = "svtools:ListBox:DLG_ADDRESSBOOKSOURCE:LB_FIELD_BASE"; SVLook = TRUE; \ Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \ Size = MAP_APPFONT ( 42 , 14 ) ; \ diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index ad9a5c1aa015..a93642b0bd05 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.src @@ -29,6 +29,7 @@ #define DIFF 3 ModalDialog DLG_COLOR { + HelpID = "svtools:ModalDialog:DLG_COLOR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 165 + DIFF ) ; @@ -93,6 +94,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_CYAN { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_CYAN"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 109 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -106,6 +108,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_MAGENTA { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_MAGENTA"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -119,6 +122,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_YELLOW { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_YELLOW"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -132,6 +136,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_KEY { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_KEY"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -163,6 +168,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_RED { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_RED"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -174,6 +180,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_GREEN { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_GREEN"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -185,6 +192,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_BLUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_BLUE"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -202,6 +210,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_HUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_HUE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -219,6 +228,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_SATURATION { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_SATURATION"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -236,6 +246,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_LUMINANCE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_LUMINANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -247,6 +258,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_1 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_1"; Pos = MAP_APPFONT ( 80 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "~<--" ; @@ -254,6 +266,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_2 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_2"; Pos = MAP_APPFONT ( 100 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "--~>" ; diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 405accc63344..80c6e465d49a 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.src @@ -31,6 +31,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -50,6 +51,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 13 ) ; Size = MAP_APPFONT ( 130 , 80 ) ; @@ -58,6 +60,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 193 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -114,12 +117,14 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; Edit EDT_FAXNO { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO"; Border = TRUE; Pos = MAP_APPFONT ( 60 , 73 ); Size = MAP_APPFONT ( 188 , 12 ); }; CheckBox CBX_FILEPRINT { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "Print to file" ; @@ -132,6 +137,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG /*!!! PushButton BTN_BROWSE { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE"; Pos = MAP_APPFONT ( 234 , 75 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -146,18 +152,21 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 102 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All sheets" ; }; RadioButton RBT_SELECTED_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected sheets" ; }; RadioButton RBT_SELECTED_CELLS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS"; Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected cells" ; @@ -170,24 +179,28 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All pages" ; }; RadioButton RBT_PAGES { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES"; Pos = MAP_APPFONT ( 12 , 165 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Pages" ; }; Edit EDT_PAGES { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 164 ) ; Size = MAP_APPFONT ( 52 , 12 ) ; }; RadioButton RBT_SELECTION { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 179 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; @@ -213,6 +226,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; NumericField NUM_COPIES { + HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 201 , 102 ) ; Size = MAP_APPFONT ( 33 , 12 ) ; @@ -226,6 +240,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; CheckBox CBX_COLLATE { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE"; Pos = MAP_APPFONT ( 201 , 123 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Co~llate" ; @@ -249,6 +264,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS"; Hide = TRUE ; Pos = MAP_APPFONT ( 6 , 190 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..afdf7d56864e 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.src @@ -138,6 +138,7 @@ String STR_SVT_PRNDLG_JOBCOUNT ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -157,6 +158,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 12 ) ; Size = MAP_APPFONT ( 125 , 80 ) ; @@ -165,6 +167,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 188 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -220,6 +223,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS"; Pos = MAP_APPFONT ( 5 , 84 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Options..." ; diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src old mode 100755 new mode 100644 index 065fcee6ba18..c9e87989a314 --- a/svtools/source/filter.vcl/filter/exportdialog.src +++ b/svtools/source/filter.vcl/filter/exportdialog.src @@ -34,6 +34,7 @@ String DLG_EXPORT_TITLE ModalDialog DLG_EXPORT { + HelpID = "svtools:ModalDialog:DLG_EXPORT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 135 ) ; @@ -54,6 +55,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEX { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ) ; @@ -68,6 +70,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEX { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEY { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ); @@ -104,6 +108,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEY { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -126,6 +131,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_RESOLUTION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -137,6 +143,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_RESOLUTION { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -157,6 +164,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_COLOR_DEPTH { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -225,6 +233,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_COMPRESSION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -260,18 +269,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_JPG_PREVIEW { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Preview" ; }; CheckBox CB_INTERLACED { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interlaced" ; }; CheckBox CB_RLE_ENCODING { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "RLE encoding" ; @@ -284,18 +296,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_SAVE_TRANSPARENCY { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Save transparency" ; }; RadioButton RB_BINARY { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Binary" ; }; RadioButton RB_TEXT { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Text" ; @@ -308,12 +323,14 @@ ModalDialog DLG_EXPORT }; CheckBox CB_EPS_PREVIEW_TIFF { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Image Preview (TIFF)" ; }; CheckBox CB_EPS_PREVIEW_EPSI { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interchange (EPSI)" ; @@ -326,12 +343,14 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_LEVEL1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 1" ; }; RadioButton RB_EPS_LEVEL2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 2" ; @@ -344,24 +363,28 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_COLOR_FORMAT1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Color" ; }; RadioButton RB_EPS_COLOR_FORMAT2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Grayscale" ; }; RadioButton RB_EPS_COMPRESSION_LZW { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "LZW encoding" ; }; RadioButton RB_EPS_COMPRESSION_NONE { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "None" ; @@ -413,6 +436,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_ZOOM { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 9cc52c58f013..e456200943f6 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.src @@ -104,6 +104,7 @@ Bitmap TT_SHOW2 { }; WorkWindow TT_INLINE_TRANSLATION { + HelpID = "svtools:WorkWindow:TT_INLINE_TRANSLATION"; SVLook = TRUE; Size = MAP_APPFONT( 2*Control_Border + 4*ButtonWidth + 3*Button_Button, 120 ); Moveable = TRUE; @@ -116,6 +117,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Translation"; }; Edit TT_E_NEW { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_NEW"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 16 ); @@ -134,6 +136,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Comment"; }; Edit TT_E_COMMENT { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_COMMENT"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 64 ); @@ -142,12 +145,14 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Comment"; }; PushButton TT_PB_SELECT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_SELECT"; Pos = MAP_APPFONT( Control_Border, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; Text[ en-US ] = "~Select"; }; PushButton TT_PB_RESTORE { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_RESTORE"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -155,6 +160,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Restore"; }; PushButton TT_PB_ACCEPT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_ACCEPT"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -162,6 +168,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Accept"; }; PushButton TT_PB_NEXT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_NEXT"; Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src index c4cdcbcbe3ec..64f1063f1ba3 100644 --- a/svtools/source/productregistration/registrationdlg.src +++ b/svtools/source/productregistration/registrationdlg.src @@ -72,6 +72,7 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_NOW { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW"; Pos = MAP_APPFONT ( 33 , 41 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Register now" ; @@ -79,18 +80,21 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_LATER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER"; Pos = MAP_APPFONT ( 33 , 54 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Remind me to register later" ; }; RadioButton RB_NEVER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER"; Pos = MAP_APPFONT ( 33 , 67 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Never register" ; }; RadioButton RB_DONE { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE"; Pos = MAP_APPFONT ( 33 , 80 ) ; Size = MAP_APPFONT ( 153 , 20 ) ; WordBreak = TRUE; diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src index 797490273b5f..33728c700df6 100644 --- a/svtools/workben/unodialog/roadmapskeleton.src +++ b/svtools/workben/unodialog/roadmapskeleton.src @@ -31,6 +31,7 @@ // ----------------------------------------------------------------------------- ModalDialog DLG_ROADMAP_SKELETON { + HelpID = "svtools:ModalDialog:DLG_ROADMAP_SKELETON"; OutputSize = TRUE ; Moveable = TRUE; Closeable = TRUE ; @@ -61,24 +62,28 @@ ModalDialog DLG_ROADMAP_SKELETON TabPage TP_WELCOME { + HelpID = "svtools:TabPage:TP_WELCOME"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_PREPARE { + HelpID = "svtools:TabPage:TP_PREPARE"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_SETUP { + HelpID = "svtools:TabPage:TP_SETUP"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_FINISH { + HelpID = "svtools:TabPage:TP_FINISH"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; -- cgit From e4bbb5436120650f4ec04e3b7c11e13af4ec16c1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 12 Oct 2010 10:41:23 +0200 Subject: CWS changehid: no HID for macro --- svtools/source/dialogs/addresstemplate.src | 1 - 1 file changed, 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index cbbb56d220f7..990dfc98f89b 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -125,7 +125,6 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; \ ListBox LB_FIELD_BASE + row * 2 + column \ { \ - HelpID = "svtools:ListBox:DLG_ADDRESSBOOKSOURCE:LB_FIELD_BASE"; SVLook = TRUE; \ Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \ Size = MAP_APPFONT ( 42 , 14 ) ; \ -- cgit From f9660fa98025fe598148abec121bb52191da608f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 14 Oct 2010 16:40:32 +0200 Subject: undoapi: first sketch of the listener API - not sure this will survive 'til the final version --- svtools/source/edit/textundo.cxx | 8 ++++---- svtools/source/edit/textundo.hxx | 4 ++-- svtools/source/edit/textview.cxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'svtools') diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index 4c243de16c31..1ea2ee41efd0 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -54,7 +54,7 @@ TextUndoManager::~TextUndoManager() { } -BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) +BOOL __EXPORT TextUndoManager::Undo() { if ( GetUndoActionCount() == 0 ) return FALSE; @@ -62,7 +62,7 @@ BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) UndoRedoStart(); mpTextEngine->SetIsInUndo( TRUE ); - BOOL bDone = SfxUndoManager::Undo( nCount ); + BOOL bDone = SfxUndoManager::Undo(); mpTextEngine->SetIsInUndo( FALSE ); UndoRedoEnd(); @@ -70,7 +70,7 @@ BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) return bDone; } -BOOL __EXPORT TextUndoManager::Redo( USHORT nCount ) +BOOL __EXPORT TextUndoManager::Redo() { if ( GetRedoActionCount() == 0 ) return FALSE; @@ -79,7 +79,7 @@ BOOL __EXPORT TextUndoManager::Redo( USHORT nCount ) UndoRedoStart(); mpTextEngine->SetIsInUndo( TRUE ); - BOOL bDone = SfxUndoManager::Redo( nCount ); + BOOL bDone = SfxUndoManager::Redo(); mpTextEngine->SetIsInUndo( FALSE ); UndoRedoEnd(); diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx index cc26c0b51ef6..27fe8933ad17 100644 --- a/svtools/source/edit/textundo.hxx +++ b/svtools/source/edit/textundo.hxx @@ -47,9 +47,9 @@ public: ~TextUndoManager(); using SfxUndoManager::Undo; - virtual BOOL Undo( USHORT nCount=1 ); + virtual BOOL Undo(); using SfxUndoManager::Redo; - virtual BOOL Redo( USHORT nCount=1 ); + virtual BOOL Redo(); }; diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 48cd23bdcc6f..a2f37c0bd34d 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -1122,13 +1122,13 @@ void TextView::Scroll( long ndX, long ndY ) void TextView::Undo() { mpImpl->mpTextEngine->SetActiveView( this ); - mpImpl->mpTextEngine->GetUndoManager().Undo( 1 ); + mpImpl->mpTextEngine->GetUndoManager().Undo(); } void TextView::Redo() { mpImpl->mpTextEngine->SetActiveView( this ); - mpImpl->mpTextEngine->GetUndoManager().Redo( 0 ); + mpImpl->mpTextEngine->GetUndoManager().Redo(); } void TextView::Cut() -- cgit From 32562151fdf2e9bbeec57fda3a1d96d5e3880b1c Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 20 Oct 2010 14:54:59 +0200 Subject: undoapi: made SfxUndoManager an implementation of the new, abstract ::svl::IUndoManager interface. Change the SfxShell's UndoManager attribute to be an IUndoManager. Did all the resulting changes up the source tree. This way, we'll hopefully be able to provide an IUndoManager implementation in Writer, which is not based on the SfxUndoManager, but on Writer's own Undo implementation. --- svtools/inc/svtools/texteng.hxx | 9 +++++++-- svtools/source/edit/texteng.cxx | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx index ef27edee2efe..a30f29ff750b 100644 --- a/svtools/inc/svtools/texteng.hxx +++ b/svtools/inc/svtools/texteng.hxx @@ -39,7 +39,6 @@ class TextAttrib; class TextCharAttrib; class TextUndo; class TextUndoManager; -class SfxUndoManager; class EditSelFunctionSet; class EditSelEngine; class IdleFormatter; @@ -49,6 +48,11 @@ class SfxUndoAction; class KeyEvent; class Timer; +namespace svl +{ + class IUndoManager; +} + class TextLine; class TETextPortion; #include @@ -280,7 +284,8 @@ public: BOOL IsRightToLeft() const { return mbRightToLeft; } BOOL HasUndoManager() const { return mpUndoManager ? TRUE : FALSE; } - SfxUndoManager& GetUndoManager(); + ::svl::IUndoManager& + GetUndoManager(); void UndoActionStart( USHORT nId ); void UndoActionEnd( USHORT nId ); void InsertUndo( TextUndo* pUndo, BOOL bTryMerge = FALSE ); diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index e0e136089d78..1aed79c3cafb 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -1430,7 +1430,7 @@ void TextEngine::EnableUndo( BOOL bEnable ) mbUndoEnabled = bEnable; } -SfxUndoManager& TextEngine::GetUndoManager() +::svl::IUndoManager& TextEngine::GetUndoManager() { if ( !mpUndoManager ) mpUndoManager = new TextUndoManager( this ); -- cgit From 955e88c80e9abce3f15aa55d434dae6ae17d7d43 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 22 Oct 2010 10:37:46 +0200 Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt --- svtools/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index a7d8569de301..a48983013d73 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,4 +1,4 @@ -st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL +st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL st svtools usr1 - all st_mkout NULL st svtools\inc nmake - all st_inc NULL st svtools\bmpmaker nmake - all st_bmp st_inc NULL -- cgit From d363b075683f89babef27425ed029583b0fb85dd Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 23 Oct 2010 15:48:00 +0200 Subject: svarray: #i112395#: fix warnings, enable exceptions, etc. --- svtools/source/edit/makefile.mk | 10 ++++------ svtools/source/svrtf/makefile.mk | 2 ++ svtools/source/svrtf/parrtf.cxx | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'svtools') diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk index 58a63be58f78..8d4da553cb0d 100644 --- a/svtools/source/edit/makefile.mk +++ b/svtools/source/edit/makefile.mk @@ -38,25 +38,23 @@ TARGET=edit # --- Files -------------------------------------------------------- SLOFILES= \ + $(EXCEPTIONSFILES) \ $(SLO)$/textdata.obj \ - $(SLO)$/textdoc.obj \ - $(SLO)$/texteng.obj \ $(SLO)$/textundo.obj \ - $(SLO)$/textview.obj \ $(SLO)$/txtattr.obj \ $(SLO)$/xtextedt.obj \ $(SLO)$/sychconv.obj \ $(SLO)$/svmedit.obj \ $(SLO)$/svmedit2.obj \ - $(SLO)$/textwindowpeer.obj \ - $(SLO)$/syntaxhighlight.obj \ $(SLO)$/editsyntaxhighlighter.obj EXCEPTIONSFILES= \ $(SLO)$/textview.obj \ $(SLO)$/textdoc.obj \ $(SLO)$/texteng.obj \ - $(SLO)$/textwindowpeer.obj + $(SLO)$/textwindowpeer.obj \ + $(SLO)$/syntaxhighlight.obj \ + # --- Targets ------------------------------------------------------ diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk index 5ebb0e28c69e..cb76882f5f94 100644 --- a/svtools/source/svrtf/makefile.mk +++ b/svtools/source/svrtf/makefile.mk @@ -30,6 +30,8 @@ PRJ=..$/.. PRJNAME=svtools TARGET=svrtf +ENABLE_EXCEPTIONS=TRUE + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 1787238730dc..3a775a7fc345 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -252,8 +252,9 @@ int SvRTFParser::_GetNextToken() aParserStates.push( aState ); } ++nOpenBrakets; - DBG_ASSERT( nOpenBrakets == aParserStates.size(), - "ParserStateStack unequal to bracket count" ); + DBG_ASSERT( + static_cast(nOpenBrakets) == aParserStates.size(), + "ParserStateStack unequal to bracket count" ); nRet = nNextCh; } break; @@ -276,8 +277,9 @@ int SvRTFParser::_GetNextToken() SetSrcEncoding( GetCodeSet() ); } } - DBG_ASSERT( nOpenBrakets == aParserStates.size(), - "ParserStateStack unequal to bracket count" ); + DBG_ASSERT( + static_cast(nOpenBrakets) == aParserStates.size(), + "ParserStateStack unequal to bracket count" ); nRet = nNextCh; break; -- cgit From 7abe5ea730c08466dce9a80a45cda41c88a4faad Mon Sep 17 00:00:00 2001 From: "Ocke.Janssen" Date: Thu, 28 Oct 2010 09:06:55 +0200 Subject: dba34b: #i115284# clear hdlentry when it going to be removed --- svtools/source/contnr/svtreebx.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index f4780fbf08ad..3ff4d2b11990 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -1146,9 +1146,11 @@ void SvTreeListBox::ModelIsRemoving( SvListEntry* pEntry ) NotifyRemoving( (SvLBoxEntry*)pEntry ); } -void SvTreeListBox::ModelHasRemoved( SvListEntry* /* pEntry */ ) +void SvTreeListBox::ModelHasRemoved( SvListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); + if ( pEntry == pHdlEntry) + pHdlEntry = NULL; pImp->EntryRemoved(); } -- cgit From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- svtools/AllLangResTarget_svt.mk | 4 ---- svtools/Library_svt.mk | 7 +------ svtools/inc/svtools/svtdata.hxx | 16 ---------------- svtools/source/dialogs/printdlg.cxx | 4 ---- 4 files changed, 1 insertion(+), 30 deletions(-) (limited to 'svtools') diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index c198601f3ca7..3574b2e6c9ec 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -61,10 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/prnsetup.src \ svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - svtools/source/filter.vcl/filter/dlgejpg.src \ - svtools/source/filter.vcl/filter/dlgepng.src \ - svtools/source/filter.vcl/filter/dlgexpor.src \ - svtools/source/filter.vcl/filter/strings.src \ svtools/source/java/javaerror.src \ svtools/source/misc/ehdl.src \ svtools/source/misc/helpagent.src \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index f8415a98b922..8fb07c2d8f49 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/config/optionsdrawinglayer \ svtools/source/config/printoptions \ svtools/source/contnr/contentenumeration \ - svtools/source/contnr/ctrdll \ svtools/source/contnr/fileview \ svtools/source/contnr/imivctl1 \ svtools/source/contnr/imivctl2 \ @@ -124,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/control/calendar \ svtools/source/control/collatorres \ svtools/source/control/ctrlbox \ - svtools/source/control/ctrldll \ svtools/source/control/ctrltool \ svtools/source/control/filectrl \ svtools/source/control/filectrl2 \ @@ -178,15 +176,12 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/edit/textwindowpeer \ svtools/source/edit/txtattr \ svtools/source/edit/xtextedt \ + svtools/source/filter.vcl/filter/exportdialog \ svtools/source/filter.vcl/filter/FilterConfigCache \ svtools/source/filter.vcl/filter/FilterConfigItem \ svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ - svtools/source/filter.vcl/filter/dlgejpg \ - svtools/source/filter.vcl/filter/dlgepng \ - svtools/source/filter.vcl/filter/dlgexpor \ svtools/source/filter.vcl/filter/filter \ svtools/source/filter.vcl/filter/filter2 \ - svtools/source/filter.vcl/filter/fldll \ svtools/source/filter.vcl/filter/sgfbram \ svtools/source/filter.vcl/filter/sgvmain \ svtools/source/filter.vcl/filter/sgvspln \ diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 91a50a15c666..ad7b60b3f2b7 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -57,23 +57,7 @@ public: }; //============================================================================ -<<<<<<< local - -class SvpResId: public ResId -{ -public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - - class SVT_DLLPUBLIC SvtResId: public ResId -======= -class SvtResId: public ResId ->>>>>>> other { public: SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale); diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 779ff1da903b..ab8b69fdcda1 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -38,12 +38,8 @@ #include #include #include -<<<<<<< local #include #include "svl/pickerhelper.hxx" -======= -#include ->>>>>>> other #include #include #include -- cgit From 5dc2ff871dc5adf0eeb882b6b24a447be0012c9f Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 4 Nov 2010 18:49:17 +0100 Subject: vcl117: #i115056# remove now unused svtools PrintDialog --- svtools/inc/svtools/printdlg.hxx | 297 -------------- svtools/source/dialogs/makefile.mk | 2 - svtools/source/dialogs/printdlg.cxx | 790 ------------------------------------ svtools/source/dialogs/printdlg.hrc | 74 ---- svtools/source/dialogs/printdlg.src | 349 ---------------- 5 files changed, 1512 deletions(-) delete mode 100644 svtools/inc/svtools/printdlg.hxx mode change 100755 => 100644 svtools/source/dialogs/makefile.mk delete mode 100644 svtools/source/dialogs/printdlg.cxx delete mode 100644 svtools/source/dialogs/printdlg.hrc delete mode 100644 svtools/source/dialogs/printdlg.src (limited to 'svtools') diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx deleted file mode 100644 index 8c455b910b41..000000000000 --- a/svtools/inc/svtools/printdlg.hxx +++ /dev/null @@ -1,297 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_PRINTDLG_HXX_ -#define _SV_PRINTDLG_HXX_ - -#include "svtools/svtdllapi.h" - -#ifndef _VCL_DIALOG_HXX -#include -#endif -#ifndef _VCL_FIXED_HXX -#include -#endif -#ifndef _VCL_BUTTON_HXX -#include -#endif -#ifndef _VCL_GROUP_HXX -#include -#endif -#ifndef _VCL_FIELD_HXX -#include -#endif -#ifndef _VCL_EDIT_HXX -#include -#endif -#ifndef _VCL_LSTBOX_HXX -#include -#endif -#include - -class Printer; -class QueueInfo; -struct SvtPrinterImpl; - -// --------------------- -// - PrintDialog-Types - -// --------------------- - -enum PrintDialogRange{ - PRINTDIALOG_ALL, PRINTDIALOG_SELECTION, PRINTDIALOG_FROMTO, PRINTDIALOG_RANGE }; - -enum PrintSheetRange -{ - PRINTSHEETS_ALL, - PRINTSHEETS_SELECTED_SHEETS, - PRINTSHEETS_SELECTED_CELLS -}; - - -// --------------- -// - PrintDialog - -// --------------- - -class SVT_DLLPUBLIC PrintDialog : public ModalDialog -{ -private: - FixedLine maFlPrinter; - FixedText maFtName; - ListBox maLbName; - PushButton maBtnProperties; - FixedText maFtStatus; - FixedInfo maFiStatus; - FixedText maFtType; - FixedInfo maFiType; - FixedText maFtLocation; - FixedInfo maFiLocation; - FixedText maFtComment; - FixedInfo maFiComment; - - // "Print to file" or "Fax number" - CheckBox maCbxFilePrint; - FixedInfo maFiPrintFile; - FixedText maFiFaxNo; - Edit maEdtFaxNo; - //PushButton maBtnBrowse_nomore; - - // "Print" - FixedLine maFlPrint; - RadioButton maRbtAllSheets; - RadioButton maRbtSelectedSheets; - RadioButton maRbtSelectedCells; - - // "Print range" - FixedLine maFlPrintRange; - RadioButton maRbtAll; - RadioButton maRbtPages; - RadioButton maRbtSelection; - Edit maEdtPages; - - FixedLine maFlSepCopiesRange; - - // "Copies" - FixedLine maFlCopies; - FixedText maFtCopies; - NumericField maNumCopies; - FixedImage maImgCollate; - FixedImage maImgNotCollate; - CheckBox maCbxCollate; - - FixedLine maFlSepButtonLine; - PushButton maBtnOptions; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - - AutoTimer maStatusTimer; - Printer* mpPrinter; - SvtPrinterImpl* mpPrinterImpl; - - XubString maRangeText; - USHORT mnCopyCount; - USHORT mnFirstPage; - USHORT mnLastPage; - USHORT mnMinPage; - USHORT mnMaxPage; - PrintDialogRange meCheckRange; - BOOL mbAll; - BOOL mbSelection; - BOOL mbFromTo; - BOOL mbRange; - BOOL mbCollate; - BOOL mbCollateCheck; - BOOL mbOptions; - bool mbWithSheetsAndCells; - Link maOptionsHdlLink; // Link zum Options-Handler - Link maOKHdlLink; // Link zum OK-Handler - - String maAllFilterStr; - - SVT_DLLPRIVATE void ImplCheckOK(); - SVT_DLLPRIVATE void ImplInitControls(); - SVT_DLLPRIVATE void ImplFillDialogData(); - SVT_DLLPRIVATE void ImplSetInfo(); - SVT_DLLPRIVATE void ImplSetImages(); - SVT_DLLPRIVATE bool ImplGetFilename(); - - DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplModifyControlHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer* ); - -public: - PrintDialog( Window* pWindow, bool bWithSheetsAndCells ); - ~PrintDialog(); - - virtual long OK(); - virtual long ClickOptionsHdl(); - - void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } - Printer* GetPrinter() const { return mpPrinter; } - - inline bool IsSheetRangeAvailable() const { return mbWithSheetsAndCells; } - void EnableSheetRange( bool bEnable, PrintSheetRange eRange ); - bool IsSheetRangeEnabled( PrintSheetRange eRange ) const; - void CheckSheetRange( PrintSheetRange eRange ); - PrintSheetRange GetCheckedSheetRange() const; - bool IsSheetRangeChecked( PrintSheetRange eRange ) const; - - void EnableRange( PrintDialogRange eRange ); - void DisableRange( PrintDialogRange eRange ); - BOOL IsRangeEnabled( PrintDialogRange eRange ) const; - - void CheckRange( PrintDialogRange eRange = PRINTDIALOG_ALL ) - { meCheckRange = eRange; } - PrintDialogRange GetCheckedRange() const { return meCheckRange; } - BOOL IsRangeChecked( PrintDialogRange eRange ) const; - - void SetRangeText( const XubString& rRange ) { maRangeText = rRange; } - const XubString& GetRangeText() const { return maRangeText; } - - void SetFirstPage( USHORT nPage = 0 ); - USHORT GetFirstPage() const { return mnFirstPage; } - void SetLastPage( USHORT nPage = 0 ); - USHORT GetLastPage() const { return mnLastPage; } - - void SetMinPage( USHORT nPage = 1 ) { mnMinPage = nPage; } - USHORT GetMinPage() const { return mnMinPage; } - void SetMaxPage( USHORT nPage = 65535 ) { mnMaxPage = nPage; } - USHORT GetMaxPage() const { return mnMaxPage; } - - void SetCopyCount( USHORT nCopies = 1 ) { mnCopyCount = nCopies; } - USHORT GetCopyCount() const { return mnCopyCount; } - - void EnableCollate( BOOL bEnable = TRUE ) - { mbCollate = bEnable; } - BOOL IsCollateEnabled() const { return mbCollate; } - void CheckCollate( BOOL bCheck = TRUE ) - { mbCollateCheck = bCheck; } - BOOL IsCollateChecked() const { return mbCollateCheck; } - - void ShowOptionsButton( BOOL bShow = TRUE ) - { mbOptions = bShow; } - BOOL IsOptionsButtonVisible() const { return mbOptions; } - - void SetOptionsHdl( const Link& rLink ) { maOptionsHdlLink = rLink; } - const Link& GetOptionsHdl() const { return maOptionsHdlLink; } - - void SetOKHdl( const Link& rLink ) { maOKHdlLink = rLink; } - const Link& GetOKHdl() const { return maOKHdlLink; } - - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long Notify( NotifyEvent& rNEvt ); - - virtual short Execute(); - - void DisableHelp(); -}; - -inline void PrintDialog::EnableRange( PrintDialogRange eRange ) -{ - if ( eRange == PRINTDIALOG_ALL ) - mbAll = TRUE; - else if ( eRange == PRINTDIALOG_SELECTION ) - mbSelection = TRUE; - else if ( eRange == PRINTDIALOG_FROMTO ) - mbFromTo = TRUE; - else - mbRange = TRUE; -} - -inline void PrintDialog::DisableRange( PrintDialogRange eRange ) -{ - if ( eRange == PRINTDIALOG_ALL ) - mbAll = FALSE; - else if ( eRange == PRINTDIALOG_SELECTION ) - mbSelection = FALSE; - else if ( eRange == PRINTDIALOG_FROMTO ) - mbFromTo = FALSE; - else - mbRange = FALSE; -} - -inline BOOL PrintDialog::IsRangeEnabled( PrintDialogRange eRange ) const -{ - BOOL bRet; - - if ( eRange == PRINTDIALOG_ALL ) - bRet = mbAll; - else if ( eRange == PRINTDIALOG_SELECTION ) - bRet = mbSelection; - else if ( eRange == PRINTDIALOG_FROMTO ) - bRet = mbFromTo; - else - bRet = mbRange; - - return bRet; -} - -inline BOOL PrintDialog::IsRangeChecked( PrintDialogRange eRange ) const -{ - if ( eRange == meCheckRange ) - return TRUE; - else - return FALSE; -} - -inline void PrintDialog::SetFirstPage( USHORT nPage ) -{ - mnFirstPage = nPage; - if ( nPage && (nPage < mnMinPage) ) - mnMinPage = nPage; -} - -inline void PrintDialog::SetLastPage( USHORT nPage ) -{ - mnLastPage = nPage; - if ( nPage && (nPage > mnMaxPage) ) - mnMaxPage = nPage; -} - -#endif // _SV_PRINTDLG_HXX_ - diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk old mode 100755 new mode 100644 index 99c4b59b76ae..00626ec6b082 --- a/svtools/source/dialogs/makefile.mk +++ b/svtools/source/dialogs/makefile.mk @@ -42,7 +42,6 @@ SRC1FILES= filedlg2.src \ so3res.src \ formats.src \ prnsetup.src \ - printdlg.src \ colrdlg.src \ addresstemplate.src \ wizardmachine.src @@ -63,7 +62,6 @@ SLOFILES= \ $(SLO)$/filedlg.obj \ $(SLO)$/filedlg2.obj \ $(SLO)$/prnsetup.obj \ - $(SLO)$/printdlg.obj \ $(SLO)$/colctrl.obj \ $(SLO)$/colrdlg.obj \ $(SLO)$/property.obj \ diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx deleted file mode 100644 index dba5ed627952..000000000000 --- a/svtools/source/dialogs/printdlg.cxx +++ /dev/null @@ -1,790 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include -#include -#include -#include -#include -#include -#include "printdlg.hrc" -#include "controldims.hrc" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using rtl::OUString; -using namespace com::sun::star; - -struct SvtPrinterImpl -{ - Printer* m_pTempPrinter; - sal_Bool m_bHelpDisabled; - PrintSheetRange m_eSheetRange; - - SvtPrinterImpl() : - m_pTempPrinter( NULL ), m_bHelpDisabled( sal_False ), m_eSheetRange( PRINTSHEETS_ALL ) {} - ~SvtPrinterImpl() { delete m_pTempPrinter; } -}; - -#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter - -// ======================================================================= - -PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) : - ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ), - maFlPrinter ( this, SvtResId( FL_PRINTER ) ), - maFtName ( this, SvtResId( FT_NAME ) ), - maLbName ( this, SvtResId( LB_NAMES ) ), - maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ), - maFtStatus ( this, SvtResId( FT_STATUS ) ), - maFiStatus ( this, SvtResId( FI_STATUS ) ), - maFtType ( this, SvtResId( FT_TYPE ) ), - maFiType ( this, SvtResId( FI_TYPE ) ), - maFtLocation ( this, SvtResId( FT_LOCATION ) ), - maFiLocation ( this, SvtResId( FI_LOCATION ) ), - maFtComment ( this, SvtResId( FT_COMMENT ) ), - maFiComment ( this, SvtResId( FI_COMMENT ) ), - maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ), - maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ), - maFiFaxNo ( this, SvtResId( FI_FAXNO ) ), - maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ), - maFlPrint ( this, SvtResId( FL_PRINT ) ), - maRbtAllSheets ( this, SvtResId( RBT_ALL_SHEETS ) ), - maRbtSelectedSheets ( this, SvtResId( RBT_SELECTED_SHEETS ) ), - maRbtSelectedCells ( this, SvtResId( RBT_SELECTED_CELLS ) ), - maFlPrintRange ( this, SvtResId( FL_PRINTRANGE ) ), - maRbtAll ( this, SvtResId( RBT_ALL ) ), - maRbtPages ( this, SvtResId( RBT_PAGES ) ), - maRbtSelection ( this, SvtResId( RBT_SELECTION ) ), - maEdtPages ( this, SvtResId( EDT_PAGES ) ), - maFlSepCopiesRange ( this, SvtResId( FL_SEPCOPIESRANGE ) ), - maFlCopies ( this, SvtResId( FL_COPIES ) ), - maFtCopies ( this, SvtResId( FT_COPIES ) ), - maNumCopies ( this, SvtResId( NUM_COPIES ) ), - maImgCollate ( this, SvtResId( IMG_COLLATE ) ), - maImgNotCollate ( this, SvtResId( IMG_NOT_COLLATE ) ), - maCbxCollate ( this, SvtResId( CBX_COLLATE ) ), - maFlSepButtonLine ( this, SvtResId( FL_SEPBUTTONLINE ) ), - maBtnOptions ( this, SvtResId( BTN_OPTIONS ) ), - maBtnOK ( this, SvtResId( BTN_OK ) ), - maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), - maBtnHelp ( this, SvtResId( BTN_HELP ) ), - mbWithSheetsAndCells( bWithSheetsAndCells ), - maAllFilterStr ( SvtResId( STR_ALLFILTER ) ) - -{ - FreeResource(); - - mpPrinter = NULL; - mpPrinterImpl = new SvtPrinterImpl; - mnCopyCount = 1; - mnFirstPage = 0; - mnLastPage = 0; - mnMinPage = 1; - mnMaxPage = 65535; - meCheckRange = PRINTDIALOG_ALL; - mbAll = TRUE; - mbSelection = FALSE; - mbFromTo = FALSE; - mbRange = FALSE; - mbCollate = TRUE; - mbCollateCheck = TRUE; - mbOptions = FALSE; - - maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE ); - maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) ); - maBtnProperties.SetClickHdl( LINK( this, PrintDialog, ImplPropertiesHdl ) ); - maLbName.SetSelectHdl( LINK( this, PrintDialog, ImplChangePrinterHdl ) ); - - maFiPrintFile.SetStyle( maFiPrintFile.GetStyle() | WB_PATHELLIPSIS ); - - Link aLink( LINK( this, PrintDialog, ImplModifyControlHdl ) ); - maCbxFilePrint.SetClickHdl( aLink ); - maRbtAll.SetClickHdl( aLink ); - maRbtPages.SetClickHdl( aLink ); - maRbtSelection.SetClickHdl( aLink ); - maEdtPages.SetModifyHdl( aLink ); - maNumCopies.SetModifyHdl( aLink ); - maCbxCollate.SetClickHdl( aLink ); - maBtnOptions.SetClickHdl( aLink ); - maEdtFaxNo.SetModifyHdl( aLink ); - maBtnOK.SetClickHdl( aLink ); - - maRbtAll.Check(); - ImplSetImages(); -} - -// ----------------------------------------------------------------------- - -PrintDialog::~PrintDialog() -{ - ImplFreePrnDlgListBox( &maLbName, FALSE ); - delete mpPrinterImpl; -} - -// ----------------------------------------------------------------------- - -void PrintDialog::ImplSetImages() -{ - if( ! GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ), BMP_COLOR_NORMAL ); - maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ), BMP_COLOR_NORMAL ); - } - else - { - maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); - maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); - } -} - -// ----------------------------------------------------------------------- - -void PrintDialog::ImplSetInfo() -{ - const QueueInfo* pInfo = Printer::GetQueueInfo( maLbName.GetSelectEntry(), true ); - if ( pInfo ) - { - maFiType.SetText( pInfo->GetDriver() ); - maFiLocation.SetText( pInfo->GetLocation() ); - maFiComment.SetText( pInfo->GetComment() ); - maFiStatus.SetText( ImplPrnDlgGetStatusText( *pInfo ) ); - } - else - { - XubString aTempStr; - maFiType.SetText( aTempStr ); - maFiLocation.SetText( aTempStr ); - maFiComment.SetText( aTempStr ); - maFiStatus.SetText( aTempStr ); - } - -#ifdef UNX - if( pInfo && pInfo->GetLocation().EqualsAscii( "fax_queue" ) ) - { - maFiPrintFile.Show( FALSE ); - maCbxFilePrint.Show( FALSE ); - maFiFaxNo.Show( TRUE ); - maEdtFaxNo.Show( TRUE ); - Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter; - maEdtFaxNo.SetText( pPrinter->GetJobValue( String::CreateFromAscii( "FAX#" ) ) ); - - Size aFTSize = maFiFaxNo.GetSizePixel(); - long nTextWidth = maFiFaxNo.GetCtrlTextWidth( maFiFaxNo.GetText() ) + 10; - if ( aFTSize.Width() < nTextWidth ) - { - long nDelta = nTextWidth - aFTSize.Width(); - aFTSize.Width() = aFTSize.Width() + nDelta; - maFiFaxNo.SetSizePixel( aFTSize ); - Size aEdtSize = maEdtFaxNo.GetSizePixel(); - aEdtSize.Width() = aEdtSize.Width() - nDelta; - Point aEdtPos = maEdtFaxNo.GetPosPixel(); - aEdtPos.X() = aEdtPos.X() + nDelta; - maEdtFaxNo.SetPosSizePixel( aEdtPos, aEdtSize ); - } - } - else -#endif - { - maFiPrintFile.Show( TRUE ); - maCbxFilePrint.Show( TRUE ); - maFiFaxNo.Show( FALSE ); - maEdtFaxNo.Show( FALSE ); - } - -} - -// ----------------------------------------------------------------------- - -void PrintDialog::ImplCheckOK() -{ - // Ueberprueft, ob der OK-Button enabled ist - BOOL bEnable = TRUE; - - if ( bEnable && maRbtPages.IsChecked() ) - bEnable = maEdtPages.GetText().Len() > 0; - - if ( bEnable ) - { - if ( TEMPPRINTER() ) - bEnable = TEMPPRINTER()->IsValid(); - else - bEnable = mpPrinter->IsValid(); - } - - maBtnOK.Enable( bEnable ); -} - -// ----------------------------------------------------------------------- - -void PrintDialog::ImplInitControls() -{ - // Alles - if ( mbAll ) - { - maRbtAll.Enable(); - if( meCheckRange == PRINTDIALOG_ALL ) - maRbtAll.Check( TRUE ); - } - else - maRbtAll.Enable( FALSE ); - - // Selektion - if ( mbSelection ) - { - maRbtSelection.Enable(); - if ( meCheckRange == PRINTDIALOG_SELECTION ) - maRbtSelection.Check( TRUE ); - } - else - maRbtSelection.Enable( FALSE ); - - // Seiten - if ( mbRange ) - { - maRbtPages.Enable(); - maEdtPages.Show(); - maEdtPages.SetText( maRangeText ); - - if( ( meCheckRange == PRINTDIALOG_FROMTO ) || - ( meCheckRange == PRINTDIALOG_RANGE ) ) - { - maRbtPages.Check( TRUE ); - maEdtPages.Enable(); - } - else - maEdtPages.Enable( FALSE ); - } - else - { - maRbtPages.Enable( FALSE ); - maEdtPages.Hide(); - } - - // Anzahl Kopien - maNumCopies.SetValue( mnCopyCount ); - - // Sortierung - maCbxCollate.Enable( mbCollate ); - maCbxCollate.Check( mbCollateCheck ); - - // Zusaetze-Button - if ( mbOptions ) - maBtnOptions.Show(); - - if ( !mbWithSheetsAndCells ) - { - Size aMarginSize = - LogicToPixel( Size( RSC_SP_CTRL_GROUP_X, RSC_SP_CTRL_GROUP_Y ), MAP_APPFONT ); - long nTempPos = maImgCollate.GetPosPixel().Y() + - maImgCollate.GetSizePixel().Height() + aMarginSize.Height(); - long nDelta1 = maFlPrintRange.GetPosPixel().Y() - maFlPrint.GetPosPixel().Y(); - long nDelta2 = maFlSepButtonLine.GetPosPixel().Y() - nTempPos; - - maFlPrint.Hide(); - maRbtAllSheets.Hide(); - maRbtSelectedSheets.Hide(); - maRbtSelectedCells.Hide(); - maRbtSelection.Show(); - - Size aNewSize = GetSizePixel(); - aNewSize.Height() -= nDelta2; - SetSizePixel( aNewSize ); - aNewSize = maFlSepCopiesRange.GetSizePixel(); - aNewSize.Height() -= nDelta2; - maFlSepCopiesRange.SetSizePixel( aNewSize ); - - long nDelta = nDelta1; - Window* pControls[] = { &maFlPrintRange, &maRbtAll, - &maRbtPages, &maEdtPages, &maRbtSelection, NULL, - &maFlSepButtonLine, &maBtnOptions, &maBtnOK, - &maBtnCancel, &maBtnHelp }; - Window** pCtrl = pControls; - const sal_Int32 nCount = sizeof( pControls ) / sizeof( pControls[0] ); - for ( sal_Int32 i = 0; i < nCount; ++i, ++pCtrl ) - { - if ( NULL == *pCtrl ) - { - nDelta = nDelta2; - continue; - } - Point aNewPos = (*pCtrl)->GetPosPixel(); - aNewPos.Y() -= nDelta; - (*pCtrl)->SetPosPixel( aNewPos ); - } - } -} - -// ----------------------------------------------------------------------- - -void PrintDialog::ImplFillDialogData() -{ - if ( maRbtAll.IsChecked() ) - meCheckRange = PRINTDIALOG_ALL; - else if( maRbtSelection.IsChecked() ) - meCheckRange = PRINTDIALOG_SELECTION; - else - { - meCheckRange = PRINTDIALOG_RANGE; - maRangeText = maEdtPages.GetText(); - } - - mnCopyCount = (USHORT) maNumCopies.GetValue(); - mbCollateCheck = maCbxCollate.IsChecked(); - - // In Datei drucken - if ( maCbxFilePrint.IsChecked() ) - mpPrinter->SetPrintFile( maFiPrintFile.GetText() ); - mpPrinter->EnablePrintFile( maCbxFilePrint.IsChecked() ); -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( PrintDialog, ImplStatusHdl, Timer*, EMPTYARG ) -{ - QueueInfo aInfo; - ImplPrnDlgUpdateQueueInfo( &maLbName, aInfo ); - maFiStatus.SetText( ImplPrnDlgGetStatusText( aInfo ) ); - - return 0; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( PrintDialog, ImplPropertiesHdl, void*, EMPTYARG ) -{ - if ( !TEMPPRINTER() ) - TEMPPRINTER() = new Printer( mpPrinter->GetJobSetup() ); - TEMPPRINTER()->Setup( this ); - - return 0; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( PrintDialog, ImplChangePrinterHdl, void*, EMPTYARG ) -{ - TEMPPRINTER() = ImplPrnDlgListBoxSelect( &maLbName, &maBtnProperties, - mpPrinter, TEMPPRINTER() ); - ImplSetInfo(); - ImplCheckOK(); // Check if "OK" button can be enabled now! - - return 0; -} - -// ----------------------------------------------------------------------- - -bool PrintDialog::ImplGetFilename() -{ - uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - static ::rtl::OUString aOldFile; - if( xFactory.is() ) - { - uno::Sequence< uno::Any > aTempl( 1 ); - aTempl.getArray()[0] <<= ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION; - uno::Reference< ui::dialogs::XFilePicker > xFilePicker( - xFactory->createInstanceWithArguments( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), - aTempl ), uno::UNO_QUERY ); - DBG_ASSERT( xFilePicker.is(), "could not get FilePicker service" ); - - uno::Reference< ui::dialogs::XFilterManager > xFilterMgr( xFilePicker, uno::UNO_QUERY ); - if( xFilePicker.is() && xFilterMgr.is() ) - { - try - { -#ifdef UNX - // add PostScript and PDF - Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter; - bool bPS = true, bPDF = true; - if( pPrinter ) - { - if( pPrinter->GetCapabilities( PRINTER_CAPABILITIES_PDF ) ) - bPS = false; - else - bPDF = false; - } - if( bPS ) - xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) ); - if( bPDF ) - xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Portable Document Format" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.pdf" ) ) ); -#elif defined WNT - xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) ); -#endif - // add arbitrary files - xFilterMgr->appendFilter( maAllFilterStr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) ); - } - catch( lang::IllegalArgumentException rExc ) - { - DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n" ); - } - - if( aOldFile.getLength() ) - { - INetURLObject aUrl( aOldFile, INET_PROT_FILE ); - xFilePicker->setDefaultName( aUrl.GetLastName() ); - aUrl.CutLastName(); - xFilePicker->setDisplayDirectory( aUrl.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); - } - - if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK ) - { - uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() ); - INetURLObject aObj( aPathSeq[0] ); - maFiPrintFile.SetText( aOldFile = aObj.PathToFileName() ); - return true; - } - return false; - } - } - - // something went awry, lets try the old fashioned dialogue - Window* pDlgParent = IsReallyVisible() ? this : GetParent(); - FileDialog aDlg( pDlgParent, WB_STDDIALOG | WB_SAVEAS ); -#ifdef WNT - aDlg.AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) ); - aDlg.SetDefaultExt( String( RTL_CONSTASCII_USTRINGPARAM( "prn" ) ) ); -#elif defined UNX - aDlg.AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) ); - aDlg.SetDefaultExt( String( RTL_CONSTASCII_USTRINGPARAM( "ps" ) ) ); -#endif - - if( aOldFile.getLength() ) - aDlg.SetPath( aOldFile ); - - if( aDlg.Execute() ) - { - String aTargetFile = aDlg.GetPath(); - maFiPrintFile.SetText( aOldFile = aTargetFile ); - return true; - } - - return false; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( PrintDialog, ImplModifyControlHdl, void*, p ) -{ - // Radiobuttons (Umfang) - if ( !p || (p == &maRbtAll) || (p == &maRbtPages) || (p == &maRbtSelection) ) - { - BOOL bCheck = maRbtPages.IsChecked(); - maEdtPages.Enable( bCheck ); - if ( p == &maRbtPages ) - maEdtPages.GrabFocus(); - ImplCheckOK(); - } - - // Edit-Felder (Seiten) - if ( p == &maEdtPages ) - ImplCheckOK(); - - if( p == &maEdtFaxNo ) - { - Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter; - pPrinter->SetJobValue( String::CreateFromAscii( "FAX#" ), maEdtFaxNo.GetText() ); - } - - // Anzahl Kopien - BOOL bNumCopies = FALSE; - - if ( !p || p == &maNumCopies ) - { - if ( p ) - bNumCopies = TRUE; - //BOOL bCopies = maNumCopies.GetValue() > 1; - maCbxCollate.Enable( mbCollate ); - - /*if ( !bCopies ) - maCbxCollate.Check( FALSE ); - else*/ - if ( mbCollateCheck ) - maCbxCollate.Check( TRUE ); - } - - // Sortieren - if ( !p || p == &maCbxCollate || bNumCopies ) - { - BOOL bCheck = maCbxCollate.IsChecked(); - - if ( !bNumCopies ) - mbCollateCheck = maCbxCollate.IsChecked(); - - if( bCheck ) - { - maImgCollate.Show(); - maImgNotCollate.Hide(); - } - else - { - maImgCollate.Hide(); - maImgNotCollate.Show(); - } - } - - // Zus"atze - if ( p == &maBtnOptions ) - ClickOptionsHdl(); - - if( p == &maBtnOK ) - { - EndDialog( maCbxFilePrint.IsChecked() ? ImplGetFilename() : TRUE ); - } - - return 0; -} - -// ----------------------------------------------------------------------- - -long PrintDialog::ClickOptionsHdl() -{ - if ( maOptionsHdlLink.IsSet() ) - return maOptionsHdlLink.Call( this ); - else - return TRUE; -} - -// ----------------------------------------------------------------------- - -long PrintDialog::OK() -{ - if ( maOKHdlLink.IsSet() ) - return maOKHdlLink.Call( this ); - else - return TRUE; -} - -// ----------------------------------------------------------------------- - -void PrintDialog::EnableSheetRange( bool bEnable, PrintSheetRange eRange ) -{ - if ( mbWithSheetsAndCells ) - { - switch ( eRange ) - { - case PRINTSHEETS_ALL : - maRbtAllSheets.Enable( bEnable != false ); - break; - case PRINTSHEETS_SELECTED_SHEETS : - maRbtSelectedSheets.Enable( bEnable != false ); - break; - case PRINTSHEETS_SELECTED_CELLS : - maRbtSelectedCells.Enable( bEnable != false ); - break; - default: - DBG_ERRORFILE( "PrintDialog::EnableSheetRange(): invalid range" ); - } - } -} - -// ----------------------------------------------------------------------- - -bool PrintDialog::IsSheetRangeEnabled( PrintSheetRange eRange ) const -{ - if ( !mbWithSheetsAndCells ) - return false; - - bool bRet = false; - switch ( eRange ) - { - case PRINTSHEETS_ALL : - bRet = maRbtAllSheets.IsEnabled() != FALSE; - break; - case PRINTSHEETS_SELECTED_SHEETS : - bRet = maRbtSelectedSheets.IsEnabled() != FALSE; - break; - case PRINTSHEETS_SELECTED_CELLS : - bRet = maRbtSelectedCells.IsEnabled() != FALSE; - break; - default: - DBG_ERRORFILE( "PrintDialog::IsSheetRangeEnabled(): invalid range" ); - } - return bRet; -} - -// ----------------------------------------------------------------------- - -void PrintDialog::CheckSheetRange( PrintSheetRange eRange ) -{ - if ( mbWithSheetsAndCells ) - { - switch ( eRange ) - { - case PRINTSHEETS_ALL : - maRbtAllSheets.Check(); - break; - case PRINTSHEETS_SELECTED_SHEETS : - maRbtSelectedSheets.Check(); - break; - case PRINTSHEETS_SELECTED_CELLS : - maRbtSelectedCells.Check(); - break; - default: - DBG_ERRORFILE( "PrintDialog::CheckSheetRange(): invalid range" ); - } - } -} - -// ----------------------------------------------------------------------- - -PrintSheetRange PrintDialog::GetCheckedSheetRange() const -{ - PrintSheetRange eRange = PRINTSHEETS_ALL; - if ( mbWithSheetsAndCells ) - { - if ( maRbtSelectedSheets.IsChecked() ) - eRange = PRINTSHEETS_SELECTED_SHEETS; - else if ( maRbtSelectedCells.IsChecked() ) - eRange = PRINTSHEETS_SELECTED_CELLS; - } - return eRange; -} - -// ----------------------------------------------------------------------- - -bool PrintDialog::IsSheetRangeChecked( PrintSheetRange eRange ) const -{ - if ( !mbWithSheetsAndCells ) - return false; - - bool bRet = false; - switch ( eRange ) - { - case PRINTSHEETS_ALL : - bRet = maRbtAllSheets.IsChecked() != FALSE; - break; - case PRINTSHEETS_SELECTED_SHEETS : - bRet = maRbtSelectedSheets.IsChecked() != FALSE; - break; - case PRINTSHEETS_SELECTED_CELLS : - bRet = maRbtSelectedCells.IsChecked() != FALSE; - break; - default: - DBG_ERRORFILE( "PrintDialog::IsSheetRangeChecked(): invalid range" ); - } - return bRet; -} - -// ----------------------------------------------------------------------- - -long PrintDialog::Notify( NotifyEvent& rNEvt ) -{ - if ( (rNEvt.GetType() == EVENT_GETFOCUS) && IsReallyVisible() ) - ImplStatusHdl( &maStatusTimer ); - else if ( rNEvt.GetType() == EVENT_KEYINPUT ) - { - if ( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F1 && mpPrinterImpl->m_bHelpDisabled ) - return 1; // do nothing - } - - return ModalDialog::Notify( rNEvt ); -} - -// ----------------------------------------------------------------------- - -void PrintDialog::DataChanged( const DataChangedEvent& rDCEvt ) -{ - if ( rDCEvt.GetType() == DATACHANGED_PRINTER ) - { - TEMPPRINTER() = ImplPrnDlgUpdatePrinter( mpPrinter, TEMPPRINTER() ); - Printer* pPrn; - if ( TEMPPRINTER() ) - pPrn = TEMPPRINTER(); - else - pPrn = mpPrinter; - ImplFillPrnDlgListBox( pPrn, &maLbName, &maBtnProperties ); - ImplSetInfo(); - ImplCheckOK(); - } - else if ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) - ImplSetImages(); - - ModalDialog::DataChanged( rDCEvt ); -} - -// ----------------------------------------------------------------------- - -short PrintDialog::Execute() -{ - if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) - { - DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" ); - return FALSE; - } - - // check if the printer brings up its own dialog - // in that case leave the work to that dialog - if( mpPrinter->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) ) - return TRUE; - - Printer::updatePrinters(); - - // Controls initialisieren - ImplFillPrnDlgListBox( mpPrinter, &maLbName, &maBtnProperties ); - ImplSetInfo(); - maStatusTimer.Start(); - ImplInitControls(); - maNumCopies.GrabFocus(); - maNumCopies.SetSelection( Selection( 0, maNumCopies.GetText().Len() ) ); - ImplModifyControlHdl( NULL ); - - // Dialog starten - short nRet = ModalDialog::Execute(); - - // Wenn Dialog mit OK beendet wurde, dann die Daten updaten - if( nRet == TRUE ) - { - if ( TEMPPRINTER() ) - mpPrinter->SetPrinterProps( TEMPPRINTER() ); - ImplFillDialogData(); - } - - maStatusTimer.Stop(); - - return nRet; -} - -// ----------------------------------------------------------------------- - -void PrintDialog::DisableHelp() -{ - mpPrinterImpl->m_bHelpDisabled = sal_True; - maBtnHelp.Disable(); -} - diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc deleted file mode 100644 index 83b7b0b28c82..000000000000 --- a/svtools/source/dialogs/printdlg.hrc +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - -#define FL_PRINTER 1 -#define LB_NAMES 2 -#define BTN_PROPERTIES 3 -#define FT_NAME 4 -#define FT_STATUS 5 -#define FI_STATUS 6 -#define FT_TYPE 7 -#define FI_TYPE 8 -#define FT_LOCATION 9 -#define FI_LOCATION 10 -#define FT_COMMENT 11 -#define FI_COMMENT 12 -#define CBX_FILEPRINT 13 -#define FI_PRINTFILE 14 -#define FI_FAXNO 15 -#define EDT_FAXNO 16 - -#define FL_PRINT 20 -#define RBT_ALL_SHEETS 21 -#define RBT_SELECTED_SHEETS 22 -#define RBT_SELECTED_CELLS 23 - -#define FL_PRINTRANGE 30 -#define RBT_ALL 31 -#define RBT_PAGES 32 -#define EDT_PAGES 33 -#define RBT_SELECTION 34 - -#define FL_SEPCOPIESRANGE 35 - -#define FL_COPIES 40 -#define FT_COPIES 41 -#define NUM_COPIES 42 -#define CBX_COLLATE 43 -#define IMG_COLLATE 44 -#define IMG_NOT_COLLATE 45 - -#define FL_SEPBUTTONLINE 50 -#define BTN_OK 51 -#define BTN_CANCEL 52 -#define BTN_HELP 53 -#define BTN_OPTIONS 54 - -#define STR_ALLFILTER 10 - diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src deleted file mode 100644 index 80c6e465d49a..000000000000 --- a/svtools/source/dialogs/printdlg.src +++ /dev/null @@ -1,349 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "printdlg.hrc" - -#define IMAGE_MAGENTA_MASK Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } - -ModalDialog DLG_SVT_PRNDLG_PRINTDLG -{ - HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG"; - SVLook = TRUE ; - OutputSize = TRUE ; - Moveable = TRUE ; - Size = MAP_APPFONT ( 265 , 210 ) ; - Text [ en-US ] = "Print" ; - FixedLine FL_PRINTER - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 253 , 8 ) ; - Text [ en-US ] = "Printer" ; - }; - FixedText FT_NAME - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text [ en-US ] = "~Name" ; - }; - ListBox LB_NAMES - { - HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES"; - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 13 ) ; - Size = MAP_APPFONT ( 130 , 80 ) ; - DropDown = TRUE ; - Sort = TRUE ; - }; - PushButton BTN_PROPERTIES - { - HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES"; - Pos = MAP_APPFONT ( 193 , 12 ) ; - Size = MAP_APPFONT ( 60 , 14 ) ; - Text [ en-US ] = "Propert~ies..." ; - }; - FixedText FT_STATUS - { - Pos = MAP_APPFONT ( 12 , 29 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Status" ; - }; - FixedText FI_STATUS - { - Pos = MAP_APPFONT ( 60 , 29 ) ; - Size = MAP_APPFONT ( 193 , 8 ) ; - }; - FixedText FT_TYPE - { - Pos = MAP_APPFONT ( 12 , 40 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Type" ; - }; - FixedText FI_TYPE - { - Pos = MAP_APPFONT ( 60 , 40 ) ; - Size = MAP_APPFONT ( 193 , 8 ) ; - }; - FixedText FT_LOCATION - { - Pos = MAP_APPFONT ( 12 , 51 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Location" ; - }; - FixedText FI_LOCATION - { - Pos = MAP_APPFONT ( 60 , 51 ) ; - Size = MAP_APPFONT ( 193 , 8 ) ; - }; - FixedText FT_COMMENT - { - Pos = MAP_APPFONT ( 12 , 62 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Comment" ; - }; - FixedText FI_COMMENT - { - Pos = MAP_APPFONT ( 60 , 62 ) ; - Size = MAP_APPFONT ( 193 , 8 ) ; - }; - FixedText FI_FAXNO - { - Pos = MAP_APPFONT ( 12 , 75 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Fax number"; - }; - Edit EDT_FAXNO - { - HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO"; - Border = TRUE; - Pos = MAP_APPFONT ( 60 , 73 ); - Size = MAP_APPFONT ( 188 , 12 ); - }; - CheckBox CBX_FILEPRINT - { - HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT"; - Pos = MAP_APPFONT ( 12 , 73 ) ; - Size = MAP_APPFONT ( 75 , 10 ) ; - Text [ en-US ] = "Print to file" ; - }; - FixedText FI_PRINTFILE - { - Pos = MAP_APPFONT ( 90 , 74 ) ; - Size = MAP_APPFONT ( 163 , 8 ) ; - }; - /*!!! - PushButton BTN_BROWSE - { - HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE"; - Pos = MAP_APPFONT ( 234 , 75 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - Text = "~..." ; - Hide = TRUE ; - }; - */ - FixedLine FL_PRINT - { - Pos = MAP_APPFONT ( 6 , 91 ) ; - Size = MAP_APPFONT ( 117 , 8 ) ; - Text [ en-US ] = "Print" ; - }; - RadioButton RBT_ALL_SHEETS - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS"; - Pos = MAP_APPFONT ( 12 , 102 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "All sheets" ; - }; - RadioButton RBT_SELECTED_SHEETS - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS"; - Pos = MAP_APPFONT ( 12 , 115 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Selected sheets" ; - }; - RadioButton RBT_SELECTED_CELLS - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS"; - Pos = MAP_APPFONT ( 12 , 128 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Selected cells" ; - }; - FixedLine FL_PRINTRANGE - { - Pos = MAP_APPFONT ( 6 , 141 ) ; - Size = MAP_APPFONT ( 117 , 8 ) ; - Text [ en-US ] = "Print range" ; - }; - RadioButton RBT_ALL - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL"; - Pos = MAP_APPFONT ( 12 , 152 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "All pages" ; - }; - RadioButton RBT_PAGES - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES"; - Pos = MAP_APPFONT ( 12 , 165 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; - Text [ en-US ] = "Pages" ; - }; - Edit EDT_PAGES - { - HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES"; - Border = TRUE ; - Pos = MAP_APPFONT ( 65 , 164 ) ; - Size = MAP_APPFONT ( 52 , 12 ) ; - }; - RadioButton RBT_SELECTION - { - HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 12 , 179 ) ; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Selection" ; - }; - FixedLine FL_SEPCOPIESRANGE - { - Pos = MAP_APPFONT( 126, 102 ); - Size = MAP_APPFONT( 1, 74 ); - Vert = TRUE; - }; - FixedLine FL_COPIES - { - Pos = MAP_APPFONT ( 129 , 91 ) ; - Size = MAP_APPFONT ( 130 , 8 ) ; - Text [ en-US ] = "Copies" ; - }; - FixedText FT_COPIES - { - Pos = MAP_APPFONT ( 135 , 104 ) ; - Size = MAP_APPFONT ( 63 , 8 ) ; - Text [ en-US ] = "Number of copies" ; - }; - NumericField NUM_COPIES - { - HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES"; - Border = TRUE ; - Pos = MAP_APPFONT ( 201 , 102 ) ; - Size = MAP_APPFONT ( 33 , 12 ) ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 9999 ; - StrictFormat = TRUE ; - First = 1 ; - Last = 9999 ; - }; - CheckBox CBX_COLLATE - { - HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE"; - Pos = MAP_APPFONT ( 201 , 123 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Co~llate" ; - }; - FixedImage IMG_COLLATE - { - Pos = MAP_APPFONT ( 132 , 117 ) ; - Size = MAP_APPFONT ( 67 , 22 ) ; - Hide = TRUE ; - }; - FixedImage IMG_NOT_COLLATE - { - Pos = MAP_APPFONT ( 132 , 117 ) ; - Size = MAP_APPFONT ( 67 , 22 ) ; - Hide = TRUE ; - }; - FixedLine FL_SEPBUTTONLINE - { - Pos = MAP_APPFONT( 0, 179 ); - Size = MAP_APPFONT( 265, 8 ); - }; - PushButton BTN_OPTIONS - { - HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 6 , 190 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Options..." ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 100 , 190 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 153 , 190 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 209 , 190 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - String STR_ALLFILTER - { - Text [ en-US ] = ""; - }; -}; - -Image RID_IMG_PRNDLG_COLLATE -{ - ImageBitmap = Bitmap { File = "collate.bmp" ; }; - MaskColor = IMAGE_MAGENTA_MASK ; -}; - -Image RID_IMG_PRNDLG_NOCOLLATE -{ - ImageBitmap = Bitmap { File = "ncollate.bmp" ; }; - MaskColor = IMAGE_MAGENTA_MASK ; -}; - -Image RID_IMG_PRNDLG_COLLATE_HC -{ - ImageBitmap = Bitmap { File = "collate_h.bmp" ; }; - MaskColor = IMAGE_MAGENTA_MASK ; -}; - -Image RID_IMG_PRNDLG_NOCOLLATE_HC -{ - ImageBitmap = Bitmap { File = "ncollate_h.bmp" ; }; - MaskColor = IMAGE_MAGENTA_MASK ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit From cef41c30dd562e129b864b87c85f59bf038423a2 Mon Sep 17 00:00:00 2001 From: Xiaofei Zhang Date: Fri, 5 Nov 2010 10:31:15 +0800 Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework --- svtools/bmpmaker/bmp.cxx | 24 +- svtools/bmpmaker/bmpcore.cxx | 12 +- svtools/bmpmaker/bmpcore.hxx | 8 +- svtools/bmpmaker/bmpsum.cxx | 20 +- svtools/bmpmaker/g2g.cxx | 26 +- svtools/inc/DocumentInfoPreview.hxx | 2 +- svtools/inc/acceleratorexecute.hxx | 2 +- svtools/inc/apearcfg.hxx | 48 +- svtools/inc/asynclink.hxx | 16 +- svtools/inc/calendar.hxx | 96 +-- svtools/inc/cliplistener.hxx | 2 +- svtools/inc/ctrlbox.hxx | 140 ++-- svtools/inc/ctrltool.hxx | 44 +- svtools/inc/expander.hxx | 10 +- svtools/inc/filectrl.hxx | 22 +- svtools/inc/filedlg.hxx | 8 +- svtools/inc/fileview.hxx | 4 +- svtools/inc/fltdefs.hxx | 66 +- svtools/inc/htmltokn.h | 2 +- svtools/inc/inetimg.hxx | 4 +- svtools/inc/ivctrl.hxx | 114 +-- svtools/inc/localresaccess.hxx | 2 +- svtools/inc/prgsbar.hxx | 14 +- svtools/inc/rtfout.hxx | 8 +- svtools/inc/ruler.hxx | 202 ++--- svtools/inc/scrwin.hxx | 14 +- svtools/inc/stdmenu.hxx | 2 +- svtools/inc/svtools/accessibletable.hxx | 8 +- svtools/inc/svtools/accessibletableprovider.hxx | 24 +- svtools/inc/svtools/brwbox.hxx | 274 +++---- svtools/inc/svtools/colctrl.hxx | 70 +- svtools/inc/svtools/editbrowsebox.hxx | 20 +- svtools/inc/svtools/editimplementation.hxx | 4 +- svtools/inc/svtools/editsyntaxhighlighter.hxx | 2 +- svtools/inc/svtools/ehdl.hxx | 32 +- svtools/inc/svtools/embedhlp.hxx | 18 +- svtools/inc/svtools/filter.hxx | 268 +++---- svtools/inc/svtools/fltcall.hxx | 8 +- svtools/inc/svtools/fmtfield.hxx | 106 +-- svtools/inc/svtools/generictoolboxcontroller.hxx | 2 +- svtools/inc/svtools/genericunodialog.hxx | 2 +- svtools/inc/svtools/grfmgr.hxx | 192 ++--- svtools/inc/svtools/headbar.hxx | 140 ++-- svtools/inc/svtools/htmlcfg.hxx | 36 +- svtools/inc/svtools/htmlout.hxx | 14 +- svtools/inc/svtools/imap.hxx | 34 +- svtools/inc/svtools/imapcirc.hxx | 20 +- svtools/inc/svtools/imapobj.hxx | 44 +- svtools/inc/svtools/imappoly.hxx | 20 +- svtools/inc/svtools/imaprect.hxx | 14 +- svtools/inc/svtools/inettbc.hxx | 28 +- svtools/inc/svtools/javainteractionhandler.hxx | 2 +- svtools/inc/svtools/logindlg.hxx | 8 +- svtools/inc/svtools/parhtml.hxx | 98 +-- svtools/inc/svtools/parrtf.hxx | 8 +- svtools/inc/svtools/printdlg.hxx | 90 +-- svtools/inc/svtools/prnsetup.hxx | 2 +- svtools/inc/svtools/roadmapwizard.hxx | 4 +- svtools/inc/svtools/stringtransfer.hxx | 2 +- svtools/inc/svtools/svicnvw.hxx | 76 +- svtools/inc/svtools/svlbitm.hxx | 70 +- svtools/inc/svtools/svlbox.hxx | 162 ++-- svtools/inc/svtools/svmedit.hxx | 34 +- svtools/inc/svtools/svmedit2.hxx | 12 +- svtools/inc/svtools/svparser.hxx | 72 +- svtools/inc/svtools/svtabbx.hxx | 100 +-- svtools/inc/svtools/svtdata.hxx | 8 +- svtools/inc/svtools/svtreebx.hxx | 130 ++-- svtools/inc/svtools/svxbox.hxx | 70 +- svtools/inc/svtools/syntaxhighlight.hxx | 28 +- svtools/inc/svtools/table/abstracttablecontrol.hxx | 2 +- svtools/inc/svtools/table/tablecontrol.hxx | 12 +- svtools/inc/svtools/table/tableinputhandler.hxx | 4 +- svtools/inc/svtools/table/tablemodel.hxx | 10 +- svtools/inc/svtools/table/tablerenderer.hxx | 34 +- svtools/inc/svtools/textdata.hxx | 76 +- svtools/inc/svtools/texteng.hxx | 214 ++--- svtools/inc/svtools/textview.hxx | 70 +- svtools/inc/svtools/toolpanel/paneltabbar.hxx | 2 +- svtools/inc/svtools/toolpanel/toolpaneldeck.hxx | 2 +- svtools/inc/svtools/transfer.hxx | 8 +- svtools/inc/svtools/treelist.hxx | 236 +++--- svtools/inc/svtools/ttprops.hxx | 38 +- svtools/inc/svtools/unitconv.hxx | 6 +- svtools/inc/svtools/valueset.hxx | 180 ++--- svtools/inc/svtools/wizardmachine.hxx | 18 +- svtools/inc/svtools/wizdlg.hxx | 30 +- svtools/inc/svtools/wmf.hxx | 12 +- svtools/inc/svtools/xtextedt.hxx | 14 +- svtools/inc/sychconv.hxx | 2 +- svtools/inc/tabbar.hxx | 186 ++--- svtools/inc/taskbar.hxx | 148 ++-- svtools/inc/templatefoldercache.hxx | 12 +- svtools/inc/testtool.hxx | 6 +- svtools/inc/txtattr.hxx | 54 +- svtools/inc/wallitem.hxx | 2 +- svtools/source/brwbox/brwbox1.cxx | 376 ++++----- svtools/source/brwbox/brwbox2.cxx | 350 ++++----- svtools/source/brwbox/brwbox3.cxx | 12 +- svtools/source/brwbox/brwhead.cxx | 4 +- svtools/source/brwbox/datwin.cxx | 98 +-- svtools/source/brwbox/datwin.hxx | 92 +-- svtools/source/brwbox/ebbcontrols.cxx | 30 +- svtools/source/brwbox/editbrowsebox.cxx | 2 +- svtools/source/brwbox/editbrowsebox2.cxx | 8 +- svtools/source/config/accessibilityoptions.cxx | 4 +- svtools/source/config/apearcfg.cxx | 24 +- svtools/source/config/colorcfg.cxx | 10 +- svtools/source/config/htmlcfg.cxx | 48 +- svtools/source/config/menuoptions.cxx | 12 +- svtools/source/config/miscopt.cxx | 10 +- svtools/source/config/printoptions.cxx | 6 +- svtools/source/contnr/ctrdll.cxx | 2 +- svtools/source/contnr/fileview.cxx | 88 +-- svtools/source/contnr/imivctl.hxx | 276 +++---- svtools/source/contnr/imivctl1.cxx | 862 ++++++++++----------- svtools/source/contnr/imivctl2.cxx | 182 ++--- svtools/source/contnr/ivctrl.cxx | 92 +-- svtools/source/contnr/svicnvw.cxx | 88 +-- svtools/source/contnr/svimpbox.cxx | 622 +++++++-------- svtools/source/contnr/svimpicn.cxx | 632 +++++++-------- svtools/source/contnr/svlbitm.cxx | 78 +- svtools/source/contnr/svlbox.cxx | 278 +++---- svtools/source/contnr/svtabbx.cxx | 164 ++-- svtools/source/contnr/svtreebx.cxx | 280 +++---- svtools/source/contnr/templwin.cxx | 72 +- svtools/source/contnr/templwin.hxx | 12 +- svtools/source/contnr/treelist.cxx | 304 ++++---- svtools/source/control/asynclink.cxx | 12 +- svtools/source/control/calendar.cxx | 494 ++++++------ svtools/source/control/ctrlbox.cxx | 218 +++--- svtools/source/control/ctrldll.cxx | 2 +- svtools/source/control/ctrltool.cxx | 60 +- svtools/source/control/filectrl.cxx | 12 +- svtools/source/control/fmtfield.cxx | 170 ++-- svtools/source/control/headbar.cxx | 300 +++---- svtools/source/control/inettbc.cxx | 130 ++-- svtools/source/control/prgsbar.cxx | 32 +- svtools/source/control/roadmap.cxx | 12 +- svtools/source/control/ruler.cxx | 358 ++++----- svtools/source/control/scriptedtext.cxx | 2 +- svtools/source/control/scrwin.cxx | 42 +- svtools/source/control/stdctrl.cxx | 2 +- svtools/source/control/stdmenu.cxx | 100 +-- svtools/source/control/svxbox.cxx | 132 ++-- svtools/source/control/tabbar.cxx | 432 +++++------ svtools/source/control/taskbar.cxx | 24 +- svtools/source/control/taskbox.cxx | 36 +- svtools/source/control/taskmisc.cxx | 20 +- svtools/source/control/taskstat.cxx | 136 ++-- svtools/source/control/toolbarmenu.cxx | 42 +- svtools/source/control/toolbarmenuacc.cxx | 6 +- svtools/source/control/toolbarmenuimp.hxx | 2 +- svtools/source/control/valueacc.cxx | 36 +- svtools/source/control/valueimp.hxx | 12 +- svtools/source/control/valueset.cxx | 450 +++++------ svtools/source/dialogs/addresstemplate.cxx | 4 +- svtools/source/dialogs/colctrl.cxx | 100 +-- svtools/source/dialogs/colrdlg.cxx | 30 +- svtools/source/dialogs/filedlg.cxx | 12 +- svtools/source/dialogs/filedlg2.cxx | 140 ++-- svtools/source/dialogs/filedlg2.hxx | 30 +- svtools/source/dialogs/insdlg.cxx | 8 +- svtools/source/dialogs/logindlg.cxx | 16 +- svtools/source/dialogs/mcvmath.cxx | 32 +- svtools/source/dialogs/mcvmath.hxx | 16 +- svtools/source/dialogs/printdlg.cxx | 88 +-- svtools/source/dialogs/prnsetup.cxx | 14 +- svtools/source/dialogs/propctrl.cxx | 34 +- svtools/source/dialogs/propctrl.hxx | 4 +- svtools/source/dialogs/property.cxx | 206 ++--- svtools/source/dialogs/wizdlg.cxx | 52 +- svtools/source/edit/editsyntaxhighlighter.cxx | 24 +- svtools/source/edit/svmedit.cxx | 278 +++---- svtools/source/edit/svmedit2.cxx | 14 +- svtools/source/edit/sychconv.cxx | 18 +- svtools/source/edit/syntaxhighlight.cxx | 206 ++--- svtools/source/edit/textdat2.hxx | 138 ++-- svtools/source/edit/textdata.cxx | 66 +- svtools/source/edit/textdoc.cxx | 206 ++--- svtools/source/edit/textdoc.hxx | 60 +- svtools/source/edit/texteng.cxx | 672 ++++++++-------- svtools/source/edit/textund2.hxx | 32 +- svtools/source/edit/textundo.cxx | 58 +- svtools/source/edit/textundo.hxx | 10 +- svtools/source/edit/textview.cxx | 410 +++++----- svtools/source/edit/xtextedt.cxx | 78 +- svtools/source/filter.vcl/filter/dlgexpor.cxx | 12 +- svtools/source/filter.vcl/filter/filter.cxx | 330 ++++---- svtools/source/filter.vcl/filter/filter2.cxx | 364 ++++----- svtools/source/filter.vcl/filter/fldll.cxx | 2 +- svtools/source/filter.vcl/filter/gradwrap.cxx | 42 +- svtools/source/filter.vcl/filter/sgfbram.cxx | 132 ++-- svtools/source/filter.vcl/filter/sgvmain.cxx | 202 ++--- svtools/source/filter.vcl/filter/sgvspln.cxx | 82 +- svtools/source/filter.vcl/filter/sgvtext.cxx | 364 ++++----- svtools/source/filter.vcl/igif/decode.cxx | 50 +- svtools/source/filter.vcl/igif/decode.hxx | 32 +- svtools/source/filter.vcl/igif/gifread.cxx | 170 ++-- svtools/source/filter.vcl/ixbm/xbmread.cxx | 52 +- svtools/source/filter.vcl/ixpm/rgbtable.hxx | 6 +- svtools/source/filter.vcl/ixpm/xpmread.cxx | 164 ++-- svtools/source/filter.vcl/jpeg/jpeg.cxx | 56 +- svtools/source/filter.vcl/jpeg/jpeg.h | 2 +- svtools/source/filter.vcl/jpeg/jpegc.c | 14 +- svtools/source/filter.vcl/wmf/emfwr.cxx | 168 ++-- svtools/source/filter.vcl/wmf/emfwr.hxx | 30 +- svtools/source/filter.vcl/wmf/enhwmf.cxx | 184 ++--- svtools/source/filter.vcl/wmf/winmtf.cxx | 84 +- svtools/source/filter.vcl/wmf/winmtf.hxx | 94 +-- svtools/source/filter.vcl/wmf/winwmf.cxx | 102 +-- svtools/source/filter.vcl/wmf/wmf.cxx | 32 +- svtools/source/filter.vcl/wmf/wmfwr.cxx | 134 ++-- svtools/source/filter.vcl/wmf/wmfwr.hxx | 56 +- svtools/source/graphic/descriptor.cxx | 2 +- svtools/source/graphic/descriptor.hxx | 2 +- svtools/source/graphic/grfattr.cxx | 8 +- svtools/source/graphic/grfcache.cxx | 138 ++-- svtools/source/graphic/grfcache.hxx | 42 +- svtools/source/graphic/grfmgr.cxx | 136 ++-- svtools/source/graphic/grfmgr2.cxx | 142 ++-- svtools/source/graphic/provider.cxx | 2 +- svtools/source/hatchwindow/ipwin.cxx | 24 +- svtools/source/hatchwindow/ipwin.hxx | 8 +- svtools/source/inc/gifread.hxx | 66 +- svtools/source/inc/jpeg.hxx | 10 +- svtools/source/inc/msgrd.hxx | 6 +- svtools/source/inc/msgwr.hxx | 6 +- svtools/source/inc/property.hxx | 108 +-- svtools/source/inc/sgfbram.hxx | 100 +-- svtools/source/inc/sgffilt.hxx | 8 +- svtools/source/inc/sgvmain.hxx | 226 +++--- svtools/source/inc/sgvspln.hxx | 10 +- svtools/source/inc/svimpbox.hxx | 122 +-- svtools/source/inc/svimpicn.hxx | 64 +- svtools/source/inc/xbmread.hxx | 6 +- svtools/source/inc/xpmread.hxx | 60 +- svtools/source/java/javainteractionhandler.cxx | 2 +- svtools/source/misc/acceleratorexecute.cxx | 2 +- svtools/source/misc/cliplistener.cxx | 2 +- svtools/source/misc/ehdl.cxx | 86 +- svtools/source/misc/embedhlp.cxx | 42 +- svtools/source/misc/embedtransfer.cxx | 8 +- svtools/source/misc/helpagentwindow.cxx | 2 +- svtools/source/misc/imagemgr.cxx | 348 ++++----- svtools/source/misc/imap.cxx | 152 ++-- svtools/source/misc/imap2.cxx | 40 +- svtools/source/misc/imap3.cxx | 10 +- svtools/source/misc/itemdel.cxx | 2 +- svtools/source/misc/langtab.cxx | 4 +- svtools/source/misc/svtdata.cxx | 2 +- svtools/source/misc/templatefoldercache.cxx | 2 +- svtools/source/misc/transfer.cxx | 8 +- svtools/source/misc/transfer2.cxx | 12 +- svtools/source/misc/unitconv.cxx | 10 +- svtools/source/plugapp/commtest.cxx | 14 +- svtools/source/plugapp/ttprops.cxx | 14 +- .../source/productregistration/registrationdlg.cxx | 2 +- svtools/source/svhtml/htmlkywd.cxx | 22 +- svtools/source/svhtml/htmlout.cxx | 32 +- svtools/source/svhtml/htmlsupp.cxx | 10 +- svtools/source/svhtml/parhtml.cxx | 306 ++++---- svtools/source/svrtf/parrtf.cxx | 12 +- svtools/source/svrtf/rtfkeywd.cxx | 4 +- svtools/source/svrtf/rtfout.cxx | 10 +- svtools/source/svrtf/svparser.cxx | 66 +- svtools/source/table/defaultinputhandler.cxx | 6 +- svtools/source/table/gridtablerenderer.cxx | 12 +- svtools/source/table/tablecontrol.cxx | 8 +- svtools/source/table/tablecontrol_impl.cxx | 36 +- svtools/source/table/tablecontrol_impl.hxx | 10 +- svtools/source/toolpanel/drawerlayouter.cxx | 4 +- svtools/source/toolpanel/paneltabbar.cxx | 14 +- svtools/source/toolpanel/tablayouter.cxx | 2 +- svtools/source/toolpanel/toolpaneldeck.cxx | 4 +- svtools/source/toolpanel/toolpaneldrawer.cxx | 18 +- svtools/source/toolpanel/toolpaneldrawer.hxx | 4 +- svtools/source/uno/generictoolboxcontroller.cxx | 4 +- svtools/source/uno/toolboxcontroller.cxx | 2 +- svtools/source/uno/treecontrolpeer.cxx | 50 +- svtools/source/uno/treecontrolpeer.hxx | 2 +- svtools/source/uno/unoiface.cxx | 6 +- svtools/source/uno/unoimap.cxx | 18 +- svtools/source/uno/wizard/wizardpagecontroller.cxx | 2 +- svtools/source/urlobj/inetimg.cxx | 16 +- svtools/workben/browser.cxx | 4 +- svtools/workben/stest.cxx | 4 +- svtools/workben/svdem.cxx | 24 +- svtools/workben/toolpanel/toolpaneltest.cxx | 6 +- svtools/workben/urange.cxx | 8 +- 290 files changed, 10920 insertions(+), 10920 deletions(-) mode change 100644 => 100755 svtools/source/control/asynclink.cxx mode change 100644 => 100755 svtools/source/control/ctrldll.cxx mode change 100644 => 100755 svtools/source/control/filectrl.cxx mode change 100644 => 100755 svtools/source/control/fmtfield.cxx mode change 100644 => 100755 svtools/source/control/headbar.cxx mode change 100644 => 100755 svtools/source/control/inettbc.cxx mode change 100644 => 100755 svtools/source/control/prgsbar.cxx mode change 100644 => 100755 svtools/source/control/roadmap.cxx mode change 100644 => 100755 svtools/source/control/ruler.cxx mode change 100644 => 100755 svtools/source/control/scriptedtext.cxx mode change 100644 => 100755 svtools/source/control/scrwin.cxx mode change 100644 => 100755 svtools/source/control/stdctrl.cxx mode change 100644 => 100755 svtools/source/control/stdmenu.cxx mode change 100644 => 100755 svtools/source/control/svxbox.cxx mode change 100644 => 100755 svtools/source/control/tabbar.cxx mode change 100644 => 100755 svtools/source/control/taskbar.cxx mode change 100644 => 100755 svtools/source/control/taskbox.cxx mode change 100644 => 100755 svtools/source/control/taskmisc.cxx mode change 100644 => 100755 svtools/source/control/taskstat.cxx (limited to 'svtools') diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index 5b473b0289c2..204fd404d329 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -54,19 +54,19 @@ class BmpApp : public BmpCreator private: String aOutputFileName; - BYTE cExitCode; + sal_uInt8 cExitCode; - BOOL GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam ); - BOOL GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams ); + sal_Bool GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam ); + sal_Bool GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams ); - void SetExitCode( BYTE cExit ) + void SetExitCode( sal_uInt8 cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; } void ShowUsage(); - virtual void Message( const String& rText, BYTE cExitCode ); + virtual void Message( const String& rText, sal_uInt8 cExitCode ); public: @@ -90,9 +90,9 @@ BmpApp::~BmpApp() // ----------------------------------------------------------------------- -BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) +sal_Bool BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ ) { @@ -104,7 +104,7 @@ BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL ) { - bRet = TRUE; + bRet = sal_True; if( i < ( nCount - 1 ) ) rParam = rArgs[ i + 1 ]; @@ -122,9 +122,9 @@ BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin // ----------------------------------------------------------------------- -BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams ) +sal_Bool BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ ) { @@ -154,7 +154,7 @@ BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri // ----------------------------------------------------------------------- -void BmpApp::Message( const String& rText, BYTE cExit ) +void BmpApp::Message( const String& rText, sal_uInt8 cExit ) { if( EXIT_NOERROR != cExit ) SetExitCode( cExit ); @@ -188,7 +188,7 @@ int BmpApp::Start( const ::std::vector< String >& rArgs ) if( rArgs.size() >= 6 ) { LangInfo aLangInfo; - USHORT nCurCmd = 0; + sal_uInt16 nCurCmd = 0; const String aSrsName( rArgs[ nCurCmd++ ] ); ::std::vector< String > aInDirVector; ByteString aLangDir; diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx index 9e134c06a670..ed3ae80b2788 100644 --- a/svtools/bmpmaker/bmpcore.cxx +++ b/svtools/bmpmaker/bmpcore.cxx @@ -72,7 +72,7 @@ BmpCreator::~BmpCreator() // ----------------------------------------------------------------------------- -void BmpCreator::Message( const String&, BYTE ) +void BmpCreator::Message( const String&, sal_uInt8 ) { } @@ -329,7 +329,7 @@ void BmpCreator::Create( const String& rSRSName, { DirEntry aFileName( ImplGetSystemFileName( rSRSName ) ), aOutDir( ImplGetSystemFileName( rOutName ) ); ::std::vector< DirEntry > aInDirs; - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; aFileName.ToAbs(); aOutDir.ToAbs(); @@ -361,7 +361,7 @@ void BmpCreator::Create( const String& rSRSName, { String aText; ByteString aByteText; - BOOL bLangDep = FALSE; + sal_Bool bLangDep = sal_False; do { @@ -389,7 +389,7 @@ void BmpCreator::Create( const String& rSRSName, aByteText.Search( '[' ) != STRING_NOTFOUND && aByteText.Search( ']' ) != STRING_NOTFOUND ) { - bLangDep = TRUE; + bLangDep = sal_True; } if (!pSRS->ReadLine(aByteText)) @@ -401,13 +401,13 @@ void BmpCreator::Create( const String& rSRSName, // if image list is not language dependent, don't do anything for languages except german if( aText.Len() ) { - bDone = TRUE; + bDone = sal_True; ImplCreate( aInDirs, aOutDir, aName, rLang ); } /* else if( ( rLang.mnLangNum != 49 ) && !bLangDep ) { Message( String( RTL_CONSTASCII_USTRINGPARAM( "INFO: ImageList is not language dependent! Nothing to do for this language." ) ) ); - bDone = TRUE; + bDone = sal_True; }*/ } while ( aText.Len() ); diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx index ece4fa09cf78..6b28af103717 100644 --- a/svtools/bmpmaker/bmpcore.hxx +++ b/svtools/bmpmaker/bmpcore.hxx @@ -55,7 +55,7 @@ struct LangInfo { char maLangDir[ 257 ]; - USHORT mnLangNum; + sal_uInt16 mnLangNum; }; // -------------- @@ -71,8 +71,8 @@ private: Size aTotSize; Point aPos; SvFileStream* pSRS; - ULONG nTotCount; - USHORT nPos; + sal_uIntPtr nTotCount; + sal_uInt16 nPos; void ImplCreate( const ::std::vector< DirEntry >& rInDirs, const DirEntry& rOut, @@ -81,7 +81,7 @@ private: protected: - virtual void Message( const String& rText, BYTE cExitCode = EXIT_NOERROR ); + virtual void Message( const String& rText, sal_uInt8 cExitCode = EXIT_NOERROR ); public: diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx index 7c264e694a12..0ac43ce57148 100644 --- a/svtools/bmpmaker/bmpsum.cxx +++ b/svtools/bmpmaker/bmpsum.cxx @@ -58,16 +58,16 @@ private: sal_uInt32 cExitCode; - BOOL GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam ); - BOOL GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams ); + sal_Bool GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam ); + sal_Bool GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams ); - void SetExitCode( BYTE cExit ) + void SetExitCode( sal_uInt8 cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; } void ShowUsage(); - void Message( const String& rText, BYTE cExitCode ); + void Message( const String& rText, sal_uInt8 cExitCode ); sal_uInt64 GetCRC( const BitmapEx& rBmpEx ); @@ -96,9 +96,9 @@ BmpSum::~BmpSum() // ----------------------------------------------------------------------- -BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) +sal_Bool BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ ) { @@ -110,7 +110,7 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL ) { - bRet = TRUE; + bRet = sal_True; if( i < ( nCount - 1 ) ) rParam = rArgs[ i + 1 ]; @@ -128,9 +128,9 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin // ----------------------------------------------------------------------- -BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams ) +sal_Bool BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ ) { @@ -160,7 +160,7 @@ BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri // ----------------------------------------------------------------------- -void BmpSum::Message( const String& rText, BYTE nExitCode ) +void BmpSum::Message( const String& rText, sal_uInt8 nExitCode ) { if( EXIT_NOERROR != nExitCode ) SetExitCode( nExitCode ); diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx index 6f4ee0f86279..0a308cccda40 100644 --- a/svtools/bmpmaker/g2g.cxx +++ b/svtools/bmpmaker/g2g.cxx @@ -56,13 +56,13 @@ class G2GApp { private: - BYTE cExitCode; + sal_uInt8 cExitCode; void ShowUsage(); - BOOL GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ); - void SetExitCode( BYTE cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; } + sal_Bool GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ); + void SetExitCode( sal_uInt8 cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; } - virtual void Message( const String& rText, BYTE cExitCode = EXIT_NOERROR ); + virtual void Message( const String& rText, sal_uInt8 cExitCode = EXIT_NOERROR ); public: @@ -86,9 +86,9 @@ G2GApp::~G2GApp() // ----------------------------------------------------------------------- -BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) +sal_Bool G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ ) { @@ -100,7 +100,7 @@ BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL ) { - bRet = TRUE; + bRet = sal_True; if( i < ( nCount - 1 ) ) rParam = rArgs[ i + 1 ]; @@ -118,7 +118,7 @@ BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin // ----------------------------------------------------------------------- -void G2GApp::Message( const String& rText, BYTE nExitCode ) +void G2GApp::Message( const String& rText, sal_uInt8 nExitCode ) { if( EXIT_NOERROR != nExitCode ) SetExitCode( nExitCode ); @@ -148,7 +148,7 @@ void G2GApp::ShowUsage() int G2GApp::Start( const ::std::vector< String >& rArgs ) { int nCmdCount = rArgs.size(); - USHORT nCurCmd = 0; + sal_uInt16 nCurCmd = 0; cExitCode = EXIT_NOERROR; @@ -167,7 +167,7 @@ int G2GApp::Start( const ::std::vector< String >& rArgs ) if( aInFile.Len() && aOutFile.Len() && aFilterStr.Len() ) { - const USHORT nExportFilter = aFilter.GetExportFormatNumberForShortName( aFilterStr ); + const sal_uInt16 nExportFilter = aFilter.GetExportFormatNumberForShortName( aFilterStr ); if( GRFILTER_FORMAT_NOTFOUND == nExportFilter ) Message( String( RTL_CONSTASCII_USTRINGPARAM( "invalid graphic filter" ) ), EXIT_INVALID_GRAPHICFILTER ); @@ -198,9 +198,9 @@ int G2GApp::Start( const ::std::vector< String >& rArgs ) if( bHex ) { - const BYTE cTransR = ( LOWERHEXTONUM( aHexStr.GetChar( 0 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 1 ) ); - const BYTE cTransG = ( LOWERHEXTONUM( aHexStr.GetChar( 2 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 3 ) ); - const BYTE cTransB = ( LOWERHEXTONUM( aHexStr.GetChar( 4 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 5 ) ); + const sal_uInt8 cTransR = ( LOWERHEXTONUM( aHexStr.GetChar( 0 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 1 ) ); + const sal_uInt8 cTransG = ( LOWERHEXTONUM( aHexStr.GetChar( 2 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 3 ) ); + const sal_uInt8 cTransB = ( LOWERHEXTONUM( aHexStr.GetChar( 4 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 5 ) ); BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); Bitmap aOldBmp( aBmpEx.GetBitmap() ); diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/DocumentInfoPreview.hxx index ae57b1a68b32..92c9c72b36bc 100644 --- a/svtools/inc/DocumentInfoPreview.hxx +++ b/svtools/inc/DocumentInfoPreview.hxx @@ -53,7 +53,7 @@ namespace svtools ::com::sun::star::document::XDocumentProperties>& i_xDocProps ,const String& i_rURL); void InsertEntry( const String& rTitle, const String& rValue ); - void SetAutoScroll(BOOL _bAutoScroll); + void SetAutoScroll(sal_Bool _bAutoScroll); }; } diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx index 3ee79e1fca0c..b5e9f99d2c4b 100644 --- a/svtools/inc/acceleratorexecute.hxx +++ b/svtools/inc/acceleratorexecute.hxx @@ -222,7 +222,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit specify the accelerator for execute. @return [sal_Bool] - TRUE if this key is configured and match to a command. + sal_True if this key is configured and match to a command. Attention: This state does not mean the success state of the corresponding execute. Because its done asynchronous! */ diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx index 8e6018424c4c..bda7e09828b3 100644 --- a/svtools/inc/apearcfg.hxx +++ b/svtools/inc/apearcfg.hxx @@ -68,11 +68,11 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem short nAAMinPixelHeight ; #endif - BOOL bMenuMouseFollow ; - BOOL bSingleLineTabCtrl ; - BOOL bColoredTabCtrl ; + sal_Bool bMenuMouseFollow ; + sal_Bool bSingleLineTabCtrl ; + sal_Bool bColoredTabCtrl ; #if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - BOOL bFontAntialiasing ; + sal_Bool bFontAntialiasing ; #endif static sal_Bool bInitialized ; @@ -86,39 +86,39 @@ public: virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - USHORT GetLookNFeel () const { return nLookNFeel; } - void SetLookNFeel ( USHORT nSet ); + sal_uInt16 GetLookNFeel () const { return nLookNFeel; } + void SetLookNFeel ( sal_uInt16 nSet ); - USHORT GetDragMode () const { return nDragMode; } - void SetDragMode ( USHORT nSet ); + sal_uInt16 GetDragMode () const { return nDragMode; } + void SetDragMode ( sal_uInt16 nSet ); - USHORT GetScaleFactor () const { return nScaleFactor; } - void SetScaleFactor ( USHORT nSet ); + sal_uInt16 GetScaleFactor () const { return nScaleFactor; } + void SetScaleFactor ( sal_uInt16 nSet ); - USHORT GetSnapMode () const { return nSnapMode; } - void SetSnapMode ( USHORT nSet ); + sal_uInt16 GetSnapMode () const { return nSnapMode; } + void SetSnapMode ( sal_uInt16 nSet ); - USHORT GetMiddleMouseButton () const { return nMiddleMouse; } - void SetMiddleMouseButton ( USHORT nSet ); + sal_uInt16 GetMiddleMouseButton () const { return nMiddleMouse; } + void SetMiddleMouseButton ( sal_uInt16 nSet ); void SetApplicationDefaults ( Application* pApp ); - void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} - BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} + void SetMenuMouseFollow(sal_Bool bSet) {bMenuMouseFollow = bSet; SetModified();} + sal_Bool IsMenuMouseFollow() const{return bMenuMouseFollow;} - void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} - BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} + void SetSingleLineTabCtrl(sal_Bool bSet) {bSingleLineTabCtrl = bSet; SetModified();} + sal_Bool IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} #if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } - BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } + void SetFontAntiAliasing( sal_Bool bSet ) { bFontAntialiasing = bSet; SetModified(); } + sal_Bool IsFontAntiAliasing() const { return bFontAntialiasing; } - USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } - void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } + sal_uInt16 GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } + void SetFontAntialiasingMinPixelHeight( sal_uInt16 _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } #endif - void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; - BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} + void SetColoredTabCtrl(sal_Bool bSet) {bColoredTabCtrl = bSet; SetModified();}; + sal_Bool IsColoredTabCtrl()const {return bColoredTabCtrl;} static sal_Bool IsInitialized() { return bInitialized; } static void SetInitialized() { bInitialized = sal_True; } diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx index 41c6f3e92388..efc8afac1064 100644 --- a/svtools/inc/asynclink.hxx +++ b/svtools/inc/asynclink.hxx @@ -44,10 +44,10 @@ namespace svtools { class SVT_DLLPUBLIC AsynchronLink { Link _aLink; - ULONG _nEventId; + sal_uIntPtr _nEventId; Timer* _pTimer; - BOOL _bInCall; - BOOL* _pDeleted; + sal_Bool _bInCall; + sal_Bool* _pDeleted; void* _pArg; vos::OMutex* _pMutex; @@ -56,19 +56,19 @@ class SVT_DLLPUBLIC AsynchronLink public: AsynchronLink( const Link& rLink ) : - _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ), _pDeleted( 0 ), _pMutex( 0 ){} - AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ), _pDeleted( 0 ), _pMutex( 0 ){} ~AsynchronLink(); void CreateMutex(); void operator=( const Link& rLink ) { _aLink = rLink; } - void Call( void* pObj, BOOL bAllowDoubles = FALSE, - BOOL bUseTimer = FALSE ); + void Call( void* pObj, sal_Bool bAllowDoubles = sal_False, + sal_Bool bUseTimer = sal_False ); void ForcePendingCall( ); void ClearPendingCall( ); - BOOL IsSet() const { return _aLink.IsSet(); } + sal_Bool IsSet() const { return _aLink.IsSet(); } Link GetLink() const { return _aLink; } }; diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx index f85887873bb0..1fe0013e055e 100644 --- a/svtools/inc/calendar.hxx +++ b/svtools/inc/calendar.hxx @@ -138,16 +138,16 @@ wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() -abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, -FALSE eine Selektion nach rechts oder unten. +abgefragt werden. sal_True bedeutet eine Selektion nach links oder oben, +sal_False eine Selektion nach rechts oder unten. -------------------------------------------------------------------------- Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion uebernehmen will, sollte dies nur gemacht werden, wenn -IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert -TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons -ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen +IsScrollDateRangeChanged() sal_True zurueckliefert. Denn diese Methode liefert +sal_True zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons +ausgeloest wurde. Bei sal_False wurde dies durch Resize(), Methoden-Aufrufen oder durch Beendigung einer Selektion ausgeloest. *************************************************************************/ @@ -169,7 +169,7 @@ oder durch Beendigung einer Selektion ausgeloest. #define WB_MULTISELECT ((WinBits)0x00400000) #endif -#define DIB_BOLD ((USHORT)0x0001) +#define DIB_BOLD ((sal_uInt16)0x0001) // ------------ // - Calendar - @@ -203,7 +203,7 @@ private: Color* mpStandardColor; Color* mpSaturdayColor; Color* mpSundayColor; - ULONG mnDayCount; + sal_uIntPtr mnDayCount; long mnDaysOffX; long mnWeekDayOffY; long mnDaysOffY; @@ -218,10 +218,10 @@ private: long mnDummy3; long mnDummy4; WinBits mnWinStyle; - USHORT mnFirstYear; - USHORT mnLastYear; - USHORT mnRequestYear; - BOOL mbCalc:1, + sal_uInt16 mnFirstYear; + sal_uInt16 mnLastYear; + sal_uInt16 mnRequestYear; + sal_Bool mbCalc:1, mbFormat:1, mbDrag:1, mbSelection:1, @@ -245,7 +245,7 @@ private: Link maDoubleClickHdl; Link maSelectHdl; Timer maDragScrollTimer; - USHORT mnDragScrollHitTest; + sal_uInt16 mnDragScrollHitTest; #ifdef _SV_CALENDAR_CXX using Control::ImplInitSettings; @@ -255,30 +255,30 @@ private: SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; + SVT_DLLPRIVATE void ImplDrawSpin( sal_Bool bDrawPrev = sal_True, sal_Bool bDrawNext = sal_True ); SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, - USHORT nDay, USHORT nMonth, USHORT nYear, + sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, - BOOL bBack = TRUE, BOOL bOther = FALSE, - ULONG nToday = 0 ); - SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); + sal_Bool bBack = sal_True, sal_Bool bOther = sal_False, + sal_uIntPtr nToday = 0 ); + SVT_DLLPRIVATE void ImplDraw( sal_Bool bPaint = sal_False ); SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); - SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, - BOOL bMove, BOOL bExpand, BOOL bExtended ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); + SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, + sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended ); + SVT_DLLPRIVATE void ImplUpdate( sal_Bool bCalcNew = sal_False ); using Window::ImplScroll; - SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); + SVT_DLLPRIVATE void ImplScroll( sal_Bool bPrev ); SVT_DLLPRIVATE void ImplInvertDropPos(); SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( sal_Bool bCancel ); SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; #endif protected: - BOOL ShowDropPos( const Point& rPos, Date& rDate ); + sal_Bool ShowDropPos( const Point& rPos, Date& rDate ); void HideDropPos(); DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); @@ -316,29 +316,29 @@ public: /// Set how many days of a week must reside in the first week of a year. void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); - void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); + void SelectDate( const Date& rDate, sal_Bool bSelect = sal_True ); void SelectDateRange( const Date& rStartDate, const Date& rEndDate, - BOOL bSelect = TRUE ); + sal_Bool bSelect = sal_True ); void SetNoSelection(); - BOOL IsDateSelected( const Date& rDate ) const; - ULONG GetSelectDateCount() const; - Date GetSelectDate( ULONG nIndex = 0 ) const; - void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } - BOOL IsCallEverySelectEnabled() const { return mbAllSel; } + sal_Bool IsDateSelected( const Date& rDate ) const; + sal_uIntPtr GetSelectDateCount() const; + Date GetSelectDate( sal_uIntPtr nIndex = 0 ) const; + void EnableCallEverySelect( sal_Bool bEvery = sal_True ) { mbAllSel = bEvery; } + sal_Bool IsCallEverySelectEnabled() const { return mbAllSel; } - USHORT GetRequestYear() const { return mnRequestYear; } + sal_uInt16 GetRequestYear() const { return mnRequestYear; } void SetCurDate( const Date& rNewDate ); Date GetCurDate() const { return maCurDate; } void SetFirstDate( const Date& rNewFirstDate ); Date GetFirstDate() const { return maFirstDate; } Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - ULONG GetDayCount() const { return mnDayCount; } + sal_uIntPtr GetDayCount() const { return mnDayCount; } Date GetFirstMonth() const; Date GetLastMonth() const; - USHORT GetMonthCount() const; - BOOL GetDate( const Point& rPos, Date& rDate ) const; + sal_uInt16 GetMonthCount() const; + sal_Bool GetDate( const Point& rPos, Date& rDate ) const; Rectangle GetDateRect( const Date& rDate ) const; - BOOL GetDropDate( Date& rDate ) const; + sal_Bool GetDropDate( Date& rDate ) const; long GetCurMonthPerLine() const { return mnMonthPerLine; } long GetCurLines() const { return mnLines; } @@ -353,7 +353,7 @@ public: void AddDateInfo( const Date& rDate, const XubString& rText, const Color* pTextColor = NULL, const Color* pFrameColor = NULL, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); void RemoveDateInfo( const Date& rDate ); void ClearDateInfo(); XubString GetDateInfoText( const Date& rDate ); @@ -361,9 +361,9 @@ public: void StartSelection(); void EndSelection(); - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } - BOOL IsSelectLeft() const { return mbSelLeft; } + sal_Bool IsTravelSelect() const { return mbTravelSelect; } + sal_Bool IsScrollDateRangeChanged() const { return mbScrollDateRange; } + sal_Bool IsSelectLeft() const { return mbSelLeft; } Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; @@ -459,8 +459,8 @@ private: PushButton* mpTodayBtn; PushButton* mpNoneBtn; Date maDefaultDate; - BOOL mbToday; - BOOL mbNone; + sal_Bool mbToday; + sal_Bool mbNone; Link maSelectHdl; #ifdef _SV_CALENDAR_CXX @@ -476,17 +476,17 @@ public: virtual void Select(); - virtual BOOL ShowDropDown( BOOL bShow ); + virtual sal_Bool ShowDropDown( sal_Bool bShow ); virtual Calendar* CreateCalendar( Window* pParent ); Calendar* GetCalendar(); void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } Date GetDefaultDate() const { return maDefaultDate; } - void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } - BOOL IsTodayEnabled() const { return mbToday; } - void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } - BOOL IsNoneEnabled() const { return mbNone; } + void EnableToday( sal_Bool bToday = sal_True ) { mbToday = bToday; } + sal_Bool IsTodayEnabled() const { return mbToday; } + void EnableNone( sal_Bool bNone = sal_True ) { mbNone = bNone; } + sal_Bool IsNoneEnabled() const { return mbNone; } void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } WinBits GetCalendarStyle() const { return mnCalendarStyle; } diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/cliplistener.hxx index ab20d6d7aa20..5051633bd6b6 100644 --- a/svtools/inc/cliplistener.hxx +++ b/svtools/inc/cliplistener.hxx @@ -46,7 +46,7 @@ public: TransferableClipboardListener( const Link& rCallback ); ~TransferableClipboardListener(); - void AddRemoveListener( Window* pWin, BOOL bAdd ); + void AddRemoveListener( Window* pWin, sal_Bool bAdd ); void ClearCallbackLink(); // XEventListener diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx index 9e6e942daf1e..46e3a64d49f6 100644 --- a/svtools/inc/ctrlbox.hxx +++ b/svtools/inc/ctrlbox.hxx @@ -181,60 +181,60 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ); using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, + sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const Color& rColor, const XubString& rStr, + sal_uInt16 nPos = LISTBOX_APPEND ); void InsertAutomaticEntry(); using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); + virtual void RemoveEntry( sal_uInt16 nPos ); virtual void Clear(); void CopyEntries( const ColorListBox& rBox ); using ListBox::GetEntryPos; - virtual USHORT GetEntryPos( const Color& rColor ) const; - virtual Color GetEntryColor( USHORT nPos ) const; + virtual sal_uInt16 GetEntryPos( const Color& rColor ) const; + virtual Color GetEntryColor( sal_uInt16 nPos ) const; Size GetImageSize() const { return aImageSize; } - void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) + void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); - XubString GetSelectEntry( USHORT nSelIndex = 0 ) const + void SelectEntry( const Color& rColor, sal_Bool bSelect = sal_True ); + XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const { return ListBox::GetSelectEntry( nSelIndex ); } - Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; - BOOL IsEntrySelected( const XubString& rStr ) const + Color GetSelectEntryColor( sal_uInt16 nSelIndex = 0 ) const; + sal_Bool IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( const Color& rColor ) const; + sal_Bool IsEntrySelected( const Color& rColor ) const; private: // declared as private because some compilers would generate the default functions ColorListBox( const ColorListBox& ); ColorListBox& operator =( const ColorListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; }; -inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) +inline void ColorListBox::SelectEntry( const Color& rColor, sal_Bool bSelect ) { - USHORT nPos = GetEntryPos( rColor ); + sal_uInt16 nPos = GetEntryPos( rColor ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) ListBox::SelectEntryPos( nPos, bSelect ); } -inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const +inline sal_Bool ColorListBox::IsEntrySelected( const Color& rColor ) const { - USHORT nPos = GetEntryPos( rColor ); + sal_uInt16 nPos = GetEntryPos( rColor ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nPos ); else - return FALSE; + return sal_False; } -inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const +inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); Color aColor; if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aColor = GetEntryColor( nPos ); @@ -259,7 +259,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); void UpdateLineColors( void ); - BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed + sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed inline const Color& GetPaintColor( void ) const; virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -269,25 +269,25 @@ public: virtual ~LineListBox(); using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, sal_uInt16 nPos = LISTBOX_APPEND ); using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); + virtual void RemoveEntry( sal_uInt16 nPos ); virtual void Clear(); using ListBox::GetEntryPos; - USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; - long GetEntryLine1( USHORT nPos ) const; - long GetEntryLine2( USHORT nPos ) const; - long GetEntryDistance( USHORT nPos ) const; - - inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE ); - long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; - long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; - long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; - inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + sal_uInt16 GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + long GetEntryLine1( sal_uInt16 nPos ) const; + long GetEntryLine2( sal_uInt16 nPos ) const; + long GetEntryDistance( sal_uInt16 nPos ) const; + + inline void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, sal_Bool bSelect = sal_True ); + long GetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const; + long GetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const; + long GetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const; + inline sal_Bool IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } + sal_Bool IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } inline FieldUnit GetUnit() const { return eUnit; } @@ -301,51 +301,51 @@ private: // declared as private because some compilers would generate the default methods LineListBox( const LineListBox& ); LineListBox& operator =( const LineListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; }; -inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect ) +inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, sal_Bool bSelect ) { - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) ListBox::SelectEntryPos( nPos, bSelect ); } -inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryLine1( nPos ); else return 0; } -inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryLine2( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryLine2( nPos ); else return 0; } -inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryDistance( nPos ); else return 0; } -inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const +inline sal_Bool LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const { - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nPos ); else - return FALSE; + return sal_False; } inline void LineListBox::SetColor( const Color& rColor ) @@ -372,8 +372,8 @@ private: Image maImagePrinterFont; Image maImageBitmapFont; Image maImageScalableFont; - BOOL mbWYSIWYG; - BOOL mbSymbols; + sal_Bool mbWYSIWYG; + sal_Bool mbSymbols; #ifdef _CTRLBOX_CXX SVT_DLLPRIVATE void ImplCalcUserItemSize(); @@ -393,11 +393,11 @@ public: void Fill( const FontList* pList ); - void EnableWYSIWYG( BOOL bEnable = TRUE ); - BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } + void EnableWYSIWYG( sal_Bool bEnable = sal_True ); + sal_Bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } - void EnableSymbols( BOOL bEnable = TRUE ); - BOOL IsSymbolsEnabled() const { return mbSymbols; } + void EnableSymbols( sal_Bool bEnable = sal_True ); + sal_Bool IsSymbolsEnabled() const { return mbSymbols; } private: // declared as private because some compilers would generate the default functions @@ -447,13 +447,13 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox { FontInfo aFontInfo; const FontList* pFontList; - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; + sal_uInt16 nRelMin; + sal_uInt16 nRelMax; + sal_uInt16 nRelStep; short nPtRelMin; short nPtRelMax; short nPtRelStep; - BOOL bRelativeMode:1, + sal_Bool bRelativeMode:1, bRelative:1, bPtRelative:1, bStdSize:1; @@ -476,22 +476,22 @@ public: void Fill( const FontInfo* pInfo, const FontList* pList ); - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); + void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, + sal_uInt16 nStep = 5 ); void EnablePtRelativeMode( short nMin = -200, short nMax = 200, short nStep = 10 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void SetPtRelative( BOOL bPtRel = TRUE ) - { bPtRelative = bPtRel; SetRelative( TRUE ); } - BOOL IsPtRelative() const { return bPtRelative; } + sal_Bool IsRelativeMode() const { return bRelativeMode; } + void SetRelative( sal_Bool bRelative = sal_False ); + sal_Bool IsRelative() const { return bRelative; } + void SetPtRelative( sal_Bool bPtRel = sal_True ) + { bPtRelative = bPtRel; SetRelative( sal_True ); } + sal_Bool IsPtRelative() const { return bPtRelative; } virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual void SetValue( sal_Int64 nNewValue ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; virtual sal_Int64 GetValue() const; - sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; + sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx index a0eb5db2b955..91587bef7f28 100644 --- a/svtools/inc/ctrltool.hxx +++ b/svtools/inc/ctrltool.hxx @@ -63,7 +63,7 @@ class FontNameMenu, class FontStyleMenu, class FontSizeMenu -------------------------------------------------------------------------- FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); + sal_Bool bAll = sal_True ); Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, @@ -80,8 +80,8 @@ Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden sind, wird die vom uebergebenen Device "pDevice" bevorzugt. Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften -abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch -Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und +abgefragt werden sollen oder alle. Wenn sal_True uebergeben wird, werden auch +Bitmap-Schriften mit abgefragt. Bei sal_False werden Vector-Schriften und scalierbare Schriften abgefragt. -------------------------------------------------------------------------- @@ -147,11 +147,11 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. // - FontList - // ------------ -#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) +#define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) -#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) -#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) -#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) +#define FONTLIST_FONTNAMETYPE_PRINTER ((sal_uInt16)0x0001) +#define FONTLIST_FONTNAMETYPE_SCREEN ((sal_uInt16)0x0002) +#define FONTLIST_FONTNAMETYPE_SCALABLE ((sal_uInt16)0x0004) class SVT_DLLPUBLIC FontList : private List { @@ -175,16 +175,16 @@ private: OutputDevice* mpDev2; #ifdef CTRLTOOL_CXX - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uIntPtr* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, - BOOL bInsertData ); + SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll, + sal_Bool bInsertData ); #endif public: FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); + sal_Bool bAll = sal_True ); ~FontList(); FontList* Clone() const; @@ -192,7 +192,7 @@ public: OutputDevice* GetDevice() const { return mpDev; } OutputDevice* GetDevice2() const { return mpDev2; } XubString GetFontMapText( const FontInfo& rInfo ) const; - USHORT GetFontNameType( const XubString& rFontName ) const; + sal_uInt16 GetFontNameType( const XubString& rFontName ) const; const XubString& GetNormalStr() const { return maNormal; } const XubString& GetItalicStr() const { return maNormalItalic; } @@ -207,11 +207,11 @@ public: FontWeight eWeight, FontItalic eItalic ) const; - BOOL IsAvailable( const XubString& rName ) const; - USHORT GetFontNameCount() const - { return (USHORT)List::Count(); } - const FontInfo& GetFontName( USHORT nFont ) const; - USHORT GetFontNameType( USHORT nFont ) const; + sal_Bool IsAvailable( const XubString& rName ) const; + sal_uInt16 GetFontNameCount() const + { return (sal_uInt16)List::Count(); } + const FontInfo& GetFontName( sal_uInt16 nFont ) const; + sal_uInt16 GetFontNameType( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const XubString& rName ) const; sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; @@ -233,19 +233,19 @@ class SVT_DLLPUBLIC FontSizeNames { private: struct ImplFSNameItem* mpArray; - ULONG mnElem; + sal_uIntPtr mnElem; public: FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - ULONG Count() const { return mnElem; } - BOOL IsEmpty() const { return !mnElem; } + sal_uIntPtr Count() const { return mnElem; } + sal_Bool IsEmpty() const { return !mnElem; } long Name2Size( const String& ) const; String Size2Name( long ) const; - String GetIndexName( ULONG nIndex ) const; - long GetIndexSize( ULONG nIndex ) const; + String GetIndexName( sal_uIntPtr nIndex ) const; + long GetIndexSize( sal_uIntPtr nIndex ) const; }; #endif // _CTRLTOOL_HXX diff --git a/svtools/inc/expander.hxx b/svtools/inc/expander.hxx index c0f3cfc7632a..ec53a515c989 100644 --- a/svtools/inc/expander.hxx +++ b/svtools/inc/expander.hxx @@ -52,9 +52,9 @@ private: Image aActiveImage; Rectangle maFocusRect; ImageList maExpanderImages; - BOOL mbIsExpanded; - BOOL mbHasFocusRect; - BOOL mbIsInMouseDown; + sal_Bool mbIsExpanded; + sal_Bool mbHasFocusRect; + sal_Bool mbIsInMouseDown; Link maToggleHdl; SvExpanderStateType eType; @@ -75,9 +75,9 @@ public: SvExpander( Window* pParent, WinBits nStyle = 0 ); SvExpander( Window* pParent, const ResId& rResId ); - BOOL IsExpanded() {return mbIsExpanded;} + sal_Bool IsExpanded() {return mbIsExpanded;} - void SetToExpanded(BOOL bFlag=TRUE); + void SetToExpanded(sal_Bool bFlag=sal_True); void SetExpanderImage( SvExpanderStateType eType); Image GetExpanderImage(SvExpanderStateType eType); diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx index dd314bb23ca1..c88689ea0338 100644 --- a/svtools/inc/filectrl.hxx +++ b/svtools/inc/filectrl.hxx @@ -39,14 +39,14 @@ #define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! // Flags for FileControl -typedef USHORT FileControlMode; -#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely +typedef sal_uInt16 FileControlMode; +#define FILECTRL_RESIZEBUTTONBYPATHLEN ((sal_uInt16)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely // Flags for internal use of FileControl -typedef USHORT FileControlMode_Internal; -#define FILECTRL_INRESIZE ((USHORT)0x0001) -#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) +typedef sal_uInt16 FileControlMode_Internal; +#define FILECTRL_INRESIZE ((sal_uInt16)0x0001) +#define FILECTRL_ORIGINALBUTTONTEXT ((sal_uInt16)0x0002) class SVT_DLLPUBLIC FileControl : public Window @@ -56,7 +56,7 @@ private: PushButton maButton; String maButtonText; - BOOL mbOpenDlg; + sal_Bool mbOpenDlg; Link maDialogCreatedHdl; @@ -80,10 +80,10 @@ public: Edit& GetEdit() { return maEdit; } PushButton& GetButton() { return maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); - void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } - BOOL IsOpenDialog() const { return mbOpenDlg; } + void SetOpenDialog( sal_Bool bOpen ) { mbOpenDlg = bOpen; } + sal_Bool IsOpenDialog() const { return mbOpenDlg; } void SetText( const XubString& rStr ); XubString GetText() const; @@ -92,8 +92,8 @@ public: void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } Selection GetSelection() const { return maEdit.GetSelection(); } - void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } - BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } + void SetReadOnly( sal_Bool bReadOnly = sal_True ) { maEdit.SetReadOnly( bReadOnly ); } + sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); } //------ //manipulate the Button-Text: diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx index c04e48fc7658..59fd393ea73c 100644 --- a/svtools/inc/filedlg.hxx +++ b/svtools/inc/filedlg.hxx @@ -53,7 +53,7 @@ protected: UniString aDfltExt; // Default - Extension public: - PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); + PathDialog( Window* pParent, WinBits nWinStyle = 0, sal_Bool bCreateDir = sal_True ); ~PathDialog(); virtual long OK(); @@ -92,9 +92,9 @@ public: void RemoveAllFilter(); void SetCurFilter( const UniString& rFilter ); UniString GetCurFilter() const; - USHORT GetFilterCount() const; - UniString GetFilterName( USHORT nPos ) const; - UniString GetFilterType( USHORT nPos ) const; + sal_uInt16 GetFilterCount() const; + UniString GetFilterName( sal_uInt16 nPos ) const; + UniString GetFilterType( sal_uInt16 nPos ) const; void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } const Link& GetFileSelectHdl() const { return aFileHdlLink; } diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx index 74476541dcd8..969efc228ae9 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/fileview.hxx @@ -189,7 +189,7 @@ public: void SetDoubleClickHdl( const Link& rHdl ); void SetOpenDoneHdl( const Link& rHdl ); - ULONG GetSelectionCount() const; + sal_uIntPtr GetSelectionCount() const; SvLBoxEntry* FirstSelected() const; SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; void EnableAutoResize(); @@ -199,7 +199,7 @@ public: void EnableDelete( sal_Bool bEnable ); void EnableNameReplacing( sal_Bool bEnable = sal_True ); // translate folder names or display doc-title instead of file name - // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! + // EnableContextMenu( sal_True )/EnableDelete(sal_True) disable name replacing! // save and load column size and sort order String GetConfigString() const; diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx index 8ef3f2ab3740..fcfc76026eb9 100644 --- a/svtools/inc/fltdefs.hxx +++ b/svtools/inc/fltdefs.hxx @@ -40,12 +40,12 @@ typedef struct RGBQUAD { - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; + sal_uInt8 rgbBlue; + sal_uInt8 rgbGreen; + sal_uInt8 rgbRed; + sal_uInt8 rgbReserved; - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) : rgbBlue ( cBlue ), rgbGreen ( cGreen ), rgbRed ( cRed ), @@ -54,7 +54,7 @@ typedef struct RGBQUAD #ifdef WIN -typedef BYTE huge* PDIBBYTE; +typedef sal_uInt8 huge* PDIBBYTE; #define MEMCPY hmemcpy #define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) #define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) @@ -62,13 +62,13 @@ typedef BYTE huge* PDIBBYTE; #define MEMSET( pDst, cByte, nCount ) \ { \ PDIBBYTE pTmp = (PDIBBYTE) pDst; \ - for ( ULONG i = 0; i < nCount; i++ )\ + for ( sal_uIntPtr i = 0; i < nCount; i++ )\ *pTmp++ = cByte; \ } #else -typedef BYTE* PDIBBYTE; +typedef sal_uInt8* PDIBBYTE; #define MEMCPY memcpy #define MEMSET memset #define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) @@ -78,18 +78,18 @@ typedef BYTE* PDIBBYTE; #endif #else -typedef BYTE* PDIBBYTE; +typedef sal_uInt8* PDIBBYTE; #define MEMCPY memcpy #define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) +#define GLOBALALLOC(nSize) ((PDIBBYTE)new sal_uInt8[(nSize)]) #define GLOBALFREE(pPointer) (delete[] (pPointer)) #endif #if defined ( OS2 ) || defined ( UNX ) -void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); -void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); +void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uIntPtr nOffBits = 0 ); +void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer ); #ifdef OS2 #define RGBQUAD RGBQUADOS2 @@ -103,12 +103,12 @@ void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); typedef struct RGBQUAD { - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; + sal_uInt8 rgbBlue; + sal_uInt8 rgbGreen; + sal_uInt8 rgbRed; + sal_uInt8 rgbReserved; - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) : rgbBlue ( cBlue ), rgbGreen ( cGreen ), rgbRed ( cRed ), @@ -117,27 +117,27 @@ typedef struct RGBQUAD typedef struct BITMAPFILEHEADER { - UINT16 bfType; - UINT32 bfSize; - UINT16 bfReserved1; - UINT16 bfReserved2; - UINT32 bfOffBits; + sal_uInt16 bfType; + sal_uInt32 bfSize; + sal_uInt16 bfReserved1; + sal_uInt16 bfReserved2; + sal_uInt32 bfOffBits; } BITMAPFILEHEADER; typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; typedef struct BITMAPINFOHEADER { - UINT32 biSize; - UINT32 biWidth; - UINT32 biHeight; - UINT16 biPlanes; - UINT16 biBitCount; - UINT32 biCompression; - UINT32 biSizeImage; - UINT32 biXPelsPerMeter; - UINT32 biYPelsPerMeter; - UINT32 biClrUsed; - UINT32 biClrImportant; + sal_uInt32 biSize; + sal_uInt32 biWidth; + sal_uInt32 biHeight; + sal_uInt16 biPlanes; + sal_uInt16 biBitCount; + sal_uInt32 biCompression; + sal_uInt32 biSizeImage; + sal_uInt32 biXPelsPerMeter; + sal_uInt32 biYPelsPerMeter; + sal_uInt32 biClrUsed; + sal_uInt32 biClrImportant; } BITMAPINFOHEADER; typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; diff --git a/svtools/inc/htmltokn.h b/svtools/inc/htmltokn.h index 7c43c1463e25..5b577093ce8a 100644 --- a/svtools/inc/htmltokn.h +++ b/svtools/inc/htmltokn.h @@ -46,7 +46,7 @@ SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); int GetHTMLOption( const String& rName ); // suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) -SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); +SVT_DLLPUBLIC sal_uIntPtr GetHTMLColor( const String& rName ); // beginnen immer ab 256, groesser als ein char const int HTML_TOKEN_START = 0x100; diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/inetimg.hxx index 924bbad831d6..093263e82da3 100644 --- a/svtools/inc/inetimg.hxx +++ b/svtools/inc/inetimg.hxx @@ -77,8 +77,8 @@ public: const Size& GetSizePixel() const { return aSizePixel; } // Im-/Export - sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; - sal_Bool Read( SvStream& rIStm, ULONG nFormat ); + sal_Bool Write( SvStream& rOStm, sal_uIntPtr nFormat ) const; + sal_Bool Read( SvStream& rIStm, sal_uIntPtr nFormat ); }; #endif // #ifndef _INETIMG_HXX diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx index 5bea4675b62e..bbc93a7530ff 100644 --- a/svtools/inc/ivctrl.hxx +++ b/svtools/inc/ivctrl.hxx @@ -85,7 +85,7 @@ class SvxIconChoiceCtrlEntry Rectangle aRect; // Bounding-Rect des Entries Rectangle aGridRect; // nur gesetzt im Grid-Modus - ULONG nPos; + sal_uIntPtr nPos; // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus @@ -95,12 +95,12 @@ class SvxIconChoiceCtrlEntry SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) SvxIconChoiceCtrlTextMode eTextMode; - USHORT nX,nY; // fuer Tastatursteuerung - USHORT nFlags; + sal_uInt16 nX,nY; // fuer Tastatursteuerung + sal_uInt16 nFlags; - void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } - void SetFlags( USHORT nMask ) { nFlags |= nMask; } - void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } + void ClearFlags( sal_uInt16 nMask ) { nFlags &= (~nMask); } + void SetFlags( sal_uInt16 nMask ) { nFlags |= nMask; } + void AssignFlags( sal_uInt16 _nFlags ) { nFlags = _nFlags; } // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) void SetBacklink( SvxIconChoiceCtrlEntry* pA ) @@ -120,9 +120,9 @@ class SvxIconChoiceCtrlEntry } public: - SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( sal_uInt16 nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, sal_uInt16 nFlags = 0 ); ~SvxIconChoiceCtrlEntry () {} void SetImage ( const Image& rImage ) { aImage = rImage; } @@ -139,21 +139,21 @@ public: const Rectangle & GetBoundRect() const { return aRect; } - void SetFocus ( BOOL bSet ) + void SetFocus ( sal_Bool bSet ) { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } - USHORT GetFlags() const { return nFlags; } - BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } - BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } - BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } - BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } - BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } - BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } - BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } - void SetMoved( BOOL bMoved ); - BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } - void LockPos( BOOL bLock ); + sal_uInt16 GetFlags() const { return nFlags; } + sal_Bool IsSelected() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } + sal_Bool IsFocused() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } + sal_Bool IsInUse() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } + sal_Bool IsCursored() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } + sal_Bool IsDropTarget() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } + sal_Bool IsBlockingEmphasis() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } + sal_Bool WasMoved() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } + void SetMoved( sal_Bool bMoved ); + sal_Bool IsPosLocked() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } + void LockPos( sal_Bool bLock ); // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } @@ -174,10 +174,10 @@ class SvxIconChoiceCtrlColumnInfo Image aColImage; long nWidth; SvxIconChoiceCtrlColumnAlign eAlignment; - USHORT nSubItem; + sal_uInt16 nSubItem; public: - SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, + SvxIconChoiceCtrlColumnInfo( sal_uInt16 nSub, long nWd, SvxIconChoiceCtrlColumnAlign eAlign ) : nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); @@ -186,13 +186,13 @@ public: void SetImage( const Image& rImg ) { aColImage = rImg; } void SetWidth( long nWd ) { nWidth = nWd; } void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } - void SetSubItem( USHORT nSub) { nSubItem = nSub; } + void SetSubItem( sal_uInt16 nSub) { nSubItem = nSub; } const String& GetText() const { return aColText; } const Image& GetImage() const { return aColImage; } long GetWidth() const { return nWidth; } SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } - USHORT GetSubItem() const { return nSubItem; } + sal_uInt16 GetSubItem() const { return nSubItem; } }; //################################################################################################################################### @@ -241,15 +241,15 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control Link _aVisRectChangedHdl; KeyEvent* _pCurKeyEvent; SvxIconChoiceCtrl_Impl* _pImp; - BOOL _bAutoFontColor; + sal_Bool _bAutoFontColor; protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); + virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, sal_Bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); - virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -269,11 +269,11 @@ protected: virtual String GetEntryText( SvxIconChoiceCtrlEntry* pEntry, - BOOL bInplaceEdit ); + sal_Bool bInplaceEdit ); virtual void FillLayoutData() const; - void CallImplEventListeners(ULONG nEvent, void* pData); + void CallImplEventListeners(sal_uIntPtr nEvent, void* pData); public: @@ -284,9 +284,9 @@ public: void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const; - BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); + sal_Bool SetChoiceWithCursor ( sal_Bool bDo = sal_True ); - void SetUpdateMode( BOOL bUpdateMode ); + void SetUpdateMode( sal_Bool bUpdateMode ); void SetFont( const Font& rFont ); void SetPointFont( const Font& rFont ); @@ -299,17 +299,17 @@ public: void ArrangeIcons(); - SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, + SvxIconChoiceCtrlEntry* InsertEntry( sal_uIntPtr nPos = LIST_APPEND, const Point* pPos = 0, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, - ULONG nPos = LIST_APPEND, + sal_uIntPtr nPos = LIST_APPEND, const Point* pPos = 0, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, - ULONG nPos = LIST_APPEND, + sal_uIntPtr nPos = LIST_APPEND, const Point* pPos = 0, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); /** creates automatic mnemonics for all icon texts in the control */ @@ -326,14 +326,14 @@ public: void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); - BOOL DoKeyInput( const KeyEvent& rKEvt ); + sal_Bool DoKeyInput( const KeyEvent& rKEvt ); - BOOL IsEntryEditing() const; + sal_Bool IsEntryEditing() const; void Clear(); - ULONG GetEntryCount() const; - SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; - ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + sal_uIntPtr GetEntryCount() const; + SvxIconChoiceCtrlEntry* GetEntry( sal_uIntPtr nPos ) const; + sal_uIntPtr GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; using Window::SetCursor; void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); SvxIconChoiceCtrlEntry* GetCursor() const; @@ -341,16 +341,16 @@ public: // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); - // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt - // ==TRUE : Bitmap oder Text muss getroffen sein - SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; + // bHit==sal_False: Eintrag gilt als getroffen, wenn Position im BoundRect liegt + // ==sal_True : Bitmap oder Text muss getroffen sein + SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, sal_Bool bHit = sal_False ) const; // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool ) const; // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool ) const; - // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben - SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; + // in dem sal_uIntPtr wird die Position in der Liste des gefunden Eintrags zurueckgegeben + SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uIntPtr& rPos ) const; void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; @@ -360,19 +360,19 @@ public: void Flush(); - virtual BOOL HasBackground() const; - virtual BOOL HasFont() const; - virtual BOOL HasFontTextColor() const; - virtual BOOL HasFontFillColor() const; + virtual sal_Bool HasBackground() const; + virtual sal_Bool HasFont() const; + virtual sal_Bool HasFontTextColor() const; + virtual sal_Bool HasFontFillColor() const; - void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } - BOOL AutoFontColor () { return _bAutoFontColor; } + void SetFontColorToBackground ( sal_Bool bDo = sal_True ) { _bAutoFontColor = bDo; } + sal_Bool AutoFontColor () { return _bAutoFontColor; } Point GetLogicPos( const Point& rPosPixel ) const; Point GetPixelPos( const Point& rPosLogic ) const; void SetSelectionMode( SelectionMode eMode ); - BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); + sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx index c72f68f64f03..b00a306d0535 100644 --- a/svtools/inc/localresaccess.hxx +++ b/svtools/inc/localresaccess.hxx @@ -68,7 +68,7 @@ namespace svt FreeResource(); } - inline BOOL IsAvailableRes( const ResId& _rId ) const + inline sal_Bool IsAvailableRes( const ResId& _rId ) const { return Resource::IsAvailableRes( _rId ); } diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/prgsbar.hxx index c02d400c6931..25411b696c84 100644 --- a/svtools/inc/prgsbar.hxx +++ b/svtools/inc/prgsbar.hxx @@ -72,15 +72,15 @@ private: Point maPos; long mnPrgsWidth; long mnPrgsHeight; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbCalcNew; + sal_uInt16 mnPercent; + sal_uInt16 mnPercentCount; + sal_Bool mbCalcNew; #ifdef _SV_PRGSBAR_CXX using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SVT_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); #endif public: @@ -93,8 +93,8 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetValue( USHORT nNewPercent ); - USHORT GetValue() const { return mnPercent; } + void SetValue( sal_uInt16 nNewPercent ); + sal_uInt16 GetValue() const { return mnPercent; } }; #endif // _PRGSBAR_HXX diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx index 12a125635132..36096e1257f1 100644 --- a/svtools/inc/rtfout.hxx +++ b/svtools/inc/rtfout.hxx @@ -50,15 +50,15 @@ public: static SvStream& Out_Char( SvStream&, sal_Unicode cChar, int *pUCMode, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); static SvStream& Out_Fontname( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); - static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); + static SvStream& Out_Hex( SvStream&, sal_uIntPtr nHex, sal_uInt8 nLen ); }; diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx index c2649b298ba6..028d67c20877 100644 --- a/svtools/inc/ruler.hxx +++ b/svtools/inc/ruler.hxx @@ -138,7 +138,7 @@ SetMargin2() mit Parametern aufgerufen werden, kann bei diesen folgendes angegeben werden: long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: + sal_uInt16 nStyle - Bit-Style: RULER_MARGIN_SIZEABLE Rand kann in der Groesse veraendert werden. @@ -154,7 +154,7 @@ initialisiert werden muessen: long nPos - Offset zum NullPunkt in Pixel long nWidth - Breite des Spaltenabstands in Pixel (kann zum Beispiel fuer Tabellenspalten auch 0 sein) - USHORT nStyle - Bit-Style: + sal_uInt16 nStyle - Bit-Style: RULER_BORDER_SIZEABLE Spaltenabstand kann in der Groesse veraendert werden. Dieses Flag sollte nur gesetzt werden, @@ -190,7 +190,7 @@ Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende Werte initialisiert werden muessen: long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: + sal_uInt16 nStyle - Bit-Style: RULER_INDENT_TOP (Erstzeileneinzug) RULER_INDENT_BOTTOM (Linker/Rechter Einzug) RULER_INDENT_BORDER (Verical line that shows the border distance) @@ -206,7 +206,7 @@ Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende Werte initialisiert werden muessen: long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: + sal_uInt16 nStyle - Bit-Style: RULER_TAB_DEFAULT (kann nicht selektiert werden) RULER_TAB_LEFT RULER_TAB_CENTER @@ -223,7 +223,7 @@ muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte initialisiert werden muessen: long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + sal_uInt16 nStyle - Bit-Style (muss zur Zeit immer 0 sein) Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen @@ -234,7 +234,7 @@ uebergeben werden, wobei folgende Werte initialisiert werden muessen: long nPos - Offset zum NullPunkt in Pixel long nWidth - Breite des Pfeils long nLogWidth - Breite des Pfeils in logischer Einheit - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + sal_uInt16 nStyle - Bit-Style (muss zur Zeit immer 0 sein) Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die @@ -246,7 +246,7 @@ Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden. Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben -von FALSE das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position +von sal_False das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position abgefragt werden und die Werte muessen an die neue Position verschoben werden. Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst @@ -254,10 +254,10 @@ danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber entsprechende Set..Hdl()-Methoden gesetzt werden. - StartDrag() - Wird gerufen, wenn das Draggen gestartet wird. Wenn FALSE - zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei TRUE + Wird gerufen, wenn das Draggen gestartet wird. Wenn sal_False + zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei sal_True wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert - wird, wird FALSE zurueckgegeben. + wird, wird sal_False zurueckgegeben. - EndDrag() Wird gerufen, wenn das Draggen beendet wird. @@ -325,7 +325,7 @@ es folgende Abfrage-Methoden. gezogen, werden automatisch die alten Werte dargestellt, ohne das der Drag-Handler gerufen wird. Falls der Benutzer jedoch den Wert auf die alte Position - zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls + zurueckgeschoben hat, liefert die Methode trotzdem sal_False. Falls dies vermieden werden soll, muss sich die Applikation im StartDrag- Handler den alten Wert merken und im EndDrag-Handler den Wert vergleichen. @@ -372,7 +372,7 @@ es folgende Abfrage-Methoden. gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als Paramter ueber gibt man die Fensterposition und gegebenenfalls - einen Pointer auf einen USHORT, um die Array-Position eines + einen Pointer auf einen sal_uInt16, um die Array-Position eines Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende Werte zurueckgegeben: RULER_TYPE_DONTKNOW (kein Element im Linealbereich) @@ -388,7 +388,7 @@ mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die Drag-Steuerung: - IsDrag() - Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. + Liefert sal_True zurueck, wenn sich das Lineal im Drag-Vorgang befindet. - CancelDrag() Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei @@ -443,7 +443,7 @@ womit man bestimmte Aktionen abfangen kann. RULER_EXTRA_DONTKNOW (Nichts) RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) RULER_EXTRA_TAB (Tab) - - USHORT nStyle Bitfeld als Style: + - sal_uInt16 nStyle Bitfeld als Style: RULER_STYLE_HIGHLIGHT (selektiert) RULER_TAB_... (ein Tab-Style) @@ -553,9 +553,9 @@ enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, enum RulerExtra { RULER_EXTRA_DONTKNOW, RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; -#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) -#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) -#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) +#define RULER_STYLE_HIGHLIGHT ((sal_uInt16)0x8000) +#define RULER_STYLE_DONTKNOW ((sal_uInt16)0x4000) +#define RULER_STYLE_INVISIBLE ((sal_uInt16)0x2000) #define RULER_DRAGSIZE_MOVE 0 #define RULER_DRAGSIZE_1 1 @@ -574,24 +574,24 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW, // - RulerMargin - // --------------- -#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) +#define RULER_MARGIN_SIZEABLE ((sal_uInt16)0x0001) // --------------- // - RulerBorder - // --------------- -#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) -#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) -#define RULER_BORDER_VARIABLE ((USHORT)0x0004) -#define RULER_BORDER_TABLE ((USHORT)0x0008) -#define RULER_BORDER_SNAP ((USHORT)0x0010) -#define RULER_BORDER_MARGIN ((USHORT)0x0020) +#define RULER_BORDER_SIZEABLE ((sal_uInt16)0x0001) +#define RULER_BORDER_MOVEABLE ((sal_uInt16)0x0002) +#define RULER_BORDER_VARIABLE ((sal_uInt16)0x0004) +#define RULER_BORDER_TABLE ((sal_uInt16)0x0008) +#define RULER_BORDER_SNAP ((sal_uInt16)0x0010) +#define RULER_BORDER_MARGIN ((sal_uInt16)0x0020) struct RulerBorder { long nPos; long nWidth; - USHORT nStyle; + sal_uInt16 nStyle; //minimum/maximum position, supported for table borders/rows long nMinPos; long nMaxPos; @@ -601,33 +601,33 @@ struct RulerBorder // - RulerIndent - // --------------- -#define RULER_INDENT_TOP ((USHORT)0x0000) -#define RULER_INDENT_BOTTOM ((USHORT)0x0001) -#define RULER_INDENT_BORDER ((USHORT)0x0002) -#define RULER_INDENT_STYLE ((USHORT)0x000F) +#define RULER_INDENT_TOP ((sal_uInt16)0x0000) +#define RULER_INDENT_BOTTOM ((sal_uInt16)0x0001) +#define RULER_INDENT_BORDER ((sal_uInt16)0x0002) +#define RULER_INDENT_STYLE ((sal_uInt16)0x000F) struct RulerIndent { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; // ------------ // - RulerTab - // ------------ -#define RULER_TAB_LEFT ((USHORT)0x0000) -#define RULER_TAB_RIGHT ((USHORT)0x0001) -#define RULER_TAB_DECIMAL ((USHORT)0x0002) -#define RULER_TAB_CENTER ((USHORT)0x0003) -#define RULER_TAB_DEFAULT ((USHORT)0x0004) -#define RULER_TAB_STYLE ((USHORT)0x000F) -#define RULER_TAB_RTL ((USHORT)0x0010) +#define RULER_TAB_LEFT ((sal_uInt16)0x0000) +#define RULER_TAB_RIGHT ((sal_uInt16)0x0001) +#define RULER_TAB_DECIMAL ((sal_uInt16)0x0002) +#define RULER_TAB_CENTER ((sal_uInt16)0x0003) +#define RULER_TAB_DEFAULT ((sal_uInt16)0x0004) +#define RULER_TAB_STYLE ((sal_uInt16)0x000F) +#define RULER_TAB_RTL ((sal_uInt16)0x0010) struct RulerTab { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; #define RULER_TAB_WIDTH 7 @@ -640,7 +640,7 @@ struct RulerTab struct RulerLine { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; // -------------- @@ -652,7 +652,7 @@ struct RulerArrow long nPos; long nWidth; long nLogWidth; - USHORT nStyle; + sal_uInt16 nStyle; }; class ImplRulerData; @@ -676,33 +676,33 @@ private: long mnBorderWidth; long mnStartDragPos; long mnDragPos; - ULONG mnUpdateEvtId; + sal_uIntPtr mnUpdateEvtId; ImplRulerData* mpSaveData; ImplRulerData* mpData; ImplRulerData* mpDragData; Rectangle maExtraRect; WinBits mnWinStyle; - USHORT mnUnitIndex; - USHORT mnDragAryPos; - USHORT mnDragSize; - USHORT mnDragScroll; - USHORT mnDragModifier; - USHORT mnExtraStyle; - USHORT mnExtraClicks; - USHORT mnExtraModifier; + sal_uInt16 mnUnitIndex; + sal_uInt16 mnDragAryPos; + sal_uInt16 mnDragSize; + sal_uInt16 mnDragScroll; + sal_uInt16 mnDragModifier; + sal_uInt16 mnExtraStyle; + sal_uInt16 mnExtraClicks; + sal_uInt16 mnExtraModifier; RulerExtra meExtraType; RulerType meDragType; MapUnit meSourceUnit; FieldUnit meUnit; Fraction maZoom; - BOOL mbCalc; - BOOL mbFormat; - BOOL mbDrag; - BOOL mbDragDelete; - BOOL mbDragCanceled; - BOOL mbAutoWinWidth; - BOOL mbActive; - BYTE mnUpdateFlags; + sal_Bool mbCalc; + sal_Bool mbFormat; + sal_Bool mbDrag; + sal_Bool mbDragDelete; + sal_Bool mbDragCanceled; + sal_Bool mbAutoWinWidth; + sal_Bool mbActive; + sal_uInt8 mnUpdateFlags; Link maStartDragHdl; Link maDragHdl; Link maEndDragHdl; @@ -718,27 +718,27 @@ private: SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, sal_uInt16 nStyle ); SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, sal_uInt16 nStyle ); SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SVT_DLLPRIVATE void ImplCalc(); SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); - SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); + SVT_DLLPRIVATE void ImplInitExtraField( sal_Bool bUpdate ); + SVT_DLLPRIVATE void ImplInvertLines( sal_Bool bErase = sal_False ); SVT_DLLPRIVATE void ImplDraw(); - SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); + SVT_DLLPRIVATE void ImplDrawExtra( sal_Bool bPaint = sal_False ); + SVT_DLLPRIVATE void ImplUpdate( sal_Bool bMustCalc = sal_False ); using Window::ImplHitTest; - SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, + SVT_DLLPRIVATE sal_Bool ImplHitTest( const Point& rPos, ImplRulerHitTest* pHitTest, - BOOL bRequiredStyle = FALSE, - USHORT nRequiredStyle = 0 ) const; - SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; - SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); + sal_Bool bRequiredStyle = sal_False, + sal_uInt16 nRequiredStyle = 0 ) const; + SVT_DLLPRIVATE sal_Bool ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; + SVT_DLLPRIVATE sal_Bool ImplStartDrag( ImplRulerHitTest* pHitTest, sal_uInt16 nModifier ); SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); SVT_DLLPRIVATE void ImplEndDrag(); DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); @@ -769,7 +769,7 @@ public: void Activate(); void Deactivate(); - BOOL IsActive() const { return mbActive; } + sal_Bool IsActive() const { return mbActive; } void SetWinPos( long nOff = 0, long nWidth = 0 ); long GetWinOffset() const { return mnWinOff; } @@ -789,67 +789,67 @@ public: void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } MapUnit GetSourceUnit() const { return meSourceUnit; } - void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); + void SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle = 0 ); RulerExtra GetExtraType() const { return meExtraType; } - USHORT GetExtraStyle() const { return mnExtraStyle; } - USHORT GetExtraClicks() const { return mnExtraClicks; } - USHORT GetExtraModifier() const { return mnExtraModifier; } + sal_uInt16 GetExtraStyle() const { return mnExtraStyle; } + sal_uInt16 GetExtraClicks() const { return mnExtraClicks; } + sal_uInt16 GetExtraModifier() const { return mnExtraModifier; } - BOOL StartDocDrag( const MouseEvent& rMEvt, + sal_Bool StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType = RULER_TYPE_DONTKNOW ); RulerType GetDocType( const Point& rPos, RulerType eDragType = RULER_TYPE_DONTKNOW, - USHORT* pAryPos = NULL ) const; + sal_uInt16* pAryPos = NULL ) const; RulerType GetDragType() const { return meDragType; } long GetDragPos() const { return mnDragPos; } - USHORT GetDragAryPos() const { return mnDragAryPos; } - USHORT GetDragSize() const { return mnDragSize; } - BOOL IsDragDelete() const { return mbDragDelete; } - BOOL IsDragCanceled() const { return mbDragCanceled; } - USHORT GetDragScroll() const { return mnDragScroll; } - USHORT GetDragModifier() const { return mnDragModifier; } - BOOL IsDrag() const { return mbDrag; } + sal_uInt16 GetDragAryPos() const { return mnDragAryPos; } + sal_uInt16 GetDragSize() const { return mnDragSize; } + sal_Bool IsDragDelete() const { return mbDragDelete; } + sal_Bool IsDragCanceled() const { return mbDragCanceled; } + sal_uInt16 GetDragScroll() const { return mnDragScroll; } + sal_uInt16 GetDragModifier() const { return mnDragModifier; } + sal_Bool IsDrag() const { return mbDrag; } void CancelDrag(); long GetClickPos() const { return mnDragPos; } RulerType GetClickType() const { return meDragType; } - USHORT GetClickAryPos() const { return mnDragAryPos; } + sal_uInt16 GetClickAryPos() const { return mnDragAryPos; } using Window::GetType; RulerType GetType( const Point& rPos, - USHORT* pAryPos = NULL ) const; + sal_uInt16* pAryPos = NULL ) const; void SetNullOffset( long nPos ); long GetNullOffset() const; void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + void SetMargin1( long nPos, sal_uInt16 nMarginStyle = RULER_MARGIN_SIZEABLE ); long GetMargin1() const; - USHORT GetMargin1Style() const; + sal_uInt16 GetMargin1Style() const; void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + void SetMargin2( long nPos, sal_uInt16 nMarginStyle = RULER_MARGIN_SIZEABLE ); long GetMargin2() const; - USHORT GetMargin2Style() const; + sal_uInt16 GetMargin2Style() const; - void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); - USHORT GetLineCount() const; + void SetLines( sal_uInt16 n = 0, const RulerLine* pLineAry = NULL ); + sal_uInt16 GetLineCount() const; const RulerLine* GetLines() const; - void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); - USHORT GetArrowCount() const; + void SetArrows( sal_uInt16 n = 0, const RulerArrow* pArrowAry = NULL ); + sal_uInt16 GetArrowCount() const; const RulerArrow* GetArrows() const; - void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); - USHORT GetBorderCount() const; + void SetBorders( sal_uInt16 n = 0, const RulerBorder* pBrdAry = NULL ); + sal_uInt16 GetBorderCount() const; const RulerBorder* GetBorders() const; - void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); - USHORT GetIndentCount() const; + void SetIndents( sal_uInt16 n = 0, const RulerIndent* pIndentAry = NULL ); + sal_uInt16 GetIndentCount() const; const RulerIndent* GetIndents() const; - void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); - USHORT GetTabCount() const; + void SetTabs( sal_uInt16 n = 0, const RulerTab* pTabAry = NULL ); + sal_uInt16 GetTabCount() const; const RulerTab* GetTabs() const; static void DrawTab( OutputDevice* pDevice, - const Point& rPos, USHORT nStyle ); + const Point& rPos, sal_uInt16 nStyle ); void SetStyle( WinBits nStyle ); WinBits GetStyle() const { return mnWinStyle; } @@ -868,7 +868,7 @@ public: const Link& GetExtraDownHdl() const { return maExtraDownHdl; } //set text direction right-to-left - void SetTextRTL(BOOL bRTL); + void SetTextRTL(sal_Bool bRTL); }; #endif // _RULER_HXX diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx index 1542ed667133..c3e3729b2734 100644 --- a/svtools/inc/scrwin.hxx +++ b/svtools/inc/scrwin.hxx @@ -40,7 +40,7 @@ class DataChangedEvent; // - ScrollableWindow-Type - // ------------------------- -typedef USHORT ScrollableWindowFlags; +typedef sal_uInt16 ScrollableWindowFlags; #define SCRWIN_THUMBDRAGGING 1 #define SCRWIN_VCENTER 2 @@ -62,7 +62,7 @@ private: ScrollBar aVScroll; // the scrollbars ScrollBar aHScroll; ScrollBarBox aCornerWin; // window in the bottom right corner - BOOL bScrolling:1, // user controlled scrolling + sal_Bool bScrolling:1, // user controlled scrolling bHandleDragging:1, // scroll window while dragging bHCenter:1, bVCenter:1; @@ -94,15 +94,15 @@ public: Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } void SetVisibleSize( const Size& rNewSize ); - BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); + sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False ); Rectangle GetVisibleArea() const; - void SetLineSize( ULONG nHorz, ULONG nVert ); + void SetLineSize( sal_uIntPtr nHorz, sal_uIntPtr nVert ); using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); + virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); void ScrollLines( long nLinesX, long nLinesY ); - void ScrollPages( long nPagesX, ULONG nOverlapX, - long nPagesY, ULONG nOverlapY ); + void ScrollPages( long nPagesX, sal_uIntPtr nOverlapX, + long nPagesY, sal_uIntPtr nOverlapY ); private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx index 1b7e9816a103..34626dbd7721 100644 --- a/svtools/inc/stdmenu.hxx +++ b/svtools/inc/stdmenu.hxx @@ -189,7 +189,7 @@ private: Link maSelectHdl; Link maHighlightHdl; - SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); + SVT_DLLPRIVATE sal_Bool ImplIsAlreadyInserted( const XubString& rStyleName, sal_uInt16 nCount ); public: FontStyleMenu(); diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx index 198a24b8eb62..8d363f180777 100755 --- a/svtools/inc/svtools/accessibletable.hxx +++ b/svtools/inc/svtools/accessibletable.hxx @@ -101,7 +101,7 @@ public: // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; - virtual XACC GetAccessible( BOOL bCreate = TRUE )= 0; + virtual XACC GetAccessible( sal_Bool bCreate = sal_True )= 0; virtual Window* GetAccessibleParentWindow() const= 0; virtual Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; @@ -112,8 +112,8 @@ public: virtual sal_Int32 GetSelectedRowCount() const= 0; virtual bool IsRowSelected( long _nRow ) const= 0; virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ) = 0; + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0; @@ -149,7 +149,7 @@ public: virtual void dispose() = 0; /** checks whether the accessible implementation, and its context, are still alive - @return , if the object is not disposed or disposing. + @return , if the object is not disposed or disposing. */ virtual sal_Bool isAlive() const = 0; diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx index d14aecce9f58..484a6efb69c9 100644 --- a/svtools/inc/svtools/accessibletableprovider.hxx +++ b/svtools/inc/svtools/accessibletableprovider.hxx @@ -83,31 +83,31 @@ public: @param _nColumn The column which description is in demand. */ virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; - /** @return , if the object has a row header. */ + /** @return , if the object has a row header. */ virtual sal_Bool HasRowHeader() const = 0; //GetColumnId - /** @return , if the object can focus a cell. */ + /** @return , if the object can focus a cell. */ virtual sal_Bool IsCellFocusable() const = 0; virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual void SetNoSelection() = 0; virtual void SelectAll() = 0; - virtual void SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ) = 0; + virtual void SelectRow( long _nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ) = 0; virtual void SelectColumn( sal_uInt16 _nColumnPos, sal_Bool _bSelect = sal_True ) = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; virtual sal_Int32 GetSelectedColumnCount() const = 0; - /** @return , if the row is selected. */ + /** @return , if the row is selected. */ virtual bool IsRowSelected( long _nRow ) const = 0; virtual sal_Bool IsColumnSelected( long _nColumnPos ) const = 0; virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const = 0; virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const = 0; - /** @return , if the cell is visible. */ + /** @return , if the cell is visible. */ virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual String GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const = 0; + virtual String GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, BOOL _bIsHeader, BOOL _bOnScreen = TRUE ) = 0; + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ) = 0; virtual XACC CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual XACC CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0; @@ -129,12 +129,12 @@ public: virtual void GrabTableFocus() = 0; // OutputDevice - virtual BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; + virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; - virtual XACC GetAccessible( BOOL bCreate = TRUE ) = 0; + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ) = 0; virtual Window* GetAccessibleParentWindow() const = 0; virtual Window* GetWindowInstance() = 0; @@ -189,7 +189,7 @@ public: virtual void dispose() = 0; /** checks whether the accessible implementation, and its context, are still alive - @return , if the object is not disposed or disposing. + @return , if the object is not disposed or disposing. */ virtual sal_Bool isAlive() const = 0; diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 42fb4b4d36ac..699890d02e5b 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -67,7 +67,7 @@ namespace utl { #define BROWSER_INVALIDID USHRT_MAX #define BROWSER_ENDOFSELECTION (long)(SFX_ENDOFSELECTION) -typedef ULONG BrowserMode; +typedef sal_uIntPtr BrowserMode; #define BROWSER_COLUMNSELECTION 0x0001 #define BROWSER_MULTISELECTION 0x0002 @@ -153,20 +153,20 @@ class BrowseEvent Window* pWin; long nRow; Rectangle aRect; - USHORT nCol; - USHORT nColId; + sal_uInt16 nCol; + sal_uInt16 nColId; public: BrowseEvent(); BrowseEvent( Window* pWindow, long nAbsRow, - USHORT nColumn, USHORT nColumnId, + sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); Window* GetWindow() const { return pWin; } long GetRow() const { return nRow; } - USHORT GetColumn() const { return nCol; } - USHORT GetColumnId() const { return nColId; } + sal_uInt16 GetColumn() const { return nCol; } + sal_uInt16 GetColumnId() const { return nColId; } const Rectangle& GetRect() const { return aRect; } }; @@ -180,7 +180,7 @@ public: BrowserMouseEvent(); BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt ); BrowserMouseEvent( Window* pWin, const MouseEvent& rEvt, - long nAbsRow, USHORT nColumn, USHORT nColumnId, + long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); }; @@ -253,45 +253,45 @@ class SVT_DLLPUBLIC BrowseBox ScrollBar aHScroll; // horizontal scrollbar long nDataRowHeight; // height of a single data-row - USHORT nTitleLines; // number of lines in title row - ULONG nControlAreaWidth; // width of fixed area beneeth hscroll - BOOL bThumbDragging; // handle thumb dragging - BOOL bColumnCursor; // single columns and fields selectable - BOOL bMultiSelection;// allow multiple selected rows - BOOL bKeepHighlight; // don't hide selection on LoseFocus - - BOOL bHLines; // draw lines between rows - BOOL bVLines; // draw lines between columns - BOOL bHDots; // draw lines between rows dotted - BOOL bVDots; // draw lines between columns dotted + sal_uInt16 nTitleLines; // number of lines in title row + sal_uIntPtr nControlAreaWidth; // width of fixed area beneeth hscroll + sal_Bool bThumbDragging; // handle thumb dragging + sal_Bool bColumnCursor; // single columns and fields selectable + sal_Bool bMultiSelection;// allow multiple selected rows + sal_Bool bKeepHighlight; // don't hide selection on LoseFocus + + sal_Bool bHLines; // draw lines between rows + sal_Bool bVLines; // draw lines between columns + sal_Bool bHDots; // draw lines between rows dotted + sal_Bool bVDots; // draw lines between columns dotted Color aGridLineColor; // color for lines, default dark grey - BOOL bBootstrapped; // child windows resized etc. + sal_Bool bBootstrapped; // child windows resized etc. long nTopRow; // no. of first visible row (0...) long nCurRow; // no. of row with cursor long nRowCount; // total number of rows in model - USHORT nFirstCol; // no. of first visible scrollable column - USHORT nCurColId; // column id of cursor + sal_uInt16 nFirstCol; // no. of first visible scrollable column + sal_uInt16 nCurColId; // column id of cursor - BOOL bSelecting; - BOOL bRowDividerDrag; - BOOL bHit; - BOOL mbInteractiveRowHeight; + sal_Bool bSelecting; + sal_Bool bRowDividerDrag; + sal_Bool bHit; + sal_Bool mbInteractiveRowHeight; Point a1stPoint; Point a2ndPoint; long nResizeX; // mouse position at start of resizing long nMinResizeX; // never drag more left long nDragX; // last dragged column (MouseMove) - USHORT nResizeCol; // resize this column in MouseMove - BOOL bResizing; // mouse captured for column resizing - - BOOL bSelect; // select or deselect - BOOL bSelectionIsVisible; // depending on focus - BOOL bScrolling; // hidden cursor while scrolling - BOOL bNotToggleSel; // set while in ToggleSelection() etc. - BOOL bHasFocus; // set/unset in Get/LoseFocus - BOOL bHideSelect; // hide selection (highlight) - BOOL bHideCursor; // hide cursor (frame) + sal_uInt16 nResizeCol; // resize this column in MouseMove + sal_Bool bResizing; // mouse captured for column resizing + + sal_Bool bSelect; // select or deselect + sal_Bool bSelectionIsVisible; // depending on focus + sal_Bool bScrolling; // hidden cursor while scrolling + sal_Bool bNotToggleSel; // set while in ToggleSelection() etc. + sal_Bool bHasFocus; // set/unset in Get/LoseFocus + sal_Bool bHideSelect; // hide selection (highlight) + sal_Bool bHideCursor; // hide cursor (frame) Range aSelRange; // for selection expansion BrowserColumns* pCols; // array of column-descriptions @@ -304,7 +304,7 @@ class SVT_DLLPUBLIC BrowseBox ::std::auto_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object - BOOL m_bFocusOnlyCursor; // hide cursor if we don't have the focus + sal_Bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus Color m_aCursorColor; // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too) @@ -312,16 +312,16 @@ private: //#if 0 // _SOLAR__PRIVATE SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode); SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt ); - SVT_DLLPRIVATE void ToggleSelection( BOOL bForce = FALSE ); + SVT_DLLPRIVATE void ToggleSelection( sal_Bool bForce = sal_False ); SVT_DLLPRIVATE void UpdateScrollbars(); SVT_DLLPRIVATE void AutoSizeLastColumn(); SVT_DLLPRIVATE long ImpGetDataRowHeight() const; - SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, USHORT nColId ) const; - SVT_DLLPRIVATE USHORT FrozenColCount() const; + SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, sal_uInt16 nColId ) const; + SVT_DLLPRIVATE sal_uInt16 FrozenColCount() const; - SVT_DLLPRIVATE void ColumnInserted( USHORT nPos ); + SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); @@ -330,26 +330,26 @@ private: SVT_DLLPRIVATE long GetFrozenWidth() const; //#endif - BOOL GoToRow(long nRow, BOOL bRowColMove, BOOL bDoNotModifySelection = FALSE ); + sal_Bool GoToRow(long nRow, sal_Bool bRowColMove, sal_Bool bDoNotModifySelection = sal_False ); - BOOL GoToColumnId( USHORT nColId, BOOL bMakeVisible, BOOL bRowColMove = FALSE); - void SelectColumnPos( USHORT nCol, BOOL _bSelect, BOOL bMakeVisible); - void SelectColumnId( USHORT nColId, BOOL _bSelect, BOOL bMakeVisible) + sal_Bool GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove = sal_False); + void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect, sal_Bool bMakeVisible); + void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect, sal_Bool bMakeVisible) { SelectColumnPos( GetColumnPos(nColId), _bSelect, bMakeVisible); } - void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL _bForeignDevice, BOOL _bDrawSelections); + void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections); - BOOL PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } + sal_Bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } - USHORT ToggleSelectedColumn(); - void SetToggledSelectedColumn(USHORT _nSelectedColumnId); + sal_uInt16 ToggleSelectedColumn(); + void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); protected: /// retrieves the XAccessible implementation associated with the BrowseBox instance ::svt::IAccessibleFactory& getAccessibleFactory(); protected: - USHORT ColCount() const; + sal_uInt16 ColCount() const; // software plug for database access // Der RowCount wird jetzt intern automatisch gezaehlt @@ -362,19 +362,19 @@ protected: // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen void SetRealRowCount( const String &rRealRowCount ); - // Return Value muss immer TRUE sein - SeekRow *muss* klappen! + // Return Value muss immer sal_True sein - SeekRow *muss* klappen! // (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein! /** seeks for the given row position @param nRow nRow starts at 0 */ - virtual BOOL SeekRow( long nRow ) = 0; + virtual sal_Bool SeekRow( long nRow ) = 0; virtual void DrawCursor(); virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); virtual void PaintData( Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, - USHORT nColumnId ) const = 0; + sal_uInt16 nColumnId ) const = 0; // Benachrichtigung an die abgeleitete Klasse, dass sich der sichtbare // Bereich von Rows geaendert hat. Aus dieser Methode heraus darf // die abgeleitete Klasse Aenderungen des Model mit Hilfe der Methoden @@ -392,13 +392,13 @@ protected: // dadurch aendert sich nur die Numerierung der sichtbaren Rows // - Scrollen (und daraus resultierend eine andere erste sichtbare Row) // - Resize des Fensters - virtual void VisibleRowsChanged( long nNewTopRow, USHORT nNumRows); + virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); // Anzahl sichtbarer Rows in dem Fenster (inkl. "angeschnittener" Rows) - USHORT GetVisibleRows() - { return (USHORT)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } + sal_uInt16 GetVisibleRows() + { return (sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } long GetTopRow() { return nTopRow; } - USHORT GetFirstVisibleColNumber() const { return nFirstCol; } + sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect ein-/ausschalten void DoShowCursor( const char *pWhoLog ); @@ -452,7 +452,7 @@ public: virtual void GetFocus(); virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); virtual void Command( const CommandEvent& rEvt ); virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); @@ -470,18 +470,18 @@ public: virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); - virtual BOOL IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const; + virtual sal_Bool IsCursorMoveAllowed( long nNewRow, sal_uInt16 nNewColId ) const; virtual void CursorMoved(); - virtual void ColumnMoved( USHORT nColId ); - virtual void ColumnResized( USHORT nColId ); - virtual long QueryColumnResize( USHORT nColId, long nWidth ); + virtual void ColumnMoved( sal_uInt16 nColId ); + virtual void ColumnResized( sal_uInt16 nColId ); + virtual long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); // Window-Control (pass to DataWindow) - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const; + void SetUpdateMode( sal_Bool bUpdate ); + sal_Bool GetUpdateMode() const; // map-mode and font control void SetFont( const Font& rNewFont ); @@ -495,73 +495,73 @@ public: const Color& GetGridLineColor() const {return aGridLineColor;} // inserting, changing, removing and freezing of columns - void InsertHandleColumn( ULONG nWidth ); - void InsertDataColumn( USHORT nItemId, const Image& rImage, + void InsertHandleColumn( sal_uIntPtr nWidth ); + void InsertDataColumn( sal_uInt16 nItemId, const Image& rImage, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertDataColumn( USHORT nItemId, const XubString& rText, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertDataColumn( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertDataColumn( USHORT nItemId, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertDataColumn( sal_uInt16 nItemId, const Image& rImage, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND, + sal_uInt16 nPos = HEADERBAR_APPEND, // Hilfstext bei leerem rText const String* pHelpText = 0 ); - void SetColumnTitle( USHORT nColumnId, const String &rTitle ); - void SetColumnMode( USHORT nColumnId, BrowserColumnMode nFlags ); - void SetColumnWidth( USHORT nColumnId, ULONG nWidth ); - void SetColumnPos( USHORT nColumnId, USHORT nPos ); - void FreezeColumn( USHORT nColumnId, BOOL bFreeze = TRUE ); + void SetColumnTitle( sal_uInt16 nColumnId, const String &rTitle ); + void SetColumnMode( sal_uInt16 nColumnId, BrowserColumnMode nFlags ); + void SetColumnWidth( sal_uInt16 nColumnId, sal_uIntPtr nWidth ); + void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ); + void FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True ); void UnfreezeColumns(); - void RemoveColumn( USHORT nColumnId ); + void RemoveColumn( sal_uInt16 nColumnId ); void RemoveColumns(); // control of title and data row height void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; - void SetTitleLines( USHORT nLines ); - USHORT GetTitleLines() const { return nTitleLines; } + void SetTitleLines( sal_uInt16 nLines ); + sal_uInt16 GetTitleLines() const { return nTitleLines; } virtual long GetTitleHeight() const; // access to dynamic values of cursor row - String GetColumnTitle( USHORT nColumnId ) const; - BrowserColumnMode GetColumnMode( USHORT nColumnId ) const; - Rectangle GetFieldRect( USHORT nColumnId ) const; - ULONG GetColumnWidth( USHORT nColumnId ) const; - USHORT GetColumnId( USHORT nPos ) const; - USHORT GetColumnPos( USHORT nColumnId ) const; - BOOL IsFrozen( USHORT nColumnId ) const; + String GetColumnTitle( sal_uInt16 nColumnId ) const; + BrowserColumnMode GetColumnMode( sal_uInt16 nColumnId ) const; + Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; + sal_uIntPtr GetColumnWidth( sal_uInt16 nColumnId ) const; + sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; + sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; + sal_Bool IsFrozen( sal_uInt16 nColumnId ) const; // movement of visible area void ResetScroll(); long ScrollColumns( long nColumns ); long ScrollRows( long nRows ); long ScrollPages( long nPagesY ); - BOOL MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE ); + sal_Bool MakeFieldVisible( long nRow, sal_uInt16 nColId, sal_Bool bComplete = sal_False ); // access and movement of cursor long GetCurRow() const { return nCurRow; } - USHORT GetCurColumnId() const { return nCurColId; } - BOOL GoToRow( long nRow ); - BOOL GoToRowAndDoNotModifySelection( long nRow ); - BOOL GoToColumnId( USHORT nColId ); - BOOL GoToRowColumnId( long nRow, USHORT nColId ); + sal_uInt16 GetCurColumnId() const { return nCurColId; } + sal_Bool GoToRow( long nRow ); + sal_Bool GoToRowAndDoNotModifySelection( long nRow ); + sal_Bool GoToColumnId( sal_uInt16 nColId ); + sal_Bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections virtual void SetNoSelection(); virtual void SelectAll(); - virtual void SelectRow( long nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ); - void SelectColumnPos( USHORT nCol, BOOL _bSelect = TRUE ) - { SelectColumnPos( nCol, _bSelect, TRUE); } - void SelectColumnId( USHORT nColId, BOOL _bSelect = TRUE ) - { SelectColumnPos( GetColumnPos(nColId), _bSelect, TRUE); } + virtual void SelectRow( long nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ); + void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect = sal_True ) + { SelectColumnPos( nCol, _bSelect, sal_True); } + void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect = sal_True ) + { SelectColumnPos( GetColumnPos(nColId), _bSelect, sal_True); } long GetSelectRowCount() const; - USHORT GetSelectColumnCount() const; + sal_uInt16 GetSelectColumnCount() const; virtual bool IsRowSelected( long nRow ) const; - bool IsColumnSelected( USHORT nColumnId ) const; + bool IsColumnSelected( sal_uInt16 nColumnId ) const; sal_Bool IsAllSelected() const; - long FirstSelectedRow( BOOL bInverse = FALSE ); + long FirstSelectedRow( sal_Bool bInverse = sal_False ); long LastSelectedRow(); long PrevSelectedRow(); long NextSelectedRow(); @@ -573,40 +573,40 @@ public: long FirstSelectedColumn( ) const; long NextSelectedColumn( ) const; - BOOL IsResizing() const { return bResizing; } + sal_Bool IsResizing() const { return bResizing; } // access to positions of fields, column and rows Window& GetEventWindow() const; Window& GetDataWindow() const { return *pDataWin; } Rectangle GetRowRectPixel( long nRow, - BOOL bRelToBrowser = TRUE ) const; - Rectangle GetFieldRectPixel( long nRow, USHORT nColId, - BOOL bRelToBrowser = TRUE) const; - BOOL IsFieldVisible( long nRow, USHORT nColId, - BOOL bComplete = FALSE ) const; + sal_Bool bRelToBrowser = sal_True ) const; + Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, + sal_Bool bRelToBrowser = sal_True) const; + sal_Bool IsFieldVisible( long nRow, sal_uInt16 nColId, + sal_Bool bComplete = sal_False ) const; long GetRowAtYPosPixel( long nY, - BOOL bRelToBrowser = TRUE ) const; - USHORT GetColumnAtXPosPixel( long nX, - BOOL bRelToBrowser = TRUE ) const; + sal_Bool bRelToBrowser = sal_True ) const; + sal_uInt16 GetColumnAtXPosPixel( long nX, + sal_Bool bRelToBrowser = sal_True ) const; // invalidations void Clear(); - void RowRemoved( long nRow, long nNumRows = 1, BOOL bDoPaint = TRUE ); - void RowModified( long nRow, USHORT nColId = USHRT_MAX ); - void RowInserted( long nRow, long nNumRows = 1, BOOL bDoPaint = TRUE, BOOL bKeepSelection = FALSE ); + void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True ); + void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX ); + void RowInserted( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True, sal_Bool bKeepSelection = sal_False ); // miscellanous - void ReserveControlArea( USHORT nWidth = USHRT_MAX ); + void ReserveControlArea( sal_uInt16 nWidth = USHRT_MAX ); Rectangle GetControlArea() const; - BOOL ProcessKey( const KeyEvent& rEvt ); - void Dispatch( USHORT nId ); + sal_Bool ProcessKey( const KeyEvent& rEvt ); + void Dispatch( sal_uInt16 nId ); void SetMode( BrowserMode nMode = 0 ); BrowserMode GetMode( ) const { return m_nCurrentMode; } bool IsInCommandEvent() const; void SetCursorColor(const Color& _rCol); Color GetCursorColor() const { return m_aCursorColor; } - void ResetSelecting() { bSelecting = FALSE; } + void ResetSelecting() { bSelecting = sal_False; } /** specifies that the user is allowed to interactively change the height of a row, by simply dragging an arbitrary row separator. @@ -614,21 +614,21 @@ public: Note that this works only if there's a handle column, since only in this case, there *is* something for the user to click onto */ - void EnableInteractiveRowHeight( BOOL _bEnable = TRUE ) { mbInteractiveRowHeight = _bEnable; } - BOOL IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } + void EnableInteractiveRowHeight( sal_Bool _bEnable = sal_True ) { mbInteractiveRowHeight = _bEnable; } + sal_Bool IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } /// access to selected methods, to be granted to the BrowserColumn struct BrowserColumnAccess { friend class BrowserColumn; private: BrowserColumnAccess() { } }; /** public version of PaintField, with selected access rights for the BrowserColumn */ - void DoPaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId, BrowserColumnAccess ) const + void DoPaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId, BrowserColumnAccess ) const { PaintField( rDev, rRect, nColumnId ); } /** suggests a default width for a column containing a given text The width is calculated so that the text fits completely, plus som margin. */ - ULONG GetDefaultColumnWidth( const String& _rText ) const; + sal_uIntPtr GetDefaultColumnWidth( const String& _rText ) const; /** GetCellText returns the text at the given position @param _nRow @@ -638,12 +638,12 @@ public: @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; /** @return the current column count */ - USHORT GetColumnCount() const { return ColCount(); } + sal_uInt16 GetColumnCount() const { return ColCount(); } /** commitBrowseBoxEvent commit the event at all listeners of the browsebox @param nEventId @@ -686,21 +686,21 @@ public: /** returns the Rectangle for either the column header bar ot the row header bar @param _bIsColumnBar - when column header bar is used + when column header bar is used @param _bOnScreen - when the rectangle should be calculated OnScreen + when the rectangle should be calculated OnScreen @return the Rectangle */ - virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen = TRUE); + virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen = sal_True); /** calculates the Rectangle of the table @param _bOnScreen - when the rectangle should be calculated OnScreen + when the rectangle should be calculated OnScreen @return the Rectangle */ - virtual Rectangle calcTableRect(BOOL _bOnScreen = TRUE); + virtual Rectangle calcTableRect(sal_Bool _bOnScreen = sal_True); /** @param _nRowId @@ -708,13 +708,13 @@ public: @param _nColId teh column id @param _bOnScreen - when the rectangle should be calculated OnScreen + when the rectangle should be calculated OnScreen @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,sal_uInt16 _nColId, BOOL _bIsHeader, BOOL _bOnScreen = TRUE); + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True); - /// return if and only if the accessible object for this instance has been created and is alive + /// return if and only if the accessible object for this instance has been created and is alive sal_Bool isAccessibleAlive( ) const; // ACCESSIBILITY ========================================================== @@ -763,7 +763,7 @@ public: @param rnRow Out-paramater that takes the row index. @param rnColumnId Out-paramater that takes the column ID. @param rPoint The position in pixels relative to the data window. - @return , if the point could be converted to a valid address. */ + @return , if the point could be converted to a valid address. */ virtual sal_Bool ConvertPointToCellAddress( sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ); @@ -771,21 +771,21 @@ public: index. @param rnRow Out-paramater that takes the row index. @param rPoint The position in pixels relative to the header bar. - @return , if the point could be converted to a valid index. */ + @return , if the point could be converted to a valid index. */ virtual sal_Bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ); /** Converts a point relative to the column header bar origin to a column header index. @param rnColumnId Out-paramater that takes the column ID. @param rPoint The position in pixels relative to the header bar. - @return , if the point could be converted to a valid index. */ + @return , if the point could be converted to a valid index. */ virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ); /** Converts a point relative to the BrowseBox origin to the index of an existing control. @param rnRow Out-paramater that takes the 0-based control index. @param rPoint The position in pixels relative to the BrowseBox. - @return , if the point could be converted to a valid index. */ + @return , if the point could be converted to a valid index. */ virtual sal_Bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ); // Object data and state -------------------------------------------------- @@ -836,7 +836,7 @@ public: virtual sal_uInt16 GetCurrColumn() const; virtual sal_Bool HasRowHeader() const; virtual sal_Bool IsCellFocusable() const; - virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual void SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True ); virtual sal_Bool IsColumnSelected( long _nColumn ) const; virtual sal_Int32 GetSelectedRowCount() const; @@ -844,11 +844,11 @@ public: virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const; virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const; virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual String GetAccessibleCellText(long _nRow, USHORT _nColPos) const; - virtual BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual String GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const; + virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual XACC GetAccessible( BOOL bCreate = TRUE ); + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ); virtual Window* GetAccessibleParentWindow() const; virtual Window* GetWindowInstance(); diff --git a/svtools/inc/svtools/colctrl.hxx b/svtools/inc/svtools/colctrl.hxx index d76f8e881269..7841ce93952e 100644 --- a/svtools/inc/svtools/colctrl.hxx +++ b/svtools/inc/svtools/colctrl.hxx @@ -72,7 +72,7 @@ public: Color GetColor() const { return maColor; }; void SetColor( const Color& rCol ); - void SetColor( const ColorHSB& rCol, BOOL bSetColor = TRUE ); + void SetColor( const ColorHSB& rCol, sal_Bool bSetColor = sal_True ); short GetLuminance() const { return mnLuminance; }; void SetLuminance( short nLum ); @@ -111,27 +111,27 @@ enum CMCPosition { CMC_TOPLEFT, CMC_TOPRIGHT, CMC_BOTTOMLEFT, CMC_BOTTOMRIGHT, C class ColorMixingControl : public ValueSet { private: - USHORT mnRows; - USHORT mnColumns; + sal_uInt16 mnRows; + sal_uInt16 mnColumns; Color maColor[4]; void Initialize(); - Color CalcDifferenceColor( USHORT nCol1, USHORT nCol2, USHORT nSteps ); - void FillRow( USHORT nRow ); - void FillColumn( USHORT nColumn ); + Color CalcDifferenceColor( sal_uInt16 nCol1, sal_uInt16 nCol2, sal_uInt16 nSteps ); + void FillRow( sal_uInt16 nRow ); + void FillColumn( sal_uInt16 nColumn ); public: ColorMixingControl( Window* pParent, WinBits nStyle = 0, - USHORT nRows = 4, USHORT nColumns = 4 ); + sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 ); ColorMixingControl( Window* pParent, const ResId& rResId, - USHORT nRows = 4, USHORT nColumns = 4 ); + sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 ); ~ColorMixingControl(); - USHORT GetRows() const { return mnRows; }; - void SetRows( USHORT nRows ); - USHORT GetColumns() const { return mnColumns; }; - void SetColumns( USHORT nColumns ); + sal_uInt16 GetRows() const { return mnRows; }; + void SetRows( sal_uInt16 nRows ); + sal_uInt16 GetColumns() const { return mnColumns; }; + void SetColumns( sal_uInt16 nColumns ); using ValueSet::GetColor; Color GetColor( CMCPosition ePos ) const { return maColor[ ePos ]; }; @@ -149,23 +149,23 @@ public: class ColorHSB { private: - USHORT mnHue; // Farbwinkel, 360 Grad - USHORT mnSat; // Saturation, 100 % - USHORT mnBri; // Brightness, 100 % + sal_uInt16 mnHue; // Farbwinkel, 360 Grad + sal_uInt16 mnSat; // Saturation, 100 % + sal_uInt16 mnBri; // Brightness, 100 % public: ColorHSB() { mnHue=0; mnSat=0; mnBri=0; } - ColorHSB( USHORT nH, USHORT nS, USHORT nB ) + ColorHSB( sal_uInt16 nH, sal_uInt16 nS, sal_uInt16 nB ) { mnHue=nH; mnSat=nS; mnBri=nB; } ColorHSB( const Color& rColor ); - void SetHue( USHORT nH ) { mnHue=nH; } - void SetSat( USHORT nS ) { mnSat=nS; } - void SetBri( USHORT nB ) { mnBri=nB; } - USHORT GetHue() const { return mnHue; } - USHORT GetSat() const { return mnSat; } - USHORT GetBri() const { return mnBri; } + void SetHue( sal_uInt16 nH ) { mnHue=nH; } + void SetSat( sal_uInt16 nS ) { mnSat=nS; } + void SetBri( sal_uInt16 nB ) { mnBri=nB; } + sal_uInt16 GetHue() const { return mnHue; } + sal_uInt16 GetSat() const { return mnSat; } + sal_uInt16 GetBri() const { return mnBri; } Color GetRGB() const; }; @@ -176,26 +176,26 @@ public: class ColorCMYK { private: - USHORT mnCyan; - USHORT mnMagenta; - USHORT mnYellow; - USHORT mnKey; + sal_uInt16 mnCyan; + sal_uInt16 mnMagenta; + sal_uInt16 mnYellow; + sal_uInt16 mnKey; public: ColorCMYK() { mnCyan=0; mnMagenta=0; mnYellow=0; mnKey=100; } - ColorCMYK( USHORT nC, USHORT nM, USHORT nY, USHORT nK ) + ColorCMYK( sal_uInt16 nC, sal_uInt16 nM, sal_uInt16 nY, sal_uInt16 nK ) { mnCyan=nC; mnMagenta=nM; mnYellow=nY; mnKey=nK; } ColorCMYK( const Color& rColor ); - void SetCyan( USHORT nC ) { mnCyan=nC; } - void SetMagenta( USHORT nM ) { mnMagenta=nM; } - void SetYellow( USHORT nY ) { mnYellow=nY; } - void SetKey( USHORT nK ) { mnKey=nK; } - USHORT GetCyan() const { return mnCyan; } - USHORT GetMagenta() const { return mnMagenta; } - USHORT GetYellow() const { return mnYellow; } - USHORT GetKey() const { return mnKey; } + void SetCyan( sal_uInt16 nC ) { mnCyan=nC; } + void SetMagenta( sal_uInt16 nM ) { mnMagenta=nM; } + void SetYellow( sal_uInt16 nY ) { mnYellow=nY; } + void SetKey( sal_uInt16 nK ) { mnKey=nK; } + sal_uInt16 GetCyan() const { return mnCyan; } + sal_uInt16 GetMagenta() const { return mnMagenta; } + sal_uInt16 GetYellow() const { return mnYellow; } + sal_uInt16 GetKey() const { return mnKey; } Color GetRGB() const; }; diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index f97449e1880c..1b085adceac1 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -99,7 +99,7 @@ namespace svt protected: Control* pWindow; - sal_Bool bSuspended; // if the window is hidden and disabled + sal_Bool bSuspended; // if the window is hidden and disabled public: TYPEINFO(); @@ -142,8 +142,8 @@ namespace svt virtual String GetText( LineEnd aSeparator ) const = 0; virtual void SetText( const String& _rStr ) = 0; - virtual BOOL IsReadOnly() const = 0; - virtual void SetReadOnly( BOOL bReadOnly ) = 0; + virtual sal_Bool IsReadOnly() const = 0; + virtual void SetReadOnly( sal_Bool bReadOnly ) = 0; virtual xub_StrLen GetMaxTextLen() const = 0; virtual void SetMaxTextLen( xub_StrLen _nMaxLen ) = 0; @@ -178,8 +178,8 @@ namespace svt virtual String GetText( LineEnd aSeparator ) const; virtual void SetText( const String& _rStr ); - virtual BOOL IsReadOnly() const; - virtual void SetReadOnly( BOOL bReadOnly ); + virtual sal_Bool IsReadOnly() const; + virtual void SetReadOnly( sal_Bool bReadOnly ); virtual xub_StrLen GetMaxTextLen() const; virtual void SetMaxTextLen( xub_StrLen _nMaxLen ); @@ -220,7 +220,7 @@ namespace svt virtual void Modify(); private: - BOOL dispatchKeyEvent( const KeyEvent& _rEvent ); + sal_Bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; //================================================================== @@ -246,7 +246,7 @@ namespace svt class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; - BOOL m_bOwnImplementation; // did we create m_pEditImplementation? + sal_Bool m_bOwnImplementation; // did we create m_pEditImplementation? public: TYPEINFO(); @@ -302,7 +302,7 @@ namespace svt virtual void GetFocus(); virtual long PreNotify(NotifyEvent& rEvt); virtual void Paint(const Rectangle& rClientRect); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& _rEvent ); virtual void Resize(); @@ -487,7 +487,7 @@ namespace svt CellControllerRef aController, aOldController; - ULONG nStartEvent, nEndEvent, nCellModifiedEvent; // event ids + sal_uIntPtr nStartEvent, nEndEvent, nCellModifiedEvent; // event ids Window* m_pFocusWhileRequest; // In ActivateCell, we grab the focus asynchronously, but if between requesting activation // and the asynchornous event the focus has changed, we won't grab it for ourself. @@ -664,7 +664,7 @@ namespace svt virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True); + ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True); protected: // creates the accessible which wraps the active cell void implCreateActiveAccessible( ); diff --git a/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx index 987d94c7bcee..fcdd140d78d6 100644 --- a/svtools/inc/svtools/editimplementation.hxx +++ b/svtools/inc/svtools/editimplementation.hxx @@ -74,14 +74,14 @@ void GenericEditImplementation< EDIT >::SetSelection( const Selection& _rSelecti //---------------------------------------------------------------------- template -void GenericEditImplementation< EDIT >::SetReadOnly( BOOL bReadOnly ) +void GenericEditImplementation< EDIT >::SetReadOnly( sal_Bool bReadOnly ) { m_rEdit.SetReadOnly( bReadOnly ); } //---------------------------------------------------------------------- template -BOOL GenericEditImplementation< EDIT >::IsReadOnly() const +sal_Bool GenericEditImplementation< EDIT >::IsReadOnly() const { return m_rEdit.IsReadOnly(); } diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx index 01add0c4ce1d..aca298fd1d31 100644 --- a/svtools/inc/svtools/editsyntaxhighlighter.hxx +++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx @@ -41,7 +41,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit svtools::ColorConfig m_aColorConfig; private: - virtual void DoBracketHilight(USHORT aKey); + virtual void DoBracketHilight(sal_uInt16 aKey); protected: virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx index 967c41636ea3..88ea6cf9ef70 100644 --- a/svtools/inc/svtools/ehdl.hxx +++ b/svtools/inc/svtools/ehdl.hxx @@ -43,16 +43,16 @@ class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - USHORT nCtxIdP, Window *pWin=0, - USHORT nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + sal_uInt16 nCtxIdP, Window *pWin=0, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); SfxErrorContext( - USHORT nCtxIdP, const String &aArg1, Window *pWin=0, - USHORT nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - virtual BOOL GetString(ULONG nErrId, String &rStr); + sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + virtual sal_Bool GetString(sal_uIntPtr nErrId, String &rStr); private: - USHORT nCtxId; - USHORT nResId; + sal_uInt16 nCtxId; + sal_uInt16 nResId; ResMgr *pMgr; String aArg1; }; @@ -60,26 +60,26 @@ private: class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: - SfxErrorHandler(USHORT nId, ULONG lStart, ULONG lEnd, ResMgr *pMgr=0); + SfxErrorHandler(sal_uInt16 nId, sal_uIntPtr lStart, sal_uIntPtr lEnd, ResMgr *pMgr=0); ~SfxErrorHandler(); protected: - virtual BOOL GetErrorString(ULONG lErrId, String &, USHORT&) const; - virtual BOOL GetMessageString(ULONG lErrId, String &, USHORT&) const; + virtual sal_Bool GetErrorString(sal_uIntPtr lErrId, String &, sal_uInt16&) const; + virtual sal_Bool GetMessageString(sal_uIntPtr lErrId, String &, sal_uInt16&) const; private: - ULONG lStart; - ULONG lEnd; - USHORT nId; + sal_uIntPtr lStart; + sal_uIntPtr lEnd; + sal_uInt16 nId; ResMgr *pMgr; ResMgr *pFreeMgr; //#if 0 // _SOLAR__PRIVATE - SVT_DLLPRIVATE BOOL GetClassString(ULONG lErrId, String &) const; + SVT_DLLPRIVATE sal_Bool GetClassString(sal_uIntPtr lErrId, String &) const; //#endif - virtual BOOL CreateString( - const ErrorInfo *, String &, USHORT &) const; + virtual sal_Bool CreateString( + const ErrorInfo *, String &, sal_uInt16 &) const; }; #endif diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx index 098b565385ec..24a99ea4c4b5 100644 --- a/svtools/inc/svtools/embedhlp.hxx +++ b/svtools/inc/svtools/embedhlp.hxx @@ -59,8 +59,8 @@ namespace svt EmbeddedObjectRef_Impl* mpImp; NS_UNO::Reference < NS_EMBED::XEmbeddedObject > mxObj; - SVT_DLLPRIVATE SvStream* GetGraphicStream( BOOL bUpdate ) const; - /* SVT_DLLPRIVATE */ void GetReplacement( BOOL bUpdate ); + SVT_DLLPRIVATE SvStream* GetGraphicStream( sal_Bool bUpdate ) const; + /* SVT_DLLPRIVATE */ void GetReplacement( sal_Bool bUpdate ); SVT_DLLPRIVATE void Construct_Impl(); EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ); @@ -71,7 +71,7 @@ namespace svt static void DrawPaintReplacement( const Rectangle &rRect, const String &rText, OutputDevice *pOut ); static void DrawShading( const Rectangle &rRect, OutputDevice *pOut ); - static BOOL TryRunningState( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& ); + static sal_Bool TryRunningState( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, const ::rtl::OUString& aName, @@ -96,7 +96,7 @@ namespace svt ~EmbeddedObjectRef(); EmbeddedObjectRef( const EmbeddedObjectRef& ); - BOOL TryRunningState(); + sal_Bool TryRunningState(); // assigning to a container enables the object to exchange graphical representations with a storage void AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ); @@ -119,15 +119,15 @@ namespace svt const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream, const ::rtl::OUString& rMediaType ); - void UpdateReplacement() { GetReplacement( TRUE ); } + void UpdateReplacement() { GetReplacement( sal_True ); } void UpdateReplacementOnDemand(); MapUnit GetMapUnit() const; - void Lock( BOOL bLock = TRUE ); - BOOL IsLocked() const; + void Lock( sal_Bool bLock = sal_True ); + sal_Bool IsLocked() const; void Clear(); - BOOL is() const { return mxObj.is(); } + sal_Bool is() const { return mxObj.is(); } - BOOL IsChart() const; + sal_Bool IsChart() const; // #i104867# // Provides a graphic version number for the fetchable Graphic during this object's lifetime. Internally, diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index 49ec77adfea5..0461cc6a9272 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -44,7 +44,7 @@ struct ImplDirEntryHelper { - static BOOL Exists( const INetURLObject& rObj ); + static sal_Bool Exists( const INetURLObject& rObj ); static void Kill( const String& rStr ); }; @@ -64,8 +64,8 @@ class Graphic; #define GRFILTER_OUTHINT_GREY 1 -#define GRFILTER_FORMAT_NOTFOUND ((USHORT)0xFFFF) -#define GRFILTER_FORMAT_DONTKNOW ((USHORT)0xFFFF) +#define GRFILTER_FORMAT_NOTFOUND ((sal_uInt16)0xFFFF) +#define GRFILTER_FORMAT_DONTKNOW ((sal_uInt16)0xFFFF) #define GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG 00000001 #define GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG 00000002 @@ -107,32 +107,32 @@ class Graphic; // unterstuetzten Grafik-Fileformate // ------------------------------------ -#define GFF_NOT ( (USHORT)0x0000 ) -#define GFF_BMP ( (USHORT)0x0001 ) -#define GFF_GIF ( (USHORT)0x0002 ) -#define GFF_JPG ( (USHORT)0x0003 ) -#define GFF_PCD ( (USHORT)0x0004 ) -#define GFF_PCX ( (USHORT)0x0005 ) -#define GFF_PNG ( (USHORT)0x0006 ) -#define GFF_TIF ( (USHORT)0x0007 ) -#define GFF_XBM ( (USHORT)0x0008 ) -#define GFF_XPM ( (USHORT)0x0009 ) -#define GFF_PBM ( (USHORT)0x000a ) -#define GFF_PGM ( (USHORT)0x000b ) -#define GFF_PPM ( (USHORT)0x000c ) -#define GFF_RAS ( (USHORT)0x000d ) -#define GFF_TGA ( (USHORT)0x000e ) -#define GFF_PSD ( (USHORT)0x000f ) -#define GFF_EPS ( (USHORT)0x0010 ) -#define GFF_DXF ( (USHORT)0x00f1 ) -#define GFF_MET ( (USHORT)0x00f2 ) -#define GFF_PCT ( (USHORT)0x00f3 ) -#define GFF_SGF ( (USHORT)0x00f4 ) -#define GFF_SVM ( (USHORT)0x00f5 ) -#define GFF_WMF ( (USHORT)0x00f6 ) -#define GFF_SGV ( (USHORT)0x00f7 ) -#define GFF_EMF ( (USHORT)0x00f8 ) -#define GFF_XXX ( (USHORT)0xffff ) +#define GFF_NOT ( (sal_uInt16)0x0000 ) +#define GFF_BMP ( (sal_uInt16)0x0001 ) +#define GFF_GIF ( (sal_uInt16)0x0002 ) +#define GFF_JPG ( (sal_uInt16)0x0003 ) +#define GFF_PCD ( (sal_uInt16)0x0004 ) +#define GFF_PCX ( (sal_uInt16)0x0005 ) +#define GFF_PNG ( (sal_uInt16)0x0006 ) +#define GFF_TIF ( (sal_uInt16)0x0007 ) +#define GFF_XBM ( (sal_uInt16)0x0008 ) +#define GFF_XPM ( (sal_uInt16)0x0009 ) +#define GFF_PBM ( (sal_uInt16)0x000a ) +#define GFF_PGM ( (sal_uInt16)0x000b ) +#define GFF_PPM ( (sal_uInt16)0x000c ) +#define GFF_RAS ( (sal_uInt16)0x000d ) +#define GFF_TGA ( (sal_uInt16)0x000e ) +#define GFF_PSD ( (sal_uInt16)0x000f ) +#define GFF_EPS ( (sal_uInt16)0x0010 ) +#define GFF_DXF ( (sal_uInt16)0x00f1 ) +#define GFF_MET ( (sal_uInt16)0x00f2 ) +#define GFF_PCT ( (sal_uInt16)0x00f3 ) +#define GFF_SGF ( (sal_uInt16)0x00f4 ) +#define GFF_SVM ( (sal_uInt16)0x00f5 ) +#define GFF_WMF ( (sal_uInt16)0x00f6 ) +#define GFF_SGV ( (sal_uInt16)0x00f7 ) +#define GFF_EMF ( (sal_uInt16)0x00f8 ) +#define GFF_XXX ( (sal_uInt16)0xffff ) // --------------- // - RequestInfo - @@ -140,8 +140,8 @@ class Graphic; struct RequestInfo { - BYTE* pBuffer; - ULONG nRealBufferSize; + sal_uInt8* pBuffer; + sal_uIntPtr nRealBufferSize; }; // --------------------- @@ -157,16 +157,16 @@ class SVT_DLLPUBLIC GraphicDescriptor Size aLogSize; SvStream* pMemStm; SvStream* pBaseStm; - ULONG nStmPos; - USHORT nBitsPerPixel; - USHORT nPlanes; - USHORT nFormat; - BOOL bCompressed; - BOOL bDataReady; - BOOL bLinked; - BOOL bLinkChanged; - BOOL bWideSearch; - BOOL bBaseStm; + sal_uIntPtr nStmPos; + sal_uInt16 nBitsPerPixel; + sal_uInt16 nPlanes; + sal_uInt16 nFormat; + sal_Bool bCompressed; + sal_Bool bDataReady; + sal_Bool bLinked; + sal_Bool bLinkChanged; + sal_Bool bWideSearch; + sal_Bool bBaseStm; long nExtra1; long nExtra2; @@ -174,30 +174,30 @@ class SVT_DLLPUBLIC GraphicDescriptor //#if 0 // _SOLAR__PRIVATE - BOOL ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCD( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectXBM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectXPM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPBM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPGM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPPM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectRAS( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectTGA( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectEPS( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectDXF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectMET( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCT( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSGF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectWMF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo ); + sal_Bool ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo ); //#endif @@ -206,8 +206,8 @@ class SVT_DLLPUBLIC GraphicDescriptor protected: - BOOL IsDataReady() const; - BOOL IsWideSearch() const; + sal_Bool IsDataReady() const; + sal_Bool IsWideSearch() const; SvStream& GetSearchStream() const; const String& GetPathExtension() const; @@ -237,14 +237,14 @@ public: virtual ~GraphicDescriptor(); // Startet die Detektion; - // bei bExtendedInfo == TRUE werden soweit wie moeglich + // bei bExtendedInfo == sal_True werden soweit wie moeglich // Daten aus dem jeweiligen FileHeader ermittelt // ( Groesse, Farbtiefe usw. ) - virtual BOOL Detect( BOOL bExtendedInfo = FALSE ); + virtual sal_Bool Detect( sal_Bool bExtendedInfo = sal_False ); // liefert das Fileformat nach erfolgreicher Detektion zurueck; // wenn kein Format erkannt wurde, ist das Formart GFF_NOT - USHORT GetFileFormat() const { return nFormat; } + sal_uInt16 GetFileFormat() const { return nFormat; } // liefert die Pixel-Bildgroesse oder 0-Size zurueck const Size& GetSizePixel() const { return (Size&) aPixSize; } @@ -253,19 +253,19 @@ public: const Size& GetSize_100TH_MM() const { return (Size&) aLogSize; } // liefert die Bits/Pixel oder 0 zurueck - USHORT GetBitsPerPixel() const { return nBitsPerPixel; } + sal_uInt16 GetBitsPerPixel() const { return nBitsPerPixel; } // liefert die Anzahl der Planes oder 0 zurueck - USHORT GetPlanes() const { return nPlanes; } + sal_uInt16 GetPlanes() const { return nPlanes; } // zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist - BOOL IsCompressed() const { return bCompressed; } + sal_Bool IsCompressed() const { return bCompressed; } // setzt den LinkHdl zum Setzen der Bytes; // der Handler muss einen Pointer auf die RequestInfo-Struktur // zurueckgeben; die Anzahl der minimal zur Verfuegung zu stellenden // Daten muss im Handler ueber ::GetRequestedByteCount() erfragt werden; - // die tatsaechlich zur Verfuegung gestellte BYTE-Anzahl + // die tatsaechlich zur Verfuegung gestellte sal_uInt8-Anzahl // wird in der RequestInfo-Struktur gesetzt void SetRequestHdl( const Link& rRequestHdl ); @@ -274,7 +274,7 @@ public: // muss im ReqHdl gerufen werden, um zu erfahren, wieviele // Bytes _mindestens_ bereitgestellt werden muessen - ULONG GetRequestedByteCount() const; + sal_uIntPtr GetRequestedByteCount() const; // gibt die Filternummer des Filters zurueck, // der im GraphicFilter zum Lesen dieses Formats @@ -288,8 +288,8 @@ public: struct FilterErrorEx { - ULONG nFilterError; - ULONG nStreamError; + sal_uIntPtr nFilterError; + sal_uIntPtr nStreamError; long nDummy1; long nDummy2; long nDummy3; @@ -309,7 +309,7 @@ class SVT_DLLPUBLIC GraphicFilter private: void ImplInit(); - ULONG ImplSetError( ULONG nError, const SvStream* pStm = NULL ); + sal_uIntPtr ImplSetError( sal_uIntPtr nError, const SvStream* pStm = NULL ); sal_uInt16 ImpTestOrFindFormat( const String& rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_LINK( FilterCallback, ConvertData* pData ); @@ -337,73 +337,73 @@ public: void SetFilterPath( const String& rFilterPath ) { aFilterPath = rFilterPath; }; - USHORT GetImportFormatCount(); - USHORT GetImportFormatNumber( const String& rFormatName ); - USHORT GetImportFormatNumberForMediaType( const String& rMediaType ); - USHORT GetImportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetImportFormatCount(); + sal_uInt16 GetImportFormatNumber( const String& rFormatName ); + sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); - String GetImportFormatName( USHORT nFormat ); - String GetImportFormatTypeName( USHORT nFormat ); - String GetImportFormatMediaType( USHORT nFormat ); - String GetImportFormatShortName( USHORT nFormat ); - String GetImportOSFileType( USHORT nFormat ); - String GetImportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 ); - BOOL IsImportPixelFormat( USHORT nFormat ); - - USHORT GetExportFormatCount(); - USHORT GetExportFormatNumber( const String& rFormatName ); - USHORT GetExportFormatNumberForMediaType( const String& rShortName ); - USHORT GetExportFormatNumberForShortName( const String& rShortName ); + String GetImportFormatName( sal_uInt16 nFormat ); + String GetImportFormatTypeName( sal_uInt16 nFormat ); + String GetImportFormatMediaType( sal_uInt16 nFormat ); + String GetImportFormatShortName( sal_uInt16 nFormat ); + String GetImportOSFileType( sal_uInt16 nFormat ); + String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + + sal_uInt16 GetExportFormatCount(); + sal_uInt16 GetExportFormatNumber( const String& rFormatName ); + sal_uInt16 GetExportFormatNumberForMediaType( const String& rShortName ); + sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); - String GetExportFormatName( USHORT nFormat ); - String GetExportFormatTypeName( USHORT nFormat ); - String GetExportFormatMediaType( USHORT nFormat ); - String GetExportFormatShortName( USHORT nFormat ); - String GetExportOSFileType( USHORT nFormat ); - String GetExportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 ); - BOOL IsExportPixelFormat( USHORT nFormat ); - - BOOL HasImportDialog( USHORT nFormat ); - BOOL DoImportDialog( Window* pWindow, USHORT nFormat ); - - BOOL HasExportDialog( USHORT nFormat ); - BOOL DoExportDialog( Window* pWindow, USHORT nFormat ); - BOOL DoExportDialog( Window* pWindow, USHORT nFormat, FieldUnit eFieldUnit ); - - USHORT ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, + String GetExportFormatName( sal_uInt16 nFormat ); + String GetExportFormatTypeName( sal_uInt16 nFormat ); + String GetExportFormatMediaType( sal_uInt16 nFormat ); + String GetExportFormatShortName( sal_uInt16 nFormat ); + String GetExportOSFileType( sal_uInt16 nFormat ); + String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + + sal_Bool HasImportDialog( sal_uInt16 nFormat ); + sal_Bool DoImportDialog( Window* pWindow, sal_uInt16 nFormat ); + + sal_Bool HasExportDialog( sal_uInt16 nFormat ); + sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat ); + sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat, FieldUnit eFieldUnit ); + + sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); - USHORT ExportGraphic( const Graphic& rGraphic, const String& rPath, - SvStream& rOStm, USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 ExportGraphic( const Graphic& rGraphic, const String& rPath, + SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); long GetExportGraphicHint() const { return nExpGraphHint; } - USHORT CanImportGraphic( const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL); + sal_uInt16 CanImportGraphic( const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL); - USHORT ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + sal_uInt16 ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); - USHORT CanImportGraphic( const String& rPath, SvStream& rStream, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL); + sal_uInt16 CanImportGraphic( const String& rPath, SvStream& rStream, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL); - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rStream, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rStream, - USHORT nFormat, - USHORT * pDeterminedFormat, sal_uInt32 nImportFlags, + sal_uInt16 nFormat, + sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ); - BOOL Setup( USHORT nFormat ); + sal_Bool Setup( sal_uInt16 nFormat ); - void Abort() { bAbort = TRUE; } + void Abort() { bAbort = sal_True; } const FilterErrorEx& GetLastError() const; void ResetLastError(); @@ -413,15 +413,15 @@ public: static int LoadGraphic( const String& rPath, const String& rFilter, Graphic& rGraphic, GraphicFilter* pFilter = NULL, - USHORT* pDeterminedFormat = NULL ); + sal_uInt16* pDeterminedFormat = NULL ); }; // ------------------------------------ // - Windows Metafile Lesen/Schreiben - // ------------------------------------ -SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); -SVT_DLLPUBLIC BOOL WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); -SVT_DLLPUBLIC BOOL WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); #endif //_FILTER_HXX diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx index d0bf054d724e..3da14a9a83f9 100644 --- a/svtools/inc/svtools/fltcall.hxx +++ b/svtools/inc/svtools/fltcall.hxx @@ -55,19 +55,19 @@ struct FltCallDialogParameter eFieldUnit ( eFiUni ) {}; }; -typedef BOOL (*PFilterCall)(SvStream & rStream, Graphic & rGraphic, +typedef sal_Bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool bPrefDialog); // Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. // rFileName ist der komplette Pfadname der zu importierenden bzw. zu exportierenden Datei. // pCallBack darf auch NULL sein. pCallerData wird der Callback-Funktion uebergeben. // pOptionsConfig darf NULL sein. Anderenfalls ist die Gruppe des Config schon gesetzt // und darf von dem Filter nicht geaendert werden! - // Wenn bPrefDialog==TRUE gilt, wird ggf. ein Preferences-Dialog durchgefuehrt. + // Wenn bPrefDialog==sal_True gilt, wird ggf. ein Preferences-Dialog durchgefuehrt. -typedef BOOL ( *PFilterDlgCall )( FltCallDialogParameter& ); +typedef sal_Bool ( *PFilterDlgCall )( FltCallDialogParameter& ); // Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. // Uebergeben wird ein Pointer auf ein Parent-Fenster und auf die Options-Config. - // pOptions und pWindow duerfen NULL sein, in diesem Fall wird FALSE zurueckgeliefert. + // pOptions und pWindow duerfen NULL sein, in diesem Fall wird sal_False zurueckgeliefert. // Anderenfalls ist die Gruppe der Config schon gesetzt // und darf von dem Filter nicht geaendert werden! diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx index 9226f78b77fc..c6caf4e89d42 100644 --- a/svtools/inc/svtools/fmtfield.hxx +++ b/svtools/inc/svtools/fmtfield.hxx @@ -44,7 +44,7 @@ namespace validation { class NumberValidator; } #endif -typedef USHORT FORMAT_CHANGE_TYPE; +typedef sal_uInt16 FORMAT_CHANGE_TYPE; #define FCT_KEYONLY 0x00 // only a new key was set #define FCT_FORMATTER 0x01 // a new formatter weas set, usually implies a change of the key, too #define FCT_PRECISION 0x02 // a new precision was set @@ -60,7 +60,7 @@ private: class StaticFormatter { static SvNumberFormatter* s_cFormatter; - static ULONG s_nReferences; + static sal_uIntPtr s_nReferences; public: StaticFormatter(); ~StaticFormatter(); @@ -77,19 +77,19 @@ protected: double m_dMinValue; double m_dMaxValue; - BOOL m_bHasMin : 1; - BOOL m_bHasMax : 1; + sal_Bool m_bHasMin : 1; + sal_Bool m_bHasMax : 1; - BOOL m_bStrictFormat : 1; + sal_Bool m_bStrictFormat : 1; - BOOL m_bValueDirty : 1; - BOOL m_bEnableEmptyField : 1; - BOOL m_bAutoColor : 1; - BOOL m_bEnableNaN : 1; + sal_Bool m_bValueDirty : 1; + sal_Bool m_bEnableEmptyField : 1; + sal_Bool m_bAutoColor : 1; + sal_Bool m_bEnableNaN : 1; double m_dCurrentValue; double m_dDefaultValue; - ULONG m_nFormatKey; + sal_uIntPtr m_nFormatKey; SvNumberFormatter* m_pFormatter; StaticFormatter m_aStaticFormatter; @@ -100,7 +100,7 @@ protected: // es macht einen Unterschied, ob man bei eingestellter Textformatierung beim LostFocus den aktuellen String durch // den Formatter jagt und das Ergebnis anzeigt oder erst aus dem String ein double macht, das formatiert und dann // ausgibt - BOOL m_bTreatAsNumber; + sal_Bool m_bTreatAsNumber; // und mit den folgenden Members koennen wir das Ganze hier auch zur formatierten Text-Ausgabe benutzen ... String m_sCurrentTextValue; String m_sDefaultText; @@ -112,18 +112,18 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, INT32 nFormatKey = 0); - FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter = NULL, INT32 nFormatKey = 0); + FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); + FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); virtual ~FormattedField(); // Min-/Max-Verwaltung - BOOL HasMinValue() const { return m_bHasMin; } - void ClearMinValue() { m_bHasMin = FALSE; } + sal_Bool HasMinValue() const { return m_bHasMin; } + void ClearMinValue() { m_bHasMin = sal_False; } void SetMinValue(double dMin); double GetMinValue() const { return m_dMinValue; } - BOOL HasMaxValue() const { return m_bHasMax; } - void ClearMaxValue() { m_bHasMax = FALSE; } + sal_Bool HasMaxValue() const { return m_bHasMax; } + void ClearMaxValue() { m_bHasMax = sal_False; } void SetMaxValue(double dMax); double GetMaxValue() const { return m_dMaxValue; } @@ -137,30 +137,30 @@ public: void SetTextValue(const XubString& rText); // der String wird in ein double umgewandelt (durch den Formatter) und anschliessen in SetValue gesteckt - BOOL IsEmptyFieldEnabled() const { return m_bEnableEmptyField; } - void EnableEmptyField(BOOL bEnable); + sal_Bool IsEmptyFieldEnabled() const { return m_bEnableEmptyField; } + void EnableEmptyField(sal_Bool bEnable); // wenn nicht enabled, wird beim Verlassen des Feldes der Text auf den letzten gueltigen zurueckgesetzt - void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = TRUE; } + void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = sal_True; } // wenn der aktuelle String ungueltig ist, liefert GetValue() diesen Default-Wert double GetDefaultValue() const { return m_dDefaultValue; } // Einstellungen fuer das Format - ULONG GetFormatKey() const { return m_nFormatKey; } - void SetFormatKey(ULONG nFormatKey); + sal_uIntPtr GetFormatKey() const { return m_nFormatKey; } + void SetFormatKey(sal_uIntPtr nFormatKey); SvNumberFormatter* GetFormatter() const { return m_pFormatter; } - void SetFormatter(SvNumberFormatter* pFormatter, BOOL bResetFormat = TRUE); - // wenn bResetFormat FALSE ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht + void SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat = sal_True); + // wenn bResetFormat sal_False ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht // um eines der Standard-Formate handelt, die in allen Formattern gleich sind) - // wenn TRUE, wird als neuer FormatKey 0 gesetzt + // wenn sal_True, wird als neuer FormatKey 0 gesetzt - BOOL GetThousandsSep() const; - void SetThousandsSep(BOOL _bUseSeparator); + sal_Bool GetThousandsSep() const; + void SetThousandsSep(sal_Bool _bUseSeparator); // the is no check if the current format is numeric, so be cautious when calling these functions - USHORT GetDecimalDigits() const; - void SetDecimalDigits(USHORT _nPrecision); + sal_uInt16 GetDecimalDigits() const; + void SetDecimalDigits(sal_uInt16 _nPrecision); // the is no check if the current format is numeric, so be cautious when calling these functions SvNumberFormatter* StandardFormatter() { return m_aStaticFormatter; } @@ -169,11 +169,11 @@ public: // also ist etwas Vorsicht angebracht ... void GetFormat(XubString& rFormatString, LanguageType& eLang) const; - BOOL SetFormat(const XubString& rFormatString, LanguageType eLang); - // FALSE, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist) + sal_Bool SetFormat(const XubString& rFormatString, LanguageType eLang); + // sal_False, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist) - BOOL IsStrictFormat() const { return m_bStrictFormat; } - void SetStrictFormat(BOOL bEnable) { m_bStrictFormat = bEnable; } + sal_Bool IsStrictFormat() const { return m_bStrictFormat; } + void SetStrictFormat(sal_Bool bEnable) { m_bStrictFormat = bEnable; } // Formatueberpruefung waehrend der Eingabe ? // Spin-Handling @@ -193,15 +193,15 @@ public: void SetSpinLast(double dLast) { m_dSpinLast = dLast; } double GetSpinLast() const { return m_dSpinLast; } - BOOL TreatingAsNumber() const { return m_bTreatAsNumber; } - void TreatAsNumber(BOOL bDoSo) { m_bTreatAsNumber = bDoSo; } + sal_Bool TreatingAsNumber() const { return m_bTreatAsNumber; } + void TreatAsNumber(sal_Bool bDoSo) { m_bTreatAsNumber = bDoSo; } public: virtual void SetText( const XubString& rStr ); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); void SetValidateText(const XubString& rText, const String* pErrorText = NULL); - // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf FALSE sitzt + // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern einfach den Text formatiert ausgeben ... (der Text wird einfach nur durch den Formatter gejagt und dann gesetzt) @@ -222,29 +222,29 @@ public: */ void Commit(); - // enable automatic coloring. if set to TRUE, and the format the field is working with for any current value + // enable automatic coloring. if set to sal_True, and the format the field is working with for any current value // says that it has to be painted in a special color (e.g. a format where negative numbers should be printed // red), the text is painted with that color automatically. // The color used is the same as returned by GetLastOutputColor() - void SetAutoColor(BOOL _bAutomatic); - BOOL GetAutoColor() const { return m_bAutoColor; } + void SetAutoColor(sal_Bool _bAutomatic); + sal_Bool GetAutoColor() const { return m_bAutoColor; } /** enables handling of not-a-number value. - When this is set to (the default), then invalid inputs (i.e. text which cannot be + When this is set to (the default), then invalid inputs (i.e. text which cannot be intepreted, according to the current formatting) will be handled as if the default value has been entered. GetValue the will return this default value. - When set to , then GetValue will return NaN (not a number, see isNan) + When set to , then GetValue will return NaN (not a number, see isNan) when the current input is invalid. - Note that setting this to implies that upon leaving the control, the input + Note that setting this to implies that upon leaving the control, the input will *not* be corrected to a valid value. For example, if the user enters "foo" in the control, and then tabs out of it, the text "foo" will persist, and GetValue will return NaN in subsequent calls. */ - void EnableNotANumber( BOOL _bEnable ); - BOOL IsNotANumberEnabled( ) const { return m_bEnableNaN; } + void EnableNotANumber( sal_Bool _bEnable ); + sal_Bool IsNotANumberEnabled( ) const { return m_bEnableNaN; } /** When being set to true, the strings in the field are formatted using the InputLine format. That's also what you get in Calc when you edit a cell @@ -258,16 +258,16 @@ protected: virtual void Modify(); // CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit - virtual BOOL CheckText(const XubString&) const { return TRUE; } + virtual sal_Bool CheckText(const XubString&) const { return sal_True; } // any aspect of the current format has changed virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); void ImplSetTextImpl(const XubString& rNew, Selection* pNewSel); - void ImplSetValue(double dValue, BOOL bForce); - BOOL ImplGetValue(double& dNewVal); + void ImplSetValue(double dValue, sal_Bool bForce); + sal_Bool ImplGetValue(double& dNewVal); - void ImplSetFormatKey(ULONG nFormatKey); + void ImplSetFormatKey(sal_uIntPtr nFormatKey); // SetFormatKey without FormatChanged notification virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } @@ -313,7 +313,7 @@ public: virtual ~DoubleNumericField(); protected: - virtual BOOL CheckText(const XubString& sText) const; + virtual sal_Bool CheckText(const XubString& sText) const; virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); void ResetConformanceTester(); @@ -327,8 +327,8 @@ protected: class DoubleCurrencyField : public FormattedField { XubString m_sCurrencySymbol; - BOOL m_bPrependCurrSym; - BOOL m_bChangingFormat; + sal_Bool m_bPrependCurrSym; + sal_Bool m_bChangingFormat; public: DoubleCurrencyField(Window* pParent, WinBits nStyle = 0); @@ -337,8 +337,8 @@ public: XubString getCurrencySymbol() const { return m_sCurrencySymbol; } void setCurrencySymbol(const XubString& _sSymbol); - BOOL getPrependCurrSym() const { return m_bPrependCurrSym; } - void setPrependCurrSym(BOOL _bPrepend); + sal_Bool getPrependCurrSym() const { return m_bPrependCurrSym; } + void setPrependCurrSym(sal_Bool _bPrepend); protected: virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx index 0e9dc73a6882..674429bf2e4d 100644 --- a/svtools/inc/svtools/generictoolboxcontroller.hxx +++ b/svtools/inc/svtools/generictoolboxcontroller.hxx @@ -46,7 +46,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBox, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand ); virtual ~GenericToolboxController(); diff --git a/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx index c5fbe5b840e4..9bc02defda44 100644 --- a/svtools/inc/svtools/genericunodialog.hxx +++ b/svtools/inc/svtools/genericunodialog.hxx @@ -164,7 +164,7 @@ namespace svt m_aMutex is locked @return - if and only if m_pDialog is non- upon returning from the method. Note that the only + if and only if m_pDialog is non- upon returning from the method. Note that the only case where m_pDialog is is when createDialog returned , which is will fire an assertion in non-product builds. */ diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index 3ed608c1525d..e0f2edbe5994 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -104,14 +104,14 @@ private: long mnTopCrop; long mnRightCrop; long mnBottomCrop; - USHORT mnRotate10; + sal_uInt16 mnRotate10; short mnContPercent; short mnLumPercent; short mnRPercent; short mnGPercent; short mnBPercent; - BOOL mbInvert; - BYTE mcTransparency; + sal_Bool mbInvert; + sal_uInt8 mcTransparency; GraphicDrawMode meDrawMode; void* mpDummy; @@ -121,14 +121,14 @@ public: GraphicAttr(); ~GraphicAttr(); - BOOL operator==( const GraphicAttr& rAttr ) const; - BOOL operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } + sal_Bool operator==( const GraphicAttr& rAttr ) const; + sal_Bool operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } void SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; } GraphicDrawMode GetDrawMode() const { return meDrawMode; } - void SetMirrorFlags( ULONG nMirrFlags ) { mnMirrFlags = nMirrFlags; } - ULONG GetMirrorFlags() const { return mnMirrFlags; } + void SetMirrorFlags( sal_uIntPtr nMirrFlags ) { mnMirrFlags = nMirrFlags; } + sal_uIntPtr GetMirrorFlags() const { return mnMirrFlags; } void SetCrop( long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, long nBottom_100TH_MM ) { @@ -140,8 +140,8 @@ public: long GetRightCrop() const { return mnRightCrop; } long GetBottomCrop() const { return mnBottomCrop; } - void SetRotation( USHORT nRotate10 ) { mnRotate10 = nRotate10; } - USHORT GetRotation() const { return mnRotate10; } + void SetRotation( sal_uInt16 nRotate10 ) { mnRotate10 = nRotate10; } + sal_uInt16 GetRotation() const { return mnRotate10; } void SetLuminance( short nLuminancePercent ) { mnLumPercent = nLuminancePercent; } short GetLuminance() const { return mnLumPercent; } @@ -161,22 +161,22 @@ public: void SetGamma( double fGamma ) { mfGamma = fGamma; } double GetGamma() const { return mfGamma; } - void SetInvert( BOOL bInvert ) { mbInvert = bInvert; } - BOOL IsInvert() const { return mbInvert; } + void SetInvert( sal_Bool bInvert ) { mbInvert = bInvert; } + sal_Bool IsInvert() const { return mbInvert; } - void SetTransparency( BYTE cTransparency ) { mcTransparency = cTransparency; } - BYTE GetTransparency() const { return mcTransparency; } + void SetTransparency( sal_uInt8 cTransparency ) { mcTransparency = cTransparency; } + sal_uInt8 GetTransparency() const { return mcTransparency; } - BOOL IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } - BOOL IsMirrored() const { return( mnMirrFlags != 0UL ); } - BOOL IsCropped() const + sal_Bool IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } + sal_Bool IsMirrored() const { return( mnMirrFlags != 0UL ); } + sal_Bool IsCropped() const { return( mnLeftCrop != 0 || mnTopCrop != 0 || mnRightCrop != 0 || mnBottomCrop != 0 ); } - BOOL IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } - BOOL IsTransparent() const { return( mcTransparency > 0 ); } - BOOL IsAdjusted() const + sal_Bool IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } + sal_Bool IsTransparent() const { return( mcTransparency > 0 ); } + sal_Bool IsAdjusted() const { return( mnLumPercent != 0 || mnContPercent != 0 || mnRPercent != 0 || mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert ); @@ -202,7 +202,7 @@ private: GraphicAttr maAttr; Size maPrefSize; MapMode maPrefMapMode; - ULONG mnSizeBytes; + sal_uIntPtr mnSizeBytes; GraphicType meType; GraphicManager* mpMgr; String* mpLink; @@ -210,17 +210,17 @@ private: String* mpUserData; Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; - ULONG mnAnimationLoopCount; + sal_uIntPtr mnAnimationLoopCount; void* mpDummy1; void* mpDummy2; - BOOL mbAutoSwapped : 1; - BOOL mbTransparent : 1; - BOOL mbAnimated : 1; - BOOL mbEPS : 1; - BOOL mbIsInSwapIn : 1; - BOOL mbIsInSwapOut : 1; - BOOL mbAlpha : 1; - BOOL mbDummyFlag8 : 1; + sal_Bool mbAutoSwapped : 1; + sal_Bool mbTransparent : 1; + sal_Bool mbAnimated : 1; + sal_Bool mbEPS : 1; + sal_Bool mbIsInSwapIn : 1; + sal_Bool mbIsInSwapOut : 1; + sal_Bool mbAlpha : 1; + sal_Bool mbDummyFlag8 : 1; void SVT_DLLPRIVATE ImplConstruct(); void SVT_DLLPRIVATE ImplAssignGraphicData(); @@ -228,9 +228,9 @@ private: const ByteString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplAutoSwapIn(); - BOOL SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } - BOOL SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, - PolyPolygon& rClipPolyPoly, BOOL& bRectClipRegion ) const; + sal_Bool SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } + sal_Bool SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, + PolyPolygon& rClipPolyPoly, sal_Bool& bRectClipRegion ) const; /** Render a given number of tiles in an optimized way @@ -276,22 +276,22 @@ private: bool SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, - const GraphicAttr* pAttr, ULONG nFlags ); + const GraphicAttr* pAttr, sal_uIntPtr nFlags ); /// internally called by ImplRenderTempTile() bool SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor, int nNumOrigTilesX, int nNumOrigTilesY, int nRemainderTilesX, int nRemainderTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, - ULONG nFlags, ImplTileInfo& rTileInfo ); + sal_uIntPtr nFlags, ImplTileInfo& rTileInfo ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, - const Size& rOffset, const GraphicAttr* pAttr, ULONG nFlags, int nTileCacheSize1D ); + const Size& rOffset, const GraphicAttr* pAttr, sal_uIntPtr nFlags, int nTileCacheSize1D ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos, int nNumTilesX, int nNumTilesY, const Size& rTileSize, - const GraphicAttr* pAttr, ULONG nFlags ); + const GraphicAttr* pAttr, sal_uIntPtr nFlags ); void SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx& rBmpEx, const GraphicAttr& rAttr, @@ -299,7 +299,7 @@ private: const Size& rCropRightBottom, const Rectangle& rCropRect, const Size& rDstSize, - BOOL bEnlarge ) const; + sal_Bool bEnlarge ) const; DECL_LINK( ImplAutoSwapOutHdl, void* ); @@ -309,7 +309,7 @@ protected: virtual SvStream* GetSwapStream() const; // !!! to be removed - virtual ULONG GetReleaseFromCache() const; + virtual sal_uIntPtr GetReleaseFromCache() const; virtual void Load( SvStream& ); virtual void Save( SvStream& ); @@ -327,14 +327,14 @@ public: ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); - BOOL operator==( const GraphicObject& rCacheObj ) const; - BOOL operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } + sal_Bool operator==( const GraphicObject& rCacheObj ) const; + sal_Bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } - BOOL HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } + sal_Bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); - void SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout = 0UL ); + void SetSwapStreamHdl( const Link& rHdl, const sal_uIntPtr nSwapOutTimeout = 0UL ); Link GetSwapStreamHdl() const; - ULONG GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } + sal_uIntPtr GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } void FireSwapInRequest(); void FireSwapOutRequest(); @@ -342,8 +342,8 @@ public: void SetGraphicManager( const GraphicManager& rMgr ); GraphicManager& GetGraphicManager() const { return *mpMgr; } - BOOL IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD) const; + sal_Bool IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, + const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD) const; void ReleaseFromCache(); const Graphic& GetGraphic() const; @@ -381,12 +381,12 @@ public: void SetAttr( const GraphicAttr& rAttr ); const GraphicAttr& GetAttr() const { return maAttr; } - BOOL HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); } + sal_Bool HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); } void SetLink(); void SetLink( const String& rLink ); String GetLink() const; - BOOL HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); } + sal_Bool HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); } void SetUserData(); void SetUserData( const String& rUserData ); String GetUserData() const; @@ -396,36 +396,36 @@ public: GraphicType GetType() const { return meType; } const Size& GetPrefSize() const { return maPrefSize; } const MapMode& GetPrefMapMode() const { return maPrefMapMode; } - ULONG GetSizeBytes() const { return mnSizeBytes; } - ULONG GetChecksum() const; - BOOL IsTransparent() const { return mbTransparent; } - BOOL IsAlpha() const { return mbAlpha; } - BOOL IsAnimated() const { return mbAnimated; } - BOOL IsEPS() const { return mbEPS; } + sal_uIntPtr GetSizeBytes() const { return mnSizeBytes; } + sal_uIntPtr GetChecksum() const; + sal_Bool IsTransparent() const { return mbTransparent; } + sal_Bool IsAlpha() const { return mbAlpha; } + sal_Bool IsAnimated() const { return mbAnimated; } + sal_Bool IsEPS() const { return mbEPS; } void ResetAnimationLoopCount(); List* GetAnimationInfoList() const; Link GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); } void SetAnimationNotifyHdl( const Link& rLink ); - BOOL SwapOut(); - BOOL SwapOut( SvStream* pOStm ); - BOOL SwapIn(); - BOOL SwapIn( SvStream* pIStm ); + sal_Bool SwapOut(); + sal_Bool SwapOut( SvStream* pOStm ); + sal_Bool SwapIn(); + sal_Bool SwapIn( SvStream* pIStm ); - BOOL IsInSwapIn() const { return mbIsInSwapIn; } - BOOL IsInSwapOut() const { return mbIsInSwapOut; } - BOOL IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } - BOOL IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } + sal_Bool IsInSwapIn() const { return mbIsInSwapIn; } + sal_Bool IsInSwapOut() const { return mbIsInSwapOut; } + sal_Bool IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } + sal_Bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } void SetSwapState(); - BOOL Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD ); + sal_Bool Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, + const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD ); - BOOL DrawWithPDFHandling( OutputDevice& rOutDev, + sal_Bool DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr = NULL, - const ULONG nFlags = GRFMGR_DRAW_STANDARD ); + const sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD ); /** Draw the graphic repeatedly into the given output rectangle @@ -458,14 +458,14 @@ public: is. This is useful if e.g. you want only a few, very large bitmap drawings appear on the outdev. - @return TRUE, if drawing completed successfully + @return sal_True, if drawing completed successfully */ - BOOL DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, + sal_Bool DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, const Size& rOffset, const GraphicAttr* pAttr = NULL, - ULONG nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); + sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); - BOOL StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD, + sal_Bool StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L, + const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL ); void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); @@ -493,33 +493,33 @@ private: GraphicManager( const GraphicManager& ) {} GraphicManager& operator=( const GraphicManager& ) { return *this; } - BOOL SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, + sal_Bool SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const ULONG nFlags, BOOL& rCached ); + const sal_uIntPtr nFlags, sal_Bool& rCached ); - BOOL SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const ULONG nFlags, BitmapEx* pBmpEx = NULL ); - BOOL SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, + const sal_uIntPtr nFlags, BitmapEx* pBmpEx = NULL ); + sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const ULONG nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); + const sal_uIntPtr nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); - BOOL SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx, + sal_Bool SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ); - BOOL SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx, - USHORT nRot10, const Size& rOutSzPix, const Size& rUntSzPix, + sal_Bool SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx, + sal_uInt16 nRot10, const Size& rOutSzPix, const Size& rUntSzPix, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ); - static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr ); @@ -529,42 +529,42 @@ private: const ByteString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); - inline BOOL SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); } + inline sal_Bool SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); } // Only used in swap case by GraphicObject void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ); - BOOL SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); + sal_Bool SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ); ByteString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const; public: - GraphicManager( ULONG nCacheSize = 10000000UL, ULONG nMaxObjCacheSize = 2400000UL ); + GraphicManager( sal_uIntPtr nCacheSize = 10000000UL, sal_uIntPtr nMaxObjCacheSize = 2400000UL ); ~GraphicManager(); - void SetMaxCacheSize( ULONG nNewCacheSize ); - ULONG GetMaxCacheSize() const; + void SetMaxCacheSize( sal_uIntPtr nNewCacheSize ); + sal_uIntPtr GetMaxCacheSize() const; - void SetMaxObjCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE ); - ULONG GetMaxObjCacheSize() const; + void SetMaxObjCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); + sal_uIntPtr GetMaxObjCacheSize() const; - ULONG GetUsedCacheSize() const; - ULONG GetFreeCacheSize() const; + sal_uIntPtr GetUsedCacheSize() const; + sal_uIntPtr GetFreeCacheSize() const; - void SetCacheTimeout( ULONG nTimeoutSeconds ); - ULONG GetCacheTimeout() const; + void SetCacheTimeout( sal_uIntPtr nTimeoutSeconds ); + sal_uIntPtr GetCacheTimeout() const; void ClearCache(); void ReleaseFromCache( const GraphicObject& rObj ); - BOOL IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const; - BOOL DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const ULONG nFlags, BOOL& rCached ); + const sal_uIntPtr nFlags, sal_Bool& rCached ); }; #endif // _GRFMGR_HXX diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index 1ef7687cfb1d..c52d37fb9745 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -105,7 +105,7 @@ StartDrag() Dieser Handler wird gerufen, wenn Draggen gestartet wird, bzw. wenn ein Item angeklickt wurde. In diesem Handler sollte spaetestens mit SetDragSize() die Groesse der Size-Linie gesetzt werden, wenn - IsItemMode() FALSE zurueckliefert. + IsItemMode() sal_False zurueckliefert. Drag() Dieser Handler wird gerufen, wenn gedraggt wird. Wenn mit SetDragSize() keine Groesse gesetzt wird, kann dieser Handler dafuer benutzt werden, um die @@ -116,12 +116,12 @@ Drag() Dieser Handler wird gerufen, wenn gedraggt wird. Wenn EndDrag() Dieser Handler wird gerufen, wenn ein Drag-Vorgang beendet wurde. Wenn im EndDrag-Handler GetCurItemId() 0 zurueckliefert, wurde der Drag-Vorgang abgebrochen. - Wenn dies nicht der Fall ist und IsItemMode() FALSE + Wenn dies nicht der Fall ist und IsItemMode() sal_False zurueckliefert, sollte von dem gedraggten Item die neue Groesse mit GetItemSize() abgefragt werden und entsprechend im dazugehoerigem Control uebernommen - werden. Wenn IsItemMode() TRUE, GetCurItemId() eine Id - und IsItemDrag() TRUE zurueckliefert, wurde dieses + werden. Wenn IsItemMode() sal_True, GetCurItemId() eine Id + und IsItemDrag() sal_True zurueckliefert, wurde dieses Item verschoben. Es sollte dann mit GetItemPos() die neue Position abgefragt werden und auch die Daten im dazugehoerigem Control angepasst werden. Ansonsten @@ -143,12 +143,12 @@ GetItemDragPos() Liefert die Position zurueck, an der ein Item verschoben oder wenn kein ItemDrag aktiv ist. IsItemMode() Mit dieser Methode kann abgefragt werden, ob fuer ein Item oder einen Trenner der Handler gerufen wurde. - TRUE - Handler wurde fuer das Item gerufen - FALSE - Handler wurde fuer den Trenner gerufen + sal_True - Handler wurde fuer das Item gerufen + sal_False - Handler wurde fuer den Trenner gerufen IsItemDrag() Mit dieser Methode kann abgefragt werden, ob ein Item gedragt oder selektiert wurde. - TRUE - Item wird verschoben - FALSE - Item wird selektiert + sal_True - Item wird verschoben + sal_False - Item wird selektiert SetDragSize() Mit dieser Methode wird gesetzt, wir gross der Trennstrich sein soll, der vom Control gemalt wird. Dies sollte so gross sein, wie das angrenzende Fenster @@ -200,7 +200,7 @@ class ImplHeadItemList; // - HeaderBarItemBits - // --------------------- -typedef USHORT HeaderBarItemBits; +typedef sal_uInt16 HeaderBarItemBits; // ---------------------------- // - Bits fuer HeaderBarItems - @@ -227,8 +227,8 @@ typedef USHORT HeaderBarItemBits; // - HeaderBar-Types - // ------------------- -#define HEADERBAR_APPEND ((USHORT)0xFFFF) -#define HEADERBAR_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define HEADERBAR_APPEND ((sal_uInt16)0xFFFF) +#define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define HEADERBAR_FULLSIZE ((long)1000000000) #define HEADERBAR_TEXTOFF 2 @@ -250,14 +250,14 @@ private: long mnStartPos; long mnDragPos; long mnMouseOff; - USHORT mnCurItemId; - USHORT mnItemDragPos; - BOOL mbDragable; - BOOL mbDrag; - BOOL mbItemDrag; - BOOL mbOutDrag; - BOOL mbButtonStyle; - BOOL mbItemMode; + sal_uInt16 mnCurItemId; + sal_uInt16 mnItemDragPos; + sal_Bool mbDragable; + sal_Bool mbDrag; + sal_Bool mbItemDrag; + sal_Bool mbOutDrag; + sal_Bool mbButtonStyle; + sal_Bool mbItemMode; Link maStartDragHdl; Link maDragHdl; Link maEndDragHdl; @@ -272,25 +272,25 @@ private: #ifdef _SV_HEADBAR_CXX using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE long ImplGetItemPos( USHORT nPos ) const; - SVT_DLLPRIVATE Rectangle ImplGetItemRect( USHORT nPos ) const; + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const; + SVT_DLLPRIVATE Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, long& nMouseOff, USHORT& nPos ) const; - SVT_DLLPRIVATE void ImplInvertDrag( USHORT nStartPos, USHORT nEndPos ); + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; + SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); SVT_DLLPRIVATE void ImplDrawItem( OutputDevice* pDev, - USHORT nPos, BOOL bHigh, BOOL bDrag, + sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, const Rectangle& rItemRect, const Rectangle* pRect, - ULONG nFlags ); - SVT_DLLPRIVATE void ImplDrawItem( USHORT nPos, BOOL bHigh = FALSE, - BOOL bDrag = FALSE, + sal_uIntPtr nFlags ); + SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh = sal_False, + sal_Bool bDrag = sal_False, const Rectangle* pRect = NULL ); - SVT_DLLPRIVATE void ImplUpdate( USHORT nPos, - BOOL bEnd = FALSE, BOOL bDirect = FALSE ); - SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, BOOL bCommand ); + SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos, + sal_Bool bEnd = sal_False, sal_Bool bDirect = sal_False ); + SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, sal_Bool bCommand ); SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); - SVT_DLLPRIVATE void ImplEndDrag( BOOL bCancel ); + SVT_DLLPRIVATE void ImplEndDrag( sal_Bool bCancel ); #endif public: @@ -302,7 +302,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); virtual void Resize(); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -316,18 +316,18 @@ public: virtual void Select(); virtual void DoubleClick(); - void InsertItem( USHORT nItemId, const Image& rImage, + void InsertItem( sal_uInt16 nItemId, const Image& rImage, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertItem( USHORT nItemId, const XubString& rText, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertItem( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertItem( USHORT nItemId, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertItem( sal_uInt16 nItemId, const Image& rImage, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void RemoveItem( USHORT nItemId ); - void MoveItem( USHORT nItemId, USHORT nNewPos ); + sal_uInt16 nPos = HEADERBAR_APPEND ); + void RemoveItem( sal_uInt16 nItemId ); + void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ); void Clear(); void SetOffset( long nNewOffset = 0 ); @@ -335,40 +335,40 @@ public: inline void SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; } long GetDragSize() const { return mnDragSize; } - USHORT GetItemCount() const; - USHORT GetItemPos( USHORT nItemId ) const; - USHORT GetItemId( USHORT nPos ) const; - USHORT GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( USHORT nItemId ) const; - USHORT GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + Rectangle GetItemRect( sal_uInt16 nItemId ) const; + sal_uInt16 GetCurItemId() const { return mnCurItemId; } long GetDragPos() const { return mnDragPos; } - USHORT GetItemDragPos() const { return mnItemDragPos; } - BOOL IsItemMode() const { return mbItemMode; } - BOOL IsItemDrag() const { return mbItemDrag; } - - void SetItemSize( USHORT nItemId, long nNewSize ); - long GetItemSize( USHORT nItemId ) const; - void SetItemBits( USHORT nItemId, HeaderBarItemBits nNewBits ); - HeaderBarItemBits GetItemBits( USHORT nItemId ) const; - void SetItemData( USHORT nItemId, void* pNewData ); - void* GetItemData( USHORT nItemId ) const; - - void SetItemImage( USHORT nItemId, const Image& rImage ); - Image GetItemImage( USHORT nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rText ); - XubString GetItemText( USHORT nItemId ) const; - - void SetHelpText( USHORT nItemId, const XubString& rText ); - XubString GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + sal_uInt16 GetItemDragPos() const { return mnItemDragPos; } + sal_Bool IsItemMode() const { return mbItemMode; } + sal_Bool IsItemDrag() const { return mbItemDrag; } + + void SetItemSize( sal_uInt16 nItemId, long nNewSize ); + long GetItemSize( sal_uInt16 nItemId ) const; + void SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits ); + HeaderBarItemBits GetItemBits( sal_uInt16 nItemId ) const; + void SetItemData( sal_uInt16 nItemId, void* pNewData ); + void* GetItemData( sal_uInt16 nItemId ) const; + + void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemImage( sal_uInt16 nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rText ); + XubString GetItemText( sal_uInt16 nItemId ) const; + + void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); + XubString GetHelpText( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, sal_uIntPtr nHelpId ); + sal_uIntPtr GetHelpId( sal_uInt16 nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - inline ULONG GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( sal_uIntPtr nId ) { Window::SetHelpId( nId ); } + inline sal_uIntPtr GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } @@ -383,7 +383,7 @@ public: inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; } inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; } - inline BOOL IsDragable() const { return mbDragable; } + inline sal_Bool IsDragable() const { return mbDragable; } /** Creates and returns the accessible object of the header bar. */ virtual ::com::sun::star::uno::Reference< diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx index c27df0a9a67f..7778ffacfd7b 100644 --- a/svtools/inc/svtools/htmlcfg.hxx +++ b/svtools/inc/svtools/htmlcfg.hxx @@ -64,37 +64,37 @@ public: virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - USHORT GetFontSize(USHORT nPos) const; - void SetFontSize(USHORT nPos, USHORT nSize); + sal_uInt16 GetFontSize(sal_uInt16 nPos) const; + void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); - BOOL IsImportUnknown() const; - void SetImportUnknown(BOOL bSet); + sal_Bool IsImportUnknown() const; + void SetImportUnknown(sal_Bool bSet); - USHORT GetExportMode() const; - void SetExportMode(USHORT nSet); + sal_uInt16 GetExportMode() const; + void SetExportMode(sal_uInt16 nSet); - BOOL IsStarBasic() const; - void SetStarBasic(BOOL bSet); + sal_Bool IsStarBasic() const; + void SetStarBasic(sal_Bool bSet); - BOOL IsStarBasicWarning() const; - void SetStarBasicWarning(BOOL bSet); + sal_Bool IsStarBasicWarning() const; + void SetStarBasicWarning(sal_Bool bSet); - BOOL IsSaveGraphicsLocal() const; - void SetSaveGraphicsLocal(BOOL bSet); + sal_Bool IsSaveGraphicsLocal() const; + void SetSaveGraphicsLocal(sal_Bool bSet); - BOOL IsPrintLayoutExtension() const; - void SetPrintLayoutExtension(BOOL bSet); + sal_Bool IsPrintLayoutExtension() const; + void SetPrintLayoutExtension(sal_Bool bSet); - BOOL IsIgnoreFontFamily() const; - void SetIgnoreFontFamily(BOOL bSet); + sal_Bool IsIgnoreFontFamily() const; + void SetIgnoreFontFamily(sal_Bool bSet); sal_Bool IsDefaultTextEncoding() const; rtl_TextEncoding GetTextEncoding() const; void SetTextEncoding( rtl_TextEncoding ); static SvxHtmlOptions* Get(); - BOOL IsNumbersEnglishUS() const; - void SetNumbersEnglishUS(BOOL bSet); + sal_Bool IsNumbersEnglishUS() const; + void SetNumbersEnglishUS(sal_Bool bSet); void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index 888286b231ee..b7177bfc8fd2 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -45,7 +45,7 @@ struct HTMLOutEvent { const sal_Char *pBasicName; const sal_Char *pJavaName; - USHORT nEvent; + sal_uInt16 nEvent; }; struct SVT_DLLPUBLIC HTMLOutContext @@ -71,7 +71,7 @@ struct HTMLOutFuncs String *pNonConvertableChars = 0); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, - BOOL bOn = TRUE, + sal_Bool bOn = sal_True, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, HTMLOutContext& rContext, @@ -79,13 +79,13 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen, + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uIntPtr nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const String&, const ImageMap&, const String&, const HTMLOutEvent *pEventTable, - BOOL bOutStarBasic, + sal_Bool bOutStarBasic, const sal_Char *pDelim = 0, const sal_Char *pIndentArea = 0, const sal_Char *pIndentMap = 0, @@ -107,18 +107,18 @@ struct HTMLOutFuncs // der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem // nur aus 0 bestehen Eintrag terminiert ist. SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&, - const HTMLOutEvent*, BOOL bOutStarBasic, + const HTMLOutEvent*, sal_Bool bOutStarBasic, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); //
SVT_DLLPUBLIC static ByteString& CreateTableDataOptionsValNum( ByteString& aStrTD, - BOOL bValue, double fVal, ULONG nFormat, + sal_Bool bValue, double fVal, sal_uIntPtr nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static BOOL PrivateURLToInternalImg( String& rURL ); + SVT_DLLPUBLIC static sal_Bool PrivateURLToInternalImg( String& rURL ); }; #endif diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx index 52212e365c87..6e3093cb3b57 100644 --- a/svtools/inc/svtools/imap.hxx +++ b/svtools/inc/svtools/imap.hxx @@ -53,13 +53,13 @@ protected: // Binaer laden/speichern void ImpWriteImageMap( SvStream& rOStm, const String& ) const ; - void ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& ); + void ImpReadImageMap( SvStream& rIStm, sal_uInt16 nCount, const String& ); // Im-/Export void ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const; void ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const; - ULONG ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); - ULONG ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); + sal_uIntPtr ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); + sal_uIntPtr ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); void ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL ); Point ImpReadCERNCoords( const char** ppStr ); @@ -70,7 +70,7 @@ protected: String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ); Point ImpReadNCSACoords( const char** ppStr ); - ULONG ImpDetectFormat( SvStream& rIStm ); + sal_uIntPtr ImpDetectFormat( SvStream& rIStm ); public: @@ -89,8 +89,8 @@ public: ImageMap& operator=( const ImageMap& rImageMap ); // Vergleichsoperator (es wird alles auf Gleichheit geprueft) - BOOL operator==( const ImageMap& rImageMap ); - BOOL operator!=( const ImageMap& rImageMap ); + sal_Bool operator==( const ImageMap& rImageMap ); + sal_Bool operator!=( const ImageMap& rImageMap ); // In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt void InsertIMapObject( const IMapObject& rIMapObject ); @@ -101,7 +101,7 @@ public: IMapObject* GetNextIMapObject() { return (IMapObject*) maList.Next(); } IMapObject* GetLastIMapObject() { return (IMapObject*) maList.Last(); } IMapObject* GetPrevIMapObject() { return (IMapObject*) maList.Prev(); } - IMapObject* GetIMapObject( USHORT nPos ) const { return (IMapObject*) maList.GetObject( nPos ); } + IMapObject* GetIMapObject( sal_uInt16 nPos ) const { return (IMapObject*) maList.GetObject( nPos ); } // Gibt das Objekt zurueck, das zuerst getroffen wurde oder NULL; // Groessen- und Positionsangaben sind in 1/100mm; @@ -112,16 +112,16 @@ public: IMapObject* GetHitIMapObject( const Size& rOriginalSize, const Size& rDisplaySize, const Point& rRelHitPoint, - ULONG nFlags = 0 ); + sal_uIntPtr nFlags = 0 ); // Gibt die Gesamtanzahl der IMap-Objekte zurueck - UINT16 GetIMapObjectCount() const { return (UINT16) maList.Count(); } + sal_uInt16 GetIMapObjectCount() const { return (sal_uInt16) maList.Count(); } // Loescht alle internen Objekte void ClearImageMap(); // liefert die aktuelle Versionsnummer - UINT16 GetVersion() const; + sal_uInt16 GetVersion() const; // liefert / setzt den Namen der ImageMap const String& GetName() const { return aName; } @@ -137,8 +137,8 @@ public: void Write ( SvStream& rOStm, const String& rBaseURL ) const; void Read( SvStream& rIStm, const String& rBaseURL ); - void Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) const; - ULONG Read( SvStream& rIStm, ULONG nFormat, const String& rBaseURL ); + void Write( SvStream& rOStm, sal_uIntPtr nFormat, const String& rBaseURL ) const; + sal_uIntPtr Read( SvStream& rIStm, sal_uIntPtr nFormat, const String& rBaseURL ); }; /****************************************************************************** @@ -152,18 +152,18 @@ public: class IMapCompat { SvStream* pRWStm; - ULONG nCompatPos; - ULONG nTotalSize; - USHORT nStmMode; + sal_uIntPtr nCompatPos; + sal_uIntPtr nTotalSize; + sal_uInt16 nStmMode; IMapCompat() {} IMapCompat( const IMapCompat& ) {} IMapCompat& operator=( const IMapCompat& ) { return *this; } - BOOL operator==( const IMapCompat& ) { return FALSE; } + sal_Bool operator==( const IMapCompat& ) { return sal_False; } public: - IMapCompat( SvStream& rStm, const USHORT nStreamMode ); + IMapCompat( SvStream& rStm, const sal_uInt16 nStreamMode ); ~IMapCompat(); }; diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx index e3ea5349d376..82afdb217490 100644 --- a/svtools/inc/svtools/imapcirc.hxx +++ b/svtools/inc/svtools/imapcirc.hxx @@ -42,9 +42,9 @@ class Fraction; class SVT_DLLPUBLIC IMapCircleObject : public IMapObject { Point aCenter; - ULONG nRadius; + sal_uIntPtr nRadius; - void ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPixel ); + void ImpConstruct( const Point& rCenter, sal_uIntPtr nRad, sal_Bool bPixel ); protected: @@ -55,21 +55,21 @@ protected: public: IMapCircleObject() {}; - IMapCircleObject( const Point& rCenter, ULONG nRad, + IMapCircleObject( const Point& rCenter, sal_uIntPtr nRad, const String& rURL, const String& rAltText, const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapCircleObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Point GetCenter( BOOL bPixelCoords = TRUE ) const; - ULONG GetRadius( BOOL bPixelCoords = TRUE ) const; + Point GetCenter( sal_Bool bPixelCoords = sal_True ) const; + sal_uIntPtr GetRadius( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Kreis-Objektes in 1/100mm virtual Rectangle GetBoundRect() const; @@ -77,7 +77,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapCircleObject& rEqObj ); + sal_Bool IsEqual( const IMapCircleObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index c557727124cc..42e6b1740b70 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -36,13 +36,13 @@ class Point; class Rectangle; class SvStream; -#define IMAP_OBJ_NONE ((UINT16)0x0000) -#define IMAP_OBJ_RECTANGLE ((UINT16)0x0001) -#define IMAP_OBJ_CIRCLE ((UINT16)0x0002) -#define IMAP_OBJ_POLYGON ((UINT16)0x0003) -#define IMAP_OBJ_VERSION ((UINT16)0x0005) +#define IMAP_OBJ_NONE ((sal_uInt16)0x0000) +#define IMAP_OBJ_RECTANGLE ((sal_uInt16)0x0001) +#define IMAP_OBJ_CIRCLE ((sal_uInt16)0x0002) +#define IMAP_OBJ_POLYGON ((sal_uInt16)0x0003) +#define IMAP_OBJ_VERSION ((sal_uInt16)0x0005) -#define IMAGE_MAP_VERSION ((UINT16)0x0001) +#define IMAGE_MAP_VERSION ((sal_uInt16)0x0001) #define IMAPMAGIC "SDIMAP" @@ -73,11 +73,11 @@ class SVT_DLLPUBLIC IMapObject String aTarget; String aName; SvxMacroTableDtor aEventList; - BOOL bActive; + sal_Bool bActive; protected: - UINT16 nReadVersion; + sal_uInt16 nReadVersion; // Binaer-Im-/Export virtual void WriteIMapObject( SvStream& rOStm ) const = 0; @@ -99,12 +99,12 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive ); + sal_Bool bActive ); virtual ~IMapObject() {}; - virtual UINT16 GetVersion() const; - virtual UINT16 GetType() const = 0; - virtual BOOL IsHit( const Point& rPoint ) const = 0; + virtual sal_uInt16 GetVersion() const; + virtual sal_uInt16 GetType() const = 0; + virtual sal_Bool IsHit( const Point& rPoint ) const = 0; void Write ( SvStream& rOStm, const String& rBaseURL ) const; void Read( SvStream& rIStm, const String& rBaseURL ); @@ -126,33 +126,33 @@ public: const String& GetName() const { return aName; } void SetName( const String& rName ) { aName = rName; } - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bSetActive = TRUE ) { bActive = bSetActive; } + sal_Bool IsActive() const { return bActive; } + void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; } static Point GetPixelPoint( const Point& rLogPoint ); static Point GetLogPoint( const Point& rPixelPoint ); - BOOL IsEqual( const IMapObject& rEqObj ); + sal_Bool IsEqual( const IMapObject& rEqObj ); // IMap-Events inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } - inline const SvxMacro& GetEvent( USHORT nEvent ) const; - inline BOOL HasEvent( USHORT nEvent ) const; - void SetEvent( USHORT nEvent, const SvxMacro& ); - inline BOOL DelEvent( USHORT nEvent ); + inline const SvxMacro& GetEvent( sal_uInt16 nEvent ) const; + inline sal_Bool HasEvent( sal_uInt16 nEvent ) const; + void SetEvent( sal_uInt16 nEvent, const SvxMacro& ); + inline sal_Bool DelEvent( sal_uInt16 nEvent ); }; -inline BOOL IMapObject::HasEvent( USHORT nEvent ) const +inline sal_Bool IMapObject::HasEvent( sal_uInt16 nEvent ) const { return aEventList.IsKeyValid( nEvent ); } -inline const SvxMacro& IMapObject::GetEvent( USHORT nEvent ) const +inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const { return *(aEventList.Get( nEvent )); } -inline BOOL IMapObject::DelEvent( USHORT nEvent ) +inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent ) { SvxMacro *pMacro = aEventList.Remove( nEvent ); delete pMacro; diff --git a/svtools/inc/svtools/imappoly.hxx b/svtools/inc/svtools/imappoly.hxx index 00d22cbe2de0..e6d31f78597a 100644 --- a/svtools/inc/svtools/imappoly.hxx +++ b/svtools/inc/svtools/imappoly.hxx @@ -44,9 +44,9 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject { Polygon aPoly; Rectangle aEllipse; - BOOL bEllipse; + sal_Bool bEllipse; - SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, BOOL bPixel ); + SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, sal_Bool bPixel ); protected: @@ -54,7 +54,7 @@ protected: virtual void WriteIMapObject( SvStream& rOStm ) const; virtual void ReadIMapObject( SvStream& rIStm ); - BOOL ReadPreProLine( SvStream& rIStm, String& rStr ); + sal_Bool ReadPreProLine( SvStream& rIStm, String& rStr ); public: IMapPolygonObject() {}; @@ -64,26 +64,26 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapPolygonObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Polygon GetPolygon( BOOL bPixelCoords = TRUE ) const; + Polygon GetPolygon( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Polygon-Objektes in 1/100mm virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); } - BOOL HasExtraEllipse() const { return bEllipse; } + sal_Bool HasExtraEllipse() const { return bEllipse; } const Rectangle& GetExtraEllipse() const { return aEllipse; } void SetExtraEllipse( const Rectangle& rEllipse ); void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapPolygonObject& rEqObj ); + sal_Bool IsEqual( const IMapPolygonObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/svtools/imaprect.hxx b/svtools/inc/svtools/imaprect.hxx index 8eacaaaf3531..3e6d80f52bef 100644 --- a/svtools/inc/svtools/imaprect.hxx +++ b/svtools/inc/svtools/imaprect.hxx @@ -43,7 +43,7 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject { Rectangle aRect; - SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, BOOL bPixel ); + SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, sal_Bool bPixel ); protected: @@ -60,14 +60,14 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapRectangleObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Rectangle GetRectangle( BOOL bPixelCoords = TRUE ) const; + Rectangle GetRectangle( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Rechteck-Objektes in 1/100mm virtual Rectangle GetBoundRect() const { return aRect; } @@ -75,7 +75,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapRectangleObject& rEqObj ); + sal_Bool IsEqual( const IMapRectangleObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx index 9394f1ba5ccd..b65e8b0edea7 100644 --- a/svtools/inc/svtools/inettbc.hxx +++ b/svtools/inc/svtools/inettbc.hxx @@ -51,17 +51,17 @@ friend class SvtURLBox_Impl; SvtMatchContext_Impl* pCtx; SvtURLBox_Impl* pImp; INetProtocol eSmartProtocol; - BOOL bAutoCompleteMode : 1; - BOOL bOnlyDirectories : 1; - BOOL bModified : 1; - BOOL bTryAutoComplete : 1; - BOOL bCtrlClick : 1; - BOOL bHistoryDisabled : 1; - BOOL bNoSelection : 1; - BOOL bIsAutoCompleteEnabled : 1; + sal_Bool bAutoCompleteMode : 1; + sal_Bool bOnlyDirectories : 1; + sal_Bool bModified : 1; + sal_Bool bTryAutoComplete : 1; + sal_Bool bCtrlClick : 1; + sal_Bool bHistoryDisabled : 1; + sal_Bool bNoSelection : 1; + sal_Bool bIsAutoCompleteEnabled : 1; - SVT_DLLPRIVATE BOOL ProcessKey( const KeyCode& rCode ); - SVT_DLLPRIVATE void TryAutoComplete( BOOL bForce ); + SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode& rCode ); + SVT_DLLPRIVATE void TryAutoComplete( sal_Bool bForce ); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* ); using Window::ImplInit; @@ -83,11 +83,11 @@ public: const String& GetBaseURL() const { return aBaseURL; } void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; } const Link& GetOpenHdl() const { return aOpenHdl; } - void SetOnlyDirectories( BOOL bDir = TRUE ); - void SetNoURLSelection( BOOL bSet = TRUE ); + void SetOnlyDirectories( sal_Bool bDir = sal_True ); + void SetNoURLSelection( sal_Bool bSet = sal_True ); INetProtocol GetSmartProtocol() const { return eSmartProtocol; } void SetSmartProtocol( INetProtocol eProt ); - BOOL IsCtrlOpen() + sal_Bool IsCtrlOpen() { return bCtrlClick; } String GetURL(); void DisableHistory(); @@ -100,7 +100,7 @@ public: void SetUrlFilter( const IUrlFilter* _pFilter ); const IUrlFilter* GetUrlFilter( ) const; - inline void EnableAutocompletion( BOOL _bEnable = TRUE ) + inline void EnableAutocompletion( sal_Bool _bEnable = sal_True ) { bIsAutoCompleteEnabled = _bEnable; } void SetPlaceHolder( const String& sPlaceHolder ) { aPlaceHolder = sPlaceHolder; } String GetPlaceHolder() { return aPlaceHolder; } diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx index 87ed9da0fc3d..56dbe0e03423 100644 --- a/svtools/inc/svtools/javainteractionhandler.hxx +++ b/svtools/inc/svtools/javainteractionhandler.hxx @@ -75,7 +75,7 @@ private: bool m_bJavaNotFound_Handled; bool m_bVMCreationFailure_Handled; bool m_bRestartRequired_Handled; - USHORT m_nResult_JavaDisabled; + sal_uInt16 m_nResult_JavaDisabled; }; } diff --git a/svtools/inc/svtools/logindlg.hxx b/svtools/inc/svtools/logindlg.hxx index 9cf12dd70610..d53253cc6e1d 100644 --- a/svtools/inc/svtools/logindlg.hxx +++ b/svtools/inc/svtools/logindlg.hxx @@ -75,13 +75,13 @@ class SVT_DLLPUBLIC LoginDialog : public ModalDialog CancelButton aCancelBtn; HelpButton aHelpBtn; - SVT_DLLPRIVATE void HideControls_Impl( USHORT nFlags ); + SVT_DLLPRIVATE void HideControls_Impl( sal_uInt16 nFlags ); DECL_DLLPRIVATE_LINK( OKHdl_Impl, OKButton * ); DECL_DLLPRIVATE_LINK( PathHdl_Impl, PushButton * ); public: - LoginDialog( Window* pParent, USHORT nFlags, + LoginDialog( Window* pParent, sal_uInt16 nFlags, const String& rServer, const String* pRealm = NULL ); String GetPath() const { return aPathED.GetText(); } @@ -96,9 +96,9 @@ public: String GetAccount() const { return aAccountED.GetText(); } void SetAccount( const String& rNew ) { aAccountED.SetText( rNew ); } - BOOL IsSavePassword() const + sal_Bool IsSavePassword() const { return aSavePasswdBtn.IsChecked(); } - void SetSavePassword( BOOL bSave ) + void SetSavePassword( sal_Bool bSave ) { aSavePasswdBtn.Check( bSave ); } void SetSavePasswordText( const String& rTxt ) { aSavePasswdBtn.SetText( rTxt ); } diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index a302b40d9d4b..626c56b9c516 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -120,7 +120,7 @@ public: // ... als Enum pOptEnums ist ein HTMLOptionEnum-Array sal_uInt16 GetEnum( const HTMLOptionEnum *pOptEnums, sal_uInt16 nDflt=0 ) const; - BOOL GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const; + sal_Bool GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const; // ... und als ein par spezielle Enums HTMLInputType GetInputType() const; // @@ -134,20 +134,20 @@ SV_DECL_PTRARR(HTMLOptions,HTMLOptionPtr,16,16) class SVT_DLLPUBLIC HTMLParser : public SvParser { - BOOL bNewDoc : 1; // neues Doc lesen ? - BOOL bIsInHeader : 1; // scanne Header-Bereich - BOOL bIsInBody : 1; // scanne Body-Bereich - BOOL bReadListing : 1; // Lese Listings - BOOL bReadXMP : 1; // Lese XMP - BOOL bReadPRE : 1; // Lese preformatted Text - BOOL bReadTextArea : 1; // Lese TEXTAREA - BOOL bReadScript : 1; // Lesen von oder gefunden - - BOOL bPre_IgnoreNewPara : 1; // Flags fuers lesen von PRE-Absaetzen - BOOL bReadNextChar : 1; // TRUE: NextChar nochmals lesen (JavaScript!) - BOOL bReadComment : 1; // TRUE: NextChar nochmals lesen (JavaScript!) + sal_Bool bNewDoc : 1; // neues Doc lesen ? + sal_Bool bIsInHeader : 1; // scanne Header-Bereich + sal_Bool bIsInBody : 1; // scanne Body-Bereich + sal_Bool bReadListing : 1; // Lese Listings + sal_Bool bReadXMP : 1; // Lese XMP + sal_Bool bReadPRE : 1; // Lese preformatted Text + sal_Bool bReadTextArea : 1; // Lese TEXTAREA + sal_Bool bReadScript : 1; // Lesen von oder gefunden + + sal_Bool bPre_IgnoreNewPara : 1; // Flags fuers lesen von PRE-Absaetzen + sal_Bool bReadNextChar : 1; // sal_True: NextChar nochmals lesen (JavaScript!) + sal_Bool bReadComment : 1; // sal_True: NextChar nochmals lesen (JavaScript!) sal_uInt32 nPre_LinePos; // Pos in der Line im PRE-Tag @@ -166,43 +166,43 @@ protected: virtual ~HTMLParser(); - void FinishHeader( BOOL bBody ) { bIsInHeader = FALSE; bIsInBody = bBody; } + void FinishHeader( sal_Bool bBody ) { bIsInHeader = sal_False; bIsInBody = bBody; } public: - HTMLParser( SvStream& rIn, int bReadNewDoc = TRUE ); + HTMLParser( SvStream& rIn, int bReadNewDoc = sal_True ); virtual SvParserState CallParser(); // Aufruf des Parsers - BOOL IsNewDoc() const { return bNewDoc; } - BOOL IsInHeader() const { return bIsInHeader; } - BOOL IsInBody() const { return bIsInBody; } - BOOL IsValidSyntax() const { return TRUE; } - BOOL IsReadListing() const { return bReadListing; } - BOOL IsReadXMP() const { return bReadXMP; } - BOOL IsReadPRE() const { return bReadPRE; } - BOOL IsReadScript() const { return bReadScript; } - BOOL IsReadStyle() const { return bReadStyle; } + sal_Bool IsNewDoc() const { return bNewDoc; } + sal_Bool IsInHeader() const { return bIsInHeader; } + sal_Bool IsInBody() const { return bIsInBody; } + sal_Bool IsValidSyntax() const { return sal_True; } + sal_Bool IsReadListing() const { return bReadListing; } + sal_Bool IsReadXMP() const { return bReadXMP; } + sal_Bool IsReadPRE() const { return bReadPRE; } + sal_Bool IsReadScript() const { return bReadScript; } + sal_Bool IsReadStyle() const { return bReadStyle; } - void SetReadNextChar() { bReadNextChar = TRUE; } + void SetReadNextChar() { bReadNextChar = sal_True; } // PRE-/LISTING oder XMP-Modus starten/beenden oder Tags entsprechend // filtern - inline void StartPRE( BOOL bRestart=FALSE ); - void FinishPRE() { bReadPRE = FALSE; } + inline void StartPRE( sal_Bool bRestart=sal_False ); + void FinishPRE() { bReadPRE = sal_False; } int FilterPRE( int nToken ); - inline void StartListing( BOOL bRestart=FALSE ); - void FinishListing() { bReadListing = FALSE; } + inline void StartListing( sal_Bool bRestart=sal_False ); + void FinishListing() { bReadListing = sal_False; } int FilterListing( int nToken ); - inline void StartXMP( BOOL bRestart=FALSE ); - void FinishXMP() { bReadXMP = FALSE; } + inline void StartXMP( sal_Bool bRestart=sal_False ); + void FinishXMP() { bReadXMP = sal_False; } int FilterXMP( int nToken ); - void FinishTextArea() { bReadTextArea = FALSE; } + void FinishTextArea() { bReadTextArea = sal_False; } // PRE-/LSITING- und XMP-Modus beenden - void FinishPREListingXMP() { bReadPRE = bReadListing = bReadXMP = FALSE; } + void FinishPREListingXMP() { bReadPRE = bReadListing = bReadXMP = sal_False; } // Das aktuelle Token dem aktuellen Modus (PRE, XMP, ...) entsprechend // Filtern und die Flags setzen. Wird von Continue aufgerufen, bevor @@ -212,7 +212,7 @@ public: // Scannen eines Scripts beenden (sollte nur unmittelbar nach dem // Lesen eines