diff options
116 files changed, 802 insertions, 396 deletions
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 88eac0b88a..22c5075484 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -205,7 +205,11 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand ) } } else + { + const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 ); + fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() ); return FALSE; + } } return TRUE; } diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx index c0c523c7ab..c0c523c7ab 100644 --- a/sfx2/inc/QuerySaveDocument.hxx +++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx index ab0ef97bfe..ab0ef97bfe 100644 --- a/sfx2/inc/basmgr.hxx +++ b/sfx2/inc/sfx2/basmgr.hxx diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx index 3d938f46df..3d938f46df 100644 --- a/sfx2/inc/brokenpackageint.hxx +++ b/sfx2/inc/sfx2/brokenpackageint.hxx diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx index 7e6a4fc198..7e6a4fc198 100644 --- a/sfx2/inc/dinfedt.hxx +++ b/sfx2/inc/sfx2/dinfedt.hxx diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index ef45af05e9..ef45af05e9 100644 --- a/sfx2/inc/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 7d70d6042f..7d70d6042f 100644 --- a/sfx2/inc/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index c144b76e45..c144b76e45 100644 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx index 97378338ee..97378338ee 100644 --- a/sfx2/inc/mailmodelapi.hxx +++ b/sfx2/inc/sfx2/mailmodelapi.hxx diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx index 2baafe3176..2baafe3176 100644 --- a/sfx2/inc/mieclip.hxx +++ b/sfx2/inc/sfx2/mieclip.hxx diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx index a5423b8784..a5423b8784 100644 --- a/sfx2/inc/minfitem.hxx +++ b/sfx2/inc/sfx2/minfitem.hxx diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index d3d4ff2eaa..a8db456321 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -31,14 +31,12 @@ #define _SFX_PASSWD_HXX #include "sal/config.h" -#include "sfx2/dllapi.h" - -#ifndef _SV_BUTTON_HXX +#include <sfx2/dllapi.h> #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> +#include <sfx2/app.hxx> // defines --------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 45669204cf..68e5bef3ac 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -359,9 +359,6 @@ #define RID_ITEMLIST_LINGU (RID_OPTIONS_START + 11) #define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) // Member-Ids ------------------------------------------------------------ diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx index b424205633..cc2090dab5 100644 --- a/sfx2/inc/sfxresid.hxx +++ b/sfx2/inc/sfx2/sfxresid.hxx @@ -31,12 +31,10 @@ #define _SFX_SFXRESID_HXX #include <tools/string.hxx> - -#ifndef _RESID_HXX //autogen +#include "sfx2/dllapi.h" #include <tools/resid.hxx> -#endif -class SfxResId: public ResId +class SFX2_DLLPUBLIC SfxResId: public ResId { public: SfxResId( USHORT nId ); diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx index 8c721391d7..8c721391d7 100644 --- a/sfx2/inc/tplpitem.hxx +++ b/sfx2/inc/sfx2/tplpitem.hxx diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index c500f38df1..31dd60e9e9 100644 --- a/sfx2/inc/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -48,22 +48,17 @@ typedef void (*SfxViewInit)(); class SFX2_DLLPUBLIC SfxViewFactory { public: - SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, - USHORT nOrdinal, const ResId& aDescrResId ); + SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ); ~SfxViewFactory(); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); void InitFactory(); - - String GetDescription() const - { return String( aDescription ); } USHORT GetOrdinal() const { return nOrd; } private: SfxViewCtor fnCreate; SfxViewInit fnInit; USHORT nOrd; - ResId aDescription; }; #endif diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 696be7b565..4c6269f395 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -135,13 +135,13 @@ public: \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() -#define SFX_IMPL_VIEWFACTORY(Class, rResId) \ +#define SFX_IMPL_VIEWFACTORY(Class) \ SfxViewFactory* Class::pFactory; \ SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ void Class::RegisterFactory( USHORT nPrio ) \ { \ - pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,rResId);\ + pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio);\ InitFactory(); \ } \ void Class::InitFactory() diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index fe71b17157..b36ec3fea0 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -22,20 +22,33 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv -..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi ..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi + +..\inc\sfx2\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx +..\inc\sfx2\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx +..\inc\sfx2\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx +..\inc\sfx2\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx +..\inc\sfx2\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx +..\inc\sfx2\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx +..\inc\sfx2\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx +..\inc\sfx2\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx +..\inc\sfx2\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx +..\inc\sfx2\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx +..\inc\sfx2\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\inc\sfx2\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx +..\inc\sfx2\sfxresid.hxx %_DEST%\inc%_EXT%\sfx2\sfxresid.hxx + +..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx ..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx ..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx -..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx ..\inc\sfx2\chalign.hxx %_DEST%\inc%_EXT%\sfx2\chalign.hxx ..\inc\sfx2\childwin.hxx %_DEST%\inc%_EXT%\sfx2\childwin.hxx ..\inc\sfx2\ctrlitem.hxx %_DEST%\inc%_EXT%\sfx2\ctrlitem.hxx ..\inc\sfx2\dispatch.hxx %_DEST%\inc%_EXT%\sfx2\dispatch.hxx ..\inc\sfx2\dinfdlg.hxx %_DEST%\inc%_EXT%\sfx2\dinfdlg.hxx -..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx ..\inc\sfx2\docinf.hxx %_DEST%\inc%_EXT%\sfx2\docinf.hxx ..\inc\sfx2\docfac.hxx %_DEST%\inc%_EXT%\sfx2\docfac.hxx ..\inc\sfx2\docfile.hxx %_DEST%\inc%_EXT%\sfx2\docfile.hxx @@ -53,15 +66,12 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\frmhtmlw.hxx %_DEST%\inc%_EXT%\sfx2\frmhtmlw.hxx ..\inc\sfx2\genlink.hxx %_DEST%\inc%_EXT%\sfx2\genlink.hxx ..\inc\sfx2\hintpost.hxx %_DEST%\inc%_EXT%\sfx2\hintpost.hxx -..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx ..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx ..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx ..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx ..\inc\sfx2\topfrm.hxx %_DEST%\inc%_EXT%\sfx2\topfrm.hxx ..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx -..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx ..\inc\sfx2\minarray.hxx %_DEST%\inc%_EXT%\sfx2\minarray.hxx -..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx ..\inc\sfx2\minstack.hxx %_DEST%\inc%_EXT%\sfx2\minstack.hxx ..\inc\sfx2\mnuitem.hxx %_DEST%\inc%_EXT%\sfx2\mnuitem.hxx ..\inc\sfx2\module.hxx %_DEST%\inc%_EXT%\sfx2\module.hxx @@ -97,10 +107,8 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\tabdlg.hxx ..\inc\sfx2\tbxctrl.hxx %_DEST%\inc%_EXT%\sfx2\tbxctrl.hxx ..\inc\sfx2\templdlg.hxx %_DEST%\inc%_EXT%\sfx2\templdlg.hxx -..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx ..\inc\sfx2\viewfrm.hxx %_DEST%\inc%_EXT%\sfx2\viewfrm.hxx ..\inc\sfx2\viewsh.hxx %_DEST%\inc%_EXT%\sfx2\viewsh.hxx -..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx ..\inc\sfx2\appuno.hxx %_DEST%\inc%_EXT%\sfx2\appuno.hxx ..\inc\sfx2\sfxuno.hxx %_DEST%\inc%_EXT%\sfx2\sfxuno.hxx ..\inc\sfx2\sfxbasemodel.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasemodel.hxx @@ -109,8 +117,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\srchitem.hxx %_DEST%\inc%_EXT%\sfx2\srchitem.hxx ..\inc\sfx2\srchdefs.hxx %_DEST%\inc%_EXT%\sfx2\srchdefs.hxx ..\inc\sfx2\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc -..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx -..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx ..\inc\sfx2\sfxdlg.hxx %_DEST%\inc%_EXT%\sfx2\sfxdlg.hxx ..\inc\sfx2\dialogs.hrc %_DEST%\inc%_EXT%\sfx2\dialogs.hrc ..\inc\sfx2\itemwrapper.hxx %_DEST%\inc%_EXT%\sfx2\itemwrapper.hxx @@ -121,9 +127,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\linksrc.hxx %_DEST%\inc%_EXT%\sfx2\linksrc.hxx ..\inc\sfx2\querystatus.hxx %_DEST%\inc%_EXT%\sfx2\querystatus.hxx ..\inc\sfx2\sfxstatuslistener.hxx %_DEST%\inc%_EXT%\sfx2\sfxstatuslistener.hxx -..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx -..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx -..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx ..\inc\sfx2\layout.hxx %_DEST%\inc%_EXT%\sfx2\layout.hxx ..\inc\sfx2\layout-tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\layout-tabdlg.hxx ..\inc\sfx2\layout-post.hxx %_DEST%\inc%_EXT%\sfx2\layout-post.hxx diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index c75033ae71..2ae267219b 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -46,14 +46,10 @@ #include <basic/basrdll.hxx> #include <svtools/asynclink.hxx> #include <svl/stritem.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <svl/eitem.hxx> #include <svl/urlbmk.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> @@ -61,8 +57,6 @@ #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> #include <osl/file.hxx> -#ifndef GCC -#endif #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> @@ -81,23 +75,18 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> - #include <basic/basmgr.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> - #include <rtl/logfile.hxx> - #include <sfx2/appuno.hxx> #include "sfxhelp.hxx" #include <sfx2/request.hxx> #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include <sfx2/progress.hxx> #include <sfx2/objsh.hxx> @@ -294,7 +283,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp ) #include <framework/imageproducer.hxx> #include <framework/acceleratorinfo.hxx> #include <framework/sfxhelperfunctions.hxx> -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include "fwkhelper.hxx" ::osl::Mutex SfxApplication::gMutex; diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 555c7467aa..45f5ba1b80 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -34,6 +34,45 @@ #include "app.hrc" #include "helpid.hrc" +String STR_NONAME +{ + Text [ en-US ] = "Untitled" ; +}; +String STR_CLOSE +{ + Text [ en-US ] = "Close" ; +}; +String STR_STYLE_FILTER_AUTO +{ + Text [ en-US ] = "Automatic" ; +}; +String STR_STANDARD_SHORTCUT +{ + Text [ en-US ] = "Standard" ; +}; +String STR_BYTES +{ + Text [ en-US ] = "Bytes" ; +}; +String STR_KB +{ + Text [ en-US ] = "KB" ; +}; +String STR_MB +{ + Text [ en-US ] = "MB" ; +}; +String STR_GB +{ + Text [ en-US ] = "GB" ; +}; +QueryBox MSG_QUERY_LASTVERSION +{ + Buttons = WB_YES_NO ; + DefButton = WB_DEF_NO ; + Message [ en-US ] = "Cancel all changes?" ; +}; + InfoBox RID_DOCALREADYLOADED_DLG { Message [ en-US ] = "Document already open." ; @@ -1061,3 +1100,22 @@ Image IMG_MISSING_4 { ImageBitmap = Bitmap { File = "sn064.bmp" ; }; }; +String STR_STANDARD +{ + Text [ en-US ] = "Standard" ; +}; +String STR_NONE +{ + Text [ en-US ] = "- None -" ; +}; +String STR_SFX_FILTERNAME_ALL +{ + Text [ en-US ] = "All files (*.*)" ; +}; +// i66948 used in project scripting +String STR_ERRUNOEVENTBINDUNG +{ + Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name."; +}; + + diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 36b6cd94f8..8755be5038 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -63,7 +63,7 @@ #include "arrdecl.hxx" #include <sfx2/app.hxx> #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/msg.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/progress.hxx> @@ -72,8 +72,8 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> -#include "tplpitem.hxx" -#include "minfitem.hxx" +#include "sfx2/tplpitem.hxx" +#include "sfx2/minfitem.hxx" #include "app.hrc" #include <sfx2/evntconf.hxx> #include <sfx2/macrconf.hxx> @@ -82,7 +82,7 @@ #include "appdata.hxx" #include "appbas.hxx" #include "sfxhelp.hxx" -#include "basmgr.hxx" +#include "sfx2/basmgr.hxx" #include "sorgitm.hxx" #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index fd2afddcb3..6c6aa7b30e 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -96,7 +96,7 @@ #include <sfx2/macrconf.hxx> #include "helper.hxx" // SfxContentHelper::... #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "shutdownicon.hxx" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 8f24520a4b..ea00534a08 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -60,7 +60,7 @@ #include <sfx2/request.hxx> #include "referers.hxx" #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "objshimp.hxx" #include <sfx2/appuno.hxx> #include "imestatuswindow.hxx" diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5345a050aa..24dcf86465 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -85,7 +85,7 @@ #include <sfx2/msgpool.hxx> #include <sfx2/progress.hxx> #include "sfxhelp.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxtypes.hxx" #include <sfx2/viewsh.hxx> #include "nochaos.hxx" diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index f4e3dea030..99488cf317 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -56,7 +56,7 @@ #include <sfx2/app.hxx> #include "arrdecl.hxx" #include <sfx2/dispatch.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/fcontnr.hxx> #include <sfx2/viewsh.hxx> #include "intro.hxx" diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index cf219f6d26..4541771f4a 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -67,7 +67,7 @@ #include <unotools/moduleoptions.hxx> #include <osl/file.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/app.hxx> #include "appdata.hxx" #include "arrdecl.hxx" diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index e6e0c4bdac..c921e72d00 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -101,7 +101,7 @@ #include <sfx2/passwd.hxx> #include "referers.hxx" #include <sfx2/request.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/viewsh.hxx> #include "app.hrc" #include <sfx2/topfrm.hxx> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 63d33e5499..36f4913ff8 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -56,7 +56,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include "arrdecl.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/event.hxx> #include <sfx2/macrconf.hxx> #include <sfx2/mnumgr.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 48b976b312..858930241b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -124,12 +124,12 @@ #include <sfx2/sfx.hrc> #include "app.hrc" #include <sfx2/passwd.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include <sfx2/childwin.hxx> #include "appdata.hxx" #include <sfx2/macrconf.hxx> -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" #include <sfx2/event.hxx> #include <sfx2/module.hxx> #include <sfx2/topfrm.hxx> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index b623365c5a..f126941c9b 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -55,10 +55,7 @@ #include <basic/sbxobj.hxx> #include <basic/sberrors.hxx> #include <basic/basmgr.hxx> -#ifndef _BASIC_SBUNO_HXX #include <basic/sbuno.hxx> -#endif - #include <basic/sbxcore.hxx> #include <svl/ownlist.hxx> #include <svl/lckbitem.hxx> @@ -134,7 +131,7 @@ using namespace ::com::sun::star::io; #include "fltoptint.hxx" #include <sfx2/docfile.hxx> #include <sfx2/sfxbasecontroller.hxx> -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "eventsupplier.hxx" #include "xpackcreator.hxx" // #include "applet.hxx" diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 9c2a7996e3..3bd0f9a3eb 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -44,7 +44,7 @@ #include <rtl/ustring.hxx> #include <rtl/logfile.hxx> -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include <sfx2/app.hxx> #include <sfx2/unoctitm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index a74e9def57..0054e87ab6 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -48,7 +48,7 @@ #include "dde.hrc" #include <sfx2/lnkbase.hxx> #include <sfx2/linkmgr.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 4306340dfc..5a10d56f61 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -43,7 +43,7 @@ //#include "iface.hxx" #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #define _SVSTDARR_STRINGSDTOR diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 9b7a92fff0..e4fe89c887 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -45,7 +45,7 @@ //#include <soerr.hxx> #include "app.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/filedlghelper.hxx> #include <tools/debug.hxx> diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 48d1258e28..d72cf8718a 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -60,7 +60,8 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET .INCLUDE: pkg_config.mk CFLAGS+=$(PKGCONFIG_CFLAGS) CFLAGS+=-DENABLE_QUICKSTART_APPLET - CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST) +# definition moved to shutdownicon.cxx +# CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST) .ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE" .ELSE CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index a25f25c01f..7cb261de60 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -41,7 +41,7 @@ #include <sfx2/module.hxx> #include <sfx2/app.hxx> #include "arrdecl.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/msgpool.hxx> #include <sfx2/tbxctrl.hxx> #include "stbitem.hxx" diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 5b073ab83c..0c7380347c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -33,14 +33,14 @@ #include "newhelp.hxx" #include <sfx2/sfxuno.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helpinterceptor.hxx" #include "helper.hxx" #include <sfx2/msgpool.hxx> #include <sfx2/app.hxx> #include "sfxtypes.hxx" #include "panelist.hxx" -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "srchdlg.hxx" #include "sfxhelp.hxx" diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index 1fabfa52fa..c04252a7bf 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -30,107 +30,16 @@ #include <sfx2/sfx.hrc> -String STR_NONAME -{ - Text [ en-US ] = "Untitled" ; -}; - -String STR_NONE -{ - Text [ en-US ] = "- None -" ; -}; - -String STR_CLOSE -{ - Text [ en-US ] = "Close" ; -}; - -String STR_STYLE_FILTER_AUTO -{ - Text [ en-US ] = "Automatic" ; -}; - String STR_STYLE_FILTER_USED { Text [ en-US ] = "Applied Styles" ; }; - - - String STR_STYLE_FILTER_USERDEF { Text [ en-US ] = "Custom Styles" ; }; - String STR_STYLE_FILTER_ALL { Text [ en-US ] = "All Styles" ; }; -String STR_STANDARD -{ - Text [ en-US ] = "Standard" ; -}; -String STR_STANDARD_SHORTCUT -{ - Text [ en-US ] = "Standard" ; -}; - -String STR_SFX_FILTERNAME_ALL -{ - Text [ en-US ] = "All files (*.*)" ; -}; - -String STR_BYTES -{ - Text [ en-US ] = "Bytes" ; -}; - -String STR_KB -{ - Text [ en-US ] = "KB" ; -}; - -String STR_MB -{ - Text [ en-US ] = "MB" ; -}; - - -String STR_GB -{ - Text [ en-US ] = "GB" ; -}; - -String STR_UNDO -{ - Text [ en-US ] = "Undo: " ; -}; - -String STR_REDO -{ - Text [ en-US ] = "Re~do: " ; -}; - -String STR_REPEAT -{ - Text [ en-US ] = "~Repeat: " ; -}; - -String RID_STR_NEW_TASK -{ - Text [ en-US ] = "New task"; -}; -QueryBox MSG_QUERY_LASTVERSION -{ - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "Cancel all changes?" ; -}; - -// i66948 used in project scripting -String STR_ERRUNOEVENTBINDUNG -{ - Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name."; -}; - diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 7421330cf9..45bf853f12 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -83,7 +83,7 @@ #include "newhelp.hxx" #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helper.hxx" #include "app.hrc" diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 985af75b1f..9d7ebaf987 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -71,7 +71,7 @@ #endif #include <vcl/timer.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -91,6 +91,10 @@ extern "C" { static void SAL_CALL thisModule() {} } # endif #endif +#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) +#define PLUGIN_NAME "libqstart_gtkli.so" +#endif + class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener > { public: diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index fc64b7243d..84d5b2f6b3 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -50,7 +50,7 @@ #include <sfx2/viewsh.hxx> #include "splitwin.hxx" #include <sfx2/msgpool.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> // SFX_ITEMSET_SET #include <vcl/taskpanelist.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index c305aa862d..40a9fa1743 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -123,7 +123,7 @@ using namespace ::vos; #include <sfx2/progress.hxx> #include "openflag.hxx" #include "bastyp.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/doctempl.hxx> #include <sfx2/frame.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 5371f0697d..a0019cfac1 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -49,7 +49,7 @@ #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/objsh.hxx> #include <sfx2/sfx.hrc> #include "bastyp.hrc" diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index b21c8771a6..dc5ac2c95b 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -36,7 +36,7 @@ #include <sot/storage.hxx> #include <sot/formats.hxx> -#include <mieclip.hxx> +#include <sfx2/mieclip.hxx> #include <sfx2/sfxuno.hxx> MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj() diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 97dd4da66f..af597ab738 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -54,7 +54,7 @@ #include "sfxtypes.hxx" #include <sfx2/docfile.hxx> #include "workwin.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "bastyp.hrc" #include <sfx2/msg.hxx> diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index 0e1447945f..4b577184a5 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -35,7 +35,7 @@ #endif #include <tools/simplerm.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/app.hxx> // ----------------------------------------------------------------------- diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 385260dce6..622714a5d5 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -31,35 +31,27 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <vcl/msgbox.hxx> -#ifndef _SV_RESARY_HXX #include <tools/resary.hxx> -#endif #include <svl/lstner.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> #include <tools/urlobj.hxx> #include <basic/sbx.hxx> - -#include <sot/storage.hxx> + #include <sot/storage.hxx> #include <unotools/securityoptions.hxx> -#ifndef _RTL_USTRING_ #include <rtl/ustring.h> -#endif - #include <com/sun/star/uno/Any.hxx> #include <framework/eventsconfiguration.hxx> #include <comphelper/processfactory.hxx> - #include <sfx2/evntconf.hxx> - #include <sfx2/macrconf.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> #include "config.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "eventsupplier.hxx" #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index baee95519f..6ef5e5700b 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -62,8 +62,8 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> -#include "minfitem.hxx" -#include "imgmgr.hxx" +#include "sfx2/minfitem.hxx" +#include "sfx2/imgmgr.hxx" #include <sfx2/evntconf.hxx> #include <sfx2/docfile.hxx> #include <sfx2/genlink.hxx> diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index fa940283e1..b22e8b948d 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -33,10 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 33c78f2e0d..61275f4f38 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -44,7 +44,7 @@ #include <sfx2/objface.hxx> #include "sfxtypes.hxx" #include <sfx2/macrconf.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "arrdecl.hxx" #include <sfx2/module.hxx> diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index cf8d66f448..e9de9fe63e 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -42,7 +42,7 @@ #include <sfx2/msg.hxx> #include <sfx2/app.hxx> #include <sfx2/msgpool.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/minarray.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index bae0b9c171..7a1c477eb4 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -32,17 +32,8 @@ #include "precompiled_sfx2.hxx" // include --------------------------------------------------------------- -#include <aboutbmpnames.hxx> - -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef GCC -#endif - #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <rtl/bootstrap.hxx> @@ -50,13 +41,11 @@ #include <unotools/bootstrap.hxx> #include <com/sun/star/uno/Any.h> #include <unotools/configmgr.hxx> - #include <sfx2/sfxuno.hxx> #include "about.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxdefs.hxx> #include <sfx2/app.hxx> - #include "dialog.hrc" // defines --------------------------------------------------------------- @@ -138,7 +127,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS } // load image from module path - rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) ); +// rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) ); +#ifdef ABOUTBMPNAMES + rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( "ABOUTBMPNAMES" ) ); +#else + rtl::OUString aAbouts; +#endif + bool bLoaded = false; sal_Int32 nIndex = 0; do diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index f7f3f7b14e..90c5b4cdfb 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "alienwarn.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "alienwarn.hrc" diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 432e2ed173..42ce58aa97 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -52,7 +52,7 @@ #include <sfx2/viewsh.hxx> #include "sfxhelp.hxx" #include "workwin.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "dialog.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index e5b555d977..4c8934ba6d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -62,8 +62,8 @@ #include <vcl/timer.hxx> #include <sfx2/dinfdlg.hxx> -#include "sfxresid.hxx" -#include "dinfedt.hxx" +#include "sfx2/sfxresid.hxx" +#include "sfx2/dinfedt.hxx" #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx index 5cc3da113b..3e3f424b64 100644 --- a/sfx2/source/dialog/dinfedt.cxx +++ b/sfx2/source/dialog/dinfedt.cxx @@ -34,8 +34,8 @@ #ifndef GCC #endif -#include "dinfedt.hxx" -#include "sfxresid.hxx" +#include "sfx2/dinfedt.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfx.hrc> #include "dinfedt.hrc" diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index cad9014c0a..7b895a3a55 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -92,7 +92,7 @@ #include <sfx2/docfac.hxx> #include "openflag.hxx" #include <sfx2/passwd.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxsids.hrc> #include "filedlghelper.hrc" #include "filtergrouping.hxx" diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 47a75137d8..e7219b1a70 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -35,7 +35,7 @@ #include <sfx2/filedlghelper.hxx> #include <sfx2/sfx.hrc> #include <sfx2/docfac.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <osl/thread.h> #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> #include <com/sun/star/beans/StringPair.hpp> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index d2f47233e5..7f9dc1166a 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -50,27 +50,22 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/security/CertificateValidity.hpp> -#ifndef _COM_SUN_STAR_SECURITY_DOCUMENTSIGNATURESINFORMATION_HPP_ #include <com/sun/star/security/DocumentSignatureInformation.hpp> -#endif #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/document/XExporter.hpp> - -#ifndef _RTL_TEXTENC_H -#include <rtl/textench.h> -#endif +#include <rtl/textenc.h> #include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/msgbox.hxx> -#include <mailmodelapi.hxx> +#include <sfx2/mailmodelapi.hxx> #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxsids.hrc> #include "dialog.hrc" diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index 3abfb114a8..df259fe255 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -47,9 +47,7 @@ #include <com/sun/star/system/XSimpleMailClientSupplier.hpp> #include <com/sun/star/system/SimpleMailClientFlags.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -#ifndef _RTL_TEXTENC_H -#include <rtl/textench.h> -#endif +#include <rtl/textenc.h> #include <vos/mutex.hxx> #include <rtl/uri.h> #include <rtl/uri.hxx> @@ -60,13 +58,13 @@ #include <vos/thread.hxx> #include <vcl/msgbox.hxx> -#include "mailmodelapi.hxx" +#include "sfx2/mailmodelapi.hxx" #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include "sfxtypes.hxx" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include <sfx2/fcontnr.hxx> #include "guisaveas.hxx" diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk index 230bbe432a..7e044f0fb5 100644 --- a/sfx2/source/dialog/makefile.mk +++ b/sfx2/source/dialog/makefile.mk @@ -103,16 +103,6 @@ CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")" .INCLUDE : target.mk -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx - $(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx .INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 5a69e4e2fe..0e2188c4cb 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -49,7 +49,7 @@ #include <sfx2/mgetempl.hxx> #include <sfx2/objsh.hxx> #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/module.hxx> #include <sfx2/sfx.hrc> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 348ddc6412..c7c92f5c61 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -39,7 +39,7 @@ #include <sfx2/navigat.hxx> #include <sfx2/sfx.hrc> #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "helpid.hrc" SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 642c87d75a..67416fe15f 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -39,7 +39,7 @@ #include <sfx2/newstyle.hxx> #include "dialog.hrc" #include "newstyle.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" // PRIVATE METHODES ------------------------------------------------------ diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 23fe8c98ba..3a4791eceb 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -38,7 +38,7 @@ #include <sfx2/passwd.hxx> #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "dialog.hrc" #include "passwd.hrc" diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index c73874f646..3eaf11d30a 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -41,7 +41,7 @@ #include "printopt.hrc" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/viewsh.hxx> #include <sfx2/printopt.hxx> diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index fc95e472a8..3a4cbaeb6f 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -45,13 +45,13 @@ #include "recfloat.hxx" #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" using namespace ::com::sun::star; diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx index 91e7cc3394..ac0b55f94d 100644 --- a/sfx2/source/dialog/sfxdlg.cxx +++ b/sfx2/source/dialog/sfxdlg.cxx @@ -32,7 +32,9 @@ #include "precompiled_sfx2.hxx" #include <sfx2/sfxdlg.hxx> -#include "cuilib.hxx" +//#include "cuilib.hxx" + +#define DLL_NAME "libcuili.so" #include <osl/module.hxx> #include <tools/string.hxx> diff --git a/sfx2/source/dialog/sfxurl.cxx b/sfx2/source/dialog/sfxurl.cxx index 29a8b388d8..23181599a8 100644 --- a/sfx2/source/dialog/sfxurl.cxx +++ b/sfx2/source/dialog/sfxurl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <sfx2/filedlghelper.hxx> -#include <sfxresid.hxx> +#include <sfx2/sfxresid.hxx> #include <dialog.hrc> SfxUrlDialog::SfxUrlDialog( Window *pParent ) diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 0dac077921..282dffd5e4 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -52,7 +52,7 @@ #include <sfx2/dockwin.hxx> #include <sfx2/app.hxx> #include "dialog.hrc" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/mnumgr.hxx> #include "virtmenu.hxx" #include <sfx2/msgpool.hxx> diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 1abd1ffa36..9c30ed9607 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "srchdlg.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "srchdlg.hrc" diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index bedb46152b..4a3b06adfb 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -42,7 +42,7 @@ #include <sfx2/styledlg.hxx> #include <sfx2/mgetempl.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "dialog.hrc" diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 51a3ce757a..b318b6e5ac 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -45,7 +45,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxhelp.hxx" #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9195925359..3226228ce7 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -63,8 +63,8 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/newstyle.hxx> -#include "tplpitem.hxx" -#include "sfxresid.hxx" +#include "sfx2/tplpitem.hxx" +#include "sfx2/sfxresid.hxx" #include "templdlg.hrc" #include <sfx2/sfx.hrc> @@ -76,7 +76,7 @@ #include "docvor.hxx" #include <sfx2/doctempl.hxx> #include <sfx2/module.hxx> -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "helpid.hrc" #include "appdata.hxx" #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index fa0e93d1d0..207e5abfe7 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -36,12 +36,9 @@ #include <svl/intitem.hxx> #include <vcl/svapp.hxx> -#ifndef GCC -#endif - #include <sfx2/templdlg.hxx> #include <sfx2/bindings.hxx> -#include "tplpitem.hxx" +#include "sfx2/tplpitem.hxx" #include "tplcitem.hxx" #include "templdgi.hxx" diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 5b7a8d796a..2287495760 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -33,10 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - -#include "tplpitem.hxx" +#include "sfx2/tplpitem.hxx" #include <com/sun/star/frame/status/Template.hpp> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index fe75d4d0c1..7a8f932f79 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -49,7 +49,7 @@ #include "versdlg.hrc" #include "versdlg.hxx" #include <sfx2/viewfrm.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxsids.hrc> diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index ad1c4bb5c2..f69e26a4de 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -30,15 +30,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include "QuerySaveDocument.hxx" +#include "sfx2/QuerySaveDocument.hxx" #include <sfx2/sfx.hrc> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "doc.hrc" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif + // ----------------------------------------------------------------------------- short ExecuteQuerySaveDocument(Window* _pParent,const String& _rTitle) { diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index b1c48a83e5..77b883b3c3 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -44,13 +44,13 @@ #include <sfx2/sfx.hrc> #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" #include "fltfnc.hxx" #include "arrdecl.hxx" #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/mnumgr.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxuno.hxx> #include "doc.hrc" diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 7ec181492c..bf26766f65 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -147,7 +147,7 @@ using namespace ::com::sun::star::io; #include <sfx2/docfac.hxx> // GetFilterContainer #include "doc.hrc" #include "openflag.hxx" // SFX_STREAM_READONLY etc. -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/appuno.hxx> //#include "xmlversion.hxx" diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 629c54a1dc..270bd6a1f0 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include <sfx2/app.hxx> -#include "docinsert.hxx" +#include "sfx2/docinsert.hxx" #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index a0258f2e8c..e1c1c98820 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -40,7 +40,7 @@ #include <sfx2/doctdlg.hxx> #include "docvor.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxtypes.hxx" #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index e7dc765911..3e2be9e9fd 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -98,7 +98,7 @@ using namespace ::ucbhelper; #include <sfx2/objsh.hxx> #include "sfxtypes.hxx" #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include <sfx2/fcontnr.hxx> #include <svtools/templatefoldercache.hxx> diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index c8f7704061..ef62a3a013 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -68,7 +68,7 @@ #include <unotools/configmgr.hxx> #include <unotools/ucbhelper.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxurlrelocator.hxx" #include "doctemplateslocal.hxx" #include <sfx2/docfac.hxx> diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index e93f59857f..f73e5ece5e 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -67,7 +67,7 @@ #include "sfxtypes.hxx" #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include <sfx2/sfx.hrc> #include "docvor.hrc" diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 42235cf2af..d1f3b1fe70 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -81,7 +81,7 @@ #include <comphelper/processfactory.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "graphhelp.hxx" #include "doc.hrc" diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index de934f5548..a9a20816a3 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -77,7 +77,7 @@ #include <sfx2/sfxsids.hrc> #include <doc.hrc> -#include <sfxresid.hxx> +#include <sfx2/sfxresid.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index bcef29a045..7ba1b98189 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -34,9 +34,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/msgbox.hxx> #include <vcl/morebtn.hxx> -#ifndef _SVMEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <svl/itemset.hxx> #include <svl/eitem.hxx> #include <svtools/sfxecode.hxx> @@ -45,9 +43,7 @@ #include <unotools/localfilehelper.hxx> #include "new.hrc" -#ifndef _SFX_DOC_HRC #include "doc.hrc" -#endif #include <sfx2/sfx.hrc> #include "helpid.hrc" #include "sfxtypes.hxx" @@ -57,8 +53,8 @@ #include <sfx2/objsh.hxx> #include "fltfnc.hxx" #include <sfx2/viewsh.hxx> -#include "viewfac.hxx" -#include "sfxresid.hxx" +#include "sfx2/viewfac.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> #include "preview.hxx" #include <sfx2/printer.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index c8253f687e..7fe75dba7b 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -64,7 +64,7 @@ #include <vcl/virdev.hxx> #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "appdata.hxx" #include <sfx2/dinfdlg.hxx> #include "fltfnc.hxx" @@ -77,7 +77,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include <sfx2/topfrm.hxx> -#include "basmgr.hxx" +#include "sfx2/basmgr.hxx" #include <sfx2/doctempl.hxx> #include "doc.hrc" #include <sfx2/sfxbasemodel.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index b0a7b23855..2495a8be89 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -129,7 +129,7 @@ using namespace ::com::sun::star::container; #include "appdata.hxx" #include <sfx2/request.hxx> #include <sfx2/bindings.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index e14bfdc222..3140167c43 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -72,7 +72,7 @@ #include <sfx2/app.hxx> #include <sfx2/signaturestate.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/event.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 98afd75354..b292e6281c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -114,7 +114,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/childwin.hxx> #include <sfx2/request.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> #include "fltfnc.hxx" #include <sfx2/docfilt.hxx> diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index 367325208d..9fa9e59385 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -71,7 +71,7 @@ #include <vector> #include <algorithm> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" using namespace ::com::sun::star; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 8f80ffbe1b..e5b003f42f 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -98,7 +98,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "objshimp.hxx" #include "appbas.hxx" #include "sfxtypes.hxx" @@ -109,8 +109,8 @@ #include "appdata.hxx" #include <sfx2/appuno.hxx> #include <sfx2/sfxsids.hrc> -#include "basmgr.hxx" -#include "QuerySaveDocument.hxx" +#include "sfx2/basmgr.hxx" +#include "sfx2/QuerySaveDocument.hxx" #include "helpid.hrc" #include <sfx2/msg.hxx> #include "appbaslib.hxx" diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index d430205a83..c07457bc07 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #include "querytemplate.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "doc.hrc" #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f87a65d3f2..107a028e40 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -111,7 +111,7 @@ #include <sfx2/request.hxx> #include <sfx2/objuno.hxx> #include <sfx2/printer.hxx> -#include <basmgr.hxx> +#include <sfx2/basmgr.hxx> #include <sfx2/event.hxx> #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> @@ -122,12 +122,12 @@ #include <sfx2/docfac.hxx> #include <sfx2/fcontnr.hxx> #include "sfx2/docstoragemodifylistener.hxx" -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "graphhelp.hxx" #include <sfx2/msgpool.hxx> #include <sfx2/DocumentMetadataAccess.hxx> -#include <sfxresid.hxx> +#include <sfx2/sfxresid.hxx> //________________________________________________________________________________________________________ // const diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index 92454ae62f..c2a1b48f02 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -45,7 +45,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "sfxhelp.hxx" #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 9286203551..c5d2e73ff5 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -75,9 +75,9 @@ #include <sfx2/module.hxx> #include <sfx2/unoctitm.hxx> #include <sfx2/viewfrm.hxx> -#include "imgmgr.hxx" -#include "imagemgr.hxx" -#include "sfxresid.hxx" +#include "sfx2/imgmgr.hxx" +#include "sfx2/imagemgr.hxx" +#include "sfx2/sfxresid.hxx" #include "../doc/doc.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 356582c7ac..c0388c1403 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -71,7 +71,7 @@ #include "sfxtypes.hxx" #include <sfx2/bindings.hxx> #include "mnucfga.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/macrconf.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/sfx.hrc> diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index fe59bea965..82dc67179c 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -39,14 +39,9 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <comphelper/processfactory.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> -#ifndef GCC -#endif - #include "virtmenu.hxx" #include <sfx2/msgpool.hxx> #include "statcach.hxx" @@ -63,9 +58,9 @@ #include <sfx2/viewsh.hxx> #include "sfxpicklist.hxx" #include <sfx2/macrconf.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "menu.hrc" -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <framework/addonsoptions.hxx> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index c1f6ee3767..c96c5949ff 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -54,7 +54,7 @@ #include "eventsupplier.hxx" #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfxsids.hrc> #include "sfxlocal.hrc" diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 3013dcf9a0..97b803a7ca 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -34,10 +34,10 @@ #include <stdio.h> #include <hash_map> -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include <sfx2/sfx.hrc> #include <sfx2/app.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/bindings.hxx> #include "statcach.hxx" #include <sfx2/module.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index fe3ce95119..4ca24aaec6 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -95,7 +95,7 @@ #include "sfxtypes.hxx" #include <sfx2/macrconf.hxx> #include <sfx2/genlink.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/sfx.hrc> #include <sfx2/module.hxx> #include <sfx2/docfile.hxx> @@ -106,11 +106,11 @@ #include <sfx2/unoctitm.hxx> #include "helpid.hrc" #include "workwin.hxx" -#include "imgmgr.hxx" +#include "sfx2/imgmgr.hxx" #include "virtmenu.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/module.hxx> -#include "imagemgr.hxx" +#include "sfx2/imagemgr.hxx" #include <comphelper/uieventslogger.hxx> #include <com/sun/star/frame/XModuleManager.hpp> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index b439dca4ff..088df6253f 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -92,7 +92,7 @@ namespace css = ::com::sun::star; #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#include "brokenpackageint.hxx" +#include "sfx2/brokenpackageint.hxx" #include "objshimp.hxx" SfxFrameLoader_Impl::SfxFrameLoader_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& /*xFactory*/ ) diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index ede50724b4..17854cb270 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -56,7 +56,7 @@ #include "docvor.hxx" #include "orgmgr.hxx" #include "sfxtypes.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "view.hrc" #include <sfx2/docfilt.hxx> #include "fltfnc.hxx" diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index e8007b6792..b170a0e773 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -47,7 +47,7 @@ #include <sfx2/prnmon.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/tabdlg.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "view.hrc" #ifdef MSC diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index b840c40a25..f6aac85f47 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -53,7 +53,7 @@ #include "sfxtypes.hxx" #include <sfx2/progress.hxx> #include <sfx2/bindings.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/event.hxx> #include <sfx2/request.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 5d03bb3e61..acebefa2af 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -72,7 +72,7 @@ #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> -#include <sfxresid.hxx> +#include <sfx2/sfxresid.hxx> // wg. pTopFrames #include "appdata.hxx" diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc index 47229be67c..25daaa949a 100644 --- a/sfx2/source/view/view.hrc +++ b/sfx2/source/view/view.hrc @@ -44,12 +44,6 @@ #define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 9) #define STR_PRINTING (RID_SFX_VIEW_START+10) -#ifndef STR_UNDO -#define STR_UNDO (RID_SFX_VIEW_START+11) -#define STR_REDO (RID_SFX_VIEW_START+12) -#define STR_REPEAT (RID_SFX_VIEW_START+13) -#endif - #define DLG_PRINTMONITOR (RID_SFX_VIEW_START) #define FT_DOCNAME 1 #define FT_PRINTING 2 diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 09ef5d2e1f..00fb2c584e 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -32,11 +32,8 @@ #include "precompiled_sfx2.hxx" // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif - #include <sfx2/app.hxx> -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" // STATIC DATA ----------------------------------------------------------- @@ -56,16 +53,12 @@ void SfxViewFactory::InitFactory() // CTOR / DTOR ----------------------------------------------------------- -SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, - USHORT nOrdinal, const ResId& aDescrResId ): +SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ): fnCreate(fnC), fnInit(fnI), - nOrd(nOrdinal), - aDescription(aDescrResId.GetId(), *aDescrResId.GetResMgr()) + nOrd(nOrdinal) { - aDescription.SetRT(aDescrResId.GetRT()); DBG_CTOR(SfxViewFactory, 0); -// SFX_APP()->RegisterViewFactory_Impl(*this); } SfxViewFactory::~SfxViewFactory() diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 577c9a8b07..c526a64f01 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -38,12 +38,8 @@ #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> -#endif #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> @@ -51,9 +47,7 @@ #include <svl/slstitm.hxx> #include <svl/whiter.hxx> #include <svl/undo.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <com/sun/star/container/XIndexAccess.hpp> @@ -91,6 +85,8 @@ #include <comphelper/storagehelper.hxx> #include <svtools/asynclink.hxx> #include <svl/sharecontrolfile.hxx> +#include <svl/svtools.hrc> +#include <svtools/svtdata.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,10 +113,10 @@ namespace css = ::com::sun::star; #include <sfx2/request.hxx> #include <sfx2/docfac.hxx> #include <sfx2/ipclient.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include "appbas.hxx" #include <sfx2/objitem.hxx> -#include "viewfac.hxx" +#include "sfx2/viewfac.hxx" #include <sfx2/event.hxx> #include "fltfnc.hxx" #include <sfx2/docfile.hxx> @@ -137,7 +133,7 @@ namespace css = ::com::sun::star; #include "workwin.hxx" #include "helper.hxx" #include "macro.hxx" -#include "minfitem.hxx" +#include "sfx2/minfitem.hxx" #include "../appl/app.hrc" //------------------------------------------------------------------------- DBG_NAME(SfxViewFrame) @@ -1050,7 +1046,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() ) { - String aTmp( SfxResId( STR_UNDO ) ); + String aTmp( SvtResId( STR_UNDO ) ); aTmp += pShUndoMgr->GetUndoActionComment(0); rSet.Put( SfxStringItem( SID_UNDO, aTmp ) ); } @@ -1059,7 +1055,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() ) { - String aTmp( SfxResId(STR_REDO) ); + String aTmp( SvtResId(STR_REDO) ); aTmp += pShUndoMgr->GetRedoActionComment(0); rSet.Put( SfxStringItem( SID_REDO, aTmp ) ); } @@ -1069,7 +1065,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() && pShUndoMgr->CanRepeat(*pTarget, 0) ) { - String aTmp( SfxResId(STR_REPEAT) ); + String aTmp( SvtResId(STR_REPEAT) ); aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget, 0); rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index b9cb144f27..b80e23e0c2 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -57,7 +57,7 @@ #include "viewimp.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/prnmon.hxx> -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> #include "sfxtypes.hxx" diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 6d92dffdc5..bfc80e8552 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -73,7 +73,7 @@ #include "view.hrc" #include <sfx2/viewsh.hxx> #include "viewimp.hxx" -#include "sfxresid.hxx" +#include "sfx2/sfxresid.hxx" #include <sfx2/request.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/printer.hxx> @@ -85,7 +85,7 @@ #include "sfxlocal.hrc" #include <sfx2/sfxbasecontroller.hxx> #include <sfx2/topfrm.hxx> -#include "mailmodelapi.hxx" +#include "sfx2/mailmodelapi.hxx" #include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/ipclient.hxx> diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src new file mode 100644 index 0000000000..036f08ec1b --- /dev/null +++ b/svx/source/src/errtxt.src @@ -0,0 +1,518 @@ +/************************************************************************* + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#define __RSC +#include <svl/svtools.hrc> +#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/svx/source/src/makefile.mk b/svx/source/src/makefile.mk index b1ce276958..630c9c420b 100644 --- a/svx/source/src/makefile.mk +++ b/svx/source/src/makefile.mk @@ -43,8 +43,6 @@ TARGET=ofa RES1FILELIST=\ $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/svtools.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs \ $(SOLARCOMMONRESDIR)$/basic.srs RESLIB1NAME=$(TARGET) @@ -55,7 +53,8 @@ RESLIB1SRSFILES=$(RES1FILELIST) SRS1NAME= app SRC1FILES= \ - app.src + app.src \ + errtxt.src .INCLUDE : target.mk diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 070aecc308..92eee374f9 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -125,30 +125,31 @@ SHL1USE_EXPORTS=name SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET) SHL1STDLIBS= \ - $(AVMEDIALIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(GOODIESLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(LNGLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(AVMEDIALIB) \ + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(FWELIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(I18NPAPERLIB) \ + $(ICUUCLIB) \ + $(LNGLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) @@ -162,29 +163,29 @@ SHL2DEPN=$(SHL1TARGETN) SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET) SHL2STDLIBS= \ - $(SVXCORELIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(GOODIESLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(ICUUCLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(SVXCORELIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ + $(XMLSCRIPTLIB) \ .IF "$(GUI)"=="WNT" SHL2STDLIBS+=$(SHELLLIB) @@ -219,8 +220,7 @@ SRSFILELIST=\ $(SRS)$/svxlink.srs \ $(SRS)$/accessibility.srs \ $(SRS)$/table.srs \ - $(SRS)$/toolbars.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/toolbars.srs RESLIB1NAME=svx RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw |