Commits

Anonymous committed 8b175a2

#i115372# - More special handling for Windows file system root. Properly initialze document templates before first usage.

Comments (0)

Files changed (4)

fpicker/source/office/OfficeFilePicker.src

     Text [ en-US ] = "Places";
 };
 
+String STR_SVT_FILEPICKER_WORKPLACE
+{
+    Text [ en-US ] = "Workplace" ;
+};
+
 String STR_SVT_FOLDERPICKER_DEFAULT_TITLE
 {
     Text [ en-US ] = "Select Path" ;

fpicker/source/office/iodlg.cxx

 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XDocumentTemplates.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
             sText = rURL;
 
         if ( sText.EqualsAscii( "\\\\.\\" ) ) // Windows file system root?
-             sText.Erase(); // do not display technical stuff that is not understandable by normal users.
+             sText = SvtResId( STR_SVT_FILEPICKER_WORKPLACE ); // do not display technical stuff that is not understandable by normal users.
 
         _pImp->_pFtCurrentPath->SetText( sText );
     }
 {
     String aURL( _pPlacesWin->GetSelectedIconURL() );
     if ( aURL.Len() )
+    {
+        // Hack: Initialize document templates for first time usage. Otherwise Templates
+        // folder would be empty until user has opened "file/new/templates and documents".
+        if ( aURL.EqualsIgnoreCaseAscii( "vnd.sun.star.hier:/templates/", 0, 29 ) )
+        {
+            try
+            {
+                Reference< XDocumentTemplates > xTemplates(
+                    ::comphelper::getProcessServiceFactory()->createInstance(
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.frame.DocumentTemplates" ) ) ),
+                    UNO_QUERY );
+                if ( xTemplates.is() )
+                    xTemplates->getContent();
+            }
+            catch ( Exception const & )
+            {
+                // Not a serious issue.
+            }
+
+        }
         OpenURL_Impl( aURL );
-
+    }
     return 0;
 }
 

fpicker/source/office/iodlgimp.cxx

 #include <unotools/localfilehelper.hxx>
 #include "unotools/useroptions.hxx"
 #include "rtl/instance.hxx"
-#include <svl/svl.hrc>
+#include <svtools/svtools.hrc>
 
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR
     {
         ResMgr * operator ()()
         {
-            return ResMgr::CreateResMgr (CREATEVERSIONRESMGR_NAME(svl));
+            return ResMgr::CreateResMgr (CREATEVERSIONRESMGR_NAME(fps_office));
         }
         static ResMgr * getOrCreate()
         {
         }
     };
 
-    struct SvtSimpleResId : public ResId
+    struct SvtResId : public ResId
     {
-        SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
             if ( nCount == 1 )
             {
                 // adjust the title of the top level entry (the workspace)
-                _pMenu->SetItemText( --nItemId, SvtSimpleResId( STR_SVT_MIMETYPE_CNT_FSYSBOX ) );
+                _pMenu->SetItemText( --nItemId, SvtResId( STR_SVT_FILEPICKER_WORKPLACE ) );
             }
         }
 
             Image aImage = SvFileInformationManager::GetImage(
                 INetURLObject( rURL ), bIsHighContrast );
             if ( LocalFileHelper::ConvertURLToSystemPath( rURL, sDisplayName ) )
+            {
+                if ( sDisplayName.EqualsAscii( "\\\\.\\" ) ) // Windows file system root?
+                    sDisplayName = SvtResId( STR_SVT_FILEPICKER_WORKPLACE ); // do not display technical stuff that is not understandable by normal users.
                 _pMenu->InsertItem( nItemId, sDisplayName, aImage );
+            }
             else
                 _pMenu->InsertItem( nItemId, rURL, aImage );
         }

svtools/inc/svtools/svtools.hrc

 /*************************************************************************
  *
  * 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
 #define STR_SVT_NEW_FOLDER              (RID_SVTOOLS_START + 30)
 #define STR_SVT_ALREADYEXISTOVERWRITE   (RID_SVTOOLS_START + 31)
 #define STR_SVT_FILEVIEW_COLUMN_TYPE    (RID_SVTOOLS_START + 32)
-#define RID_FILEVIEW_CONTEXTMENU	    (RID_SVTOOLS_START + 33)
+#define RID_FILEVIEW_CONTEXTMENU        (RID_SVTOOLS_START + 33)
 #define RID_FILEOPEN_INVALIDFOLDER		(RID_SVTOOLS_START + 34)
 #define RID_FILEOPEN_NOTEXISTENTFILE	(RID_SVTOOLS_START + 35)
 #define STR_SVT_NOREMOVABLEDEVICE       (RID_SVTOOLS_START + 36)
 
 #define CONFIG_BASIC_FORMAT_START		(RID_SVTOOLS_START+102)
 #define STR_BASICKEY_FORMAT_ON			(RID_SVTOOLS_START+103)
-#define STR_BASICKEY_FORMAT_OFF 		(RID_SVTOOLS_START+104)
-#define STR_BASICKEY_FORMAT_YES 		(RID_SVTOOLS_START+105)
+#define STR_BASICKEY_FORMAT_OFF         (RID_SVTOOLS_START+104)
+#define STR_BASICKEY_FORMAT_YES         (RID_SVTOOLS_START+105)
 #define STR_BASICKEY_FORMAT_NO			(RID_SVTOOLS_START+106)
 #define STR_BASICKEY_FORMAT_TRUE		(RID_SVTOOLS_START+107)
 #define STR_BASICKEY_FORMAT_FALSE		(RID_SVTOOLS_START+108)
-#define CONFIG_BASIC_FORMAT_END 		(RID_SVTOOLS_START+109)
+#define CONFIG_BASIC_FORMAT_END         (RID_SVTOOLS_START+109)
 #define STR_UNDO                        (RID_SVTOOLS_START+110)
 #define STR_REDO                        (RID_SVTOOLS_START+111)
 #define STR_REPEAT                      (RID_SVTOOLS_START+112)
 #define STR_TRYBUY						(RID_SVTOOLS_START+122)
 #define STR_PVER_LANGUAGECODE			(RID_SVTOOLS_START+124)
 #define STR_PVER_LONG_LANGUAGECODE		(RID_SVTOOLS_START+125)
-#define STR_INVALIDPUFF 				(RID_SVTOOLS_START+126)
-#define STR_LIMITEDPUFF 				(RID_SVTOOLS_START+127)
+#define STR_INVALIDPUFF                 (RID_SVTOOLS_START+126)
+#define STR_LIMITEDPUFF                 (RID_SVTOOLS_START+127)
 #define STR_OLDLIMITEDPUFF				(RID_SVTOOLS_START+128)
-#define RID_REGISTER_DIALOG 			(RID_SVTOOLS_START+129)
+#define RID_REGISTER_DIALOG             (RID_SVTOOLS_START+129)
 #define STR_BASICKEY_FORMAT_CURRENCY	(RID_SVTOOLS_START+130)
-#define STR_KEYERR_GENERAL_HELP 		(RID_SVTOOLS_START+131)
+#define STR_KEYERR_GENERAL_HELP         (RID_SVTOOLS_START+131)
 #define STR_KEYERR_INVALID_KEY			(RID_SVTOOLS_START+132)
-#define STR_KEYERR_INVALID_USERDATA 	(RID_SVTOOLS_START+133)
+#define STR_KEYERR_INVALID_USERDATA     (RID_SVTOOLS_START+133)
 #define STR_KEYERR_INVALID_ADDRESSDATA	(RID_SVTOOLS_START+134)
 #define STR_KEYERR_INVALID_LICENSE		(RID_SVTOOLS_START+135)
-#define STR_KEYERR_INVALID_LANGUAGE 	(RID_SVTOOLS_START+136)
+#define STR_KEYERR_INVALID_LANGUAGE     (RID_SVTOOLS_START+136)
 #define STR_KEYERR_INVALID_OS			(RID_SVTOOLS_START+137)
 #define STR_KEYERR_INVALID_NO_CNR		(RID_SVTOOLS_START+138)
 #define STR_KEYERR_INVALID_CNR			(RID_SVTOOLS_START+139)
 
 #define STR_SVT_PRNDLG_START				(RID_SVTOOLS_START+141)
 #define DLG_SVT_PRNDLG_PRNSETUPDLG			(STR_SVT_PRNDLG_START+0)
-#define DLG_SVT_PRNDLG_PRINTDLG 			(STR_SVT_PRNDLG_START+1)
+#define DLG_SVT_PRNDLG_PRINTDLG             (STR_SVT_PRNDLG_START+1)
 #define STR_SVT_PRNDLG_READY				(STR_SVT_PRNDLG_START+2)
 #define STR_SVT_PRNDLG_PAUSED				(STR_SVT_PRNDLG_START+3)
 #define STR_SVT_PRNDLG_PENDING				(STR_SVT_PRNDLG_START+4)
-#define STR_SVT_PRNDLG_BUSY 				(STR_SVT_PRNDLG_START+5)
-#define STR_SVT_PRNDLG_INITIALIZING 		(STR_SVT_PRNDLG_START+6)
+#define STR_SVT_PRNDLG_BUSY                 (STR_SVT_PRNDLG_START+5)
+#define STR_SVT_PRNDLG_INITIALIZING         (STR_SVT_PRNDLG_START+6)
 #define STR_SVT_PRNDLG_WAITING				(STR_SVT_PRNDLG_START+7)
 #define STR_SVT_PRNDLG_WARMING_UP			(STR_SVT_PRNDLG_START+8)
 #define STR_SVT_PRNDLG_PROCESSING			(STR_SVT_PRNDLG_START+9)
-#define STR_SVT_PRNDLG_PRINTING 			(STR_SVT_PRNDLG_START+10)
+#define STR_SVT_PRNDLG_PRINTING             (STR_SVT_PRNDLG_START+10)
 #define STR_SVT_PRNDLG_OFFLINE				(STR_SVT_PRNDLG_START+11)
 #define STR_SVT_PRNDLG_ERROR				(STR_SVT_PRNDLG_START+12)
 #define STR_SVT_PRNDLG_SERVER_UNKNOWN		(STR_SVT_PRNDLG_START+13)
 #define STR_SVT_PRNDLG_IO_ACTIVE			(STR_SVT_PRNDLG_START+18)
 #define STR_SVT_PRNDLG_OUTPUT_BIN_FULL		(STR_SVT_PRNDLG_START+19)
 #define STR_SVT_PRNDLG_TONER_LOW			(STR_SVT_PRNDLG_START+20)
-#define STR_SVT_PRNDLG_NO_TONER 			(STR_SVT_PRNDLG_START+21)
+#define STR_SVT_PRNDLG_NO_TONER             (STR_SVT_PRNDLG_START+21)
 #define STR_SVT_PRNDLG_PAGE_PUNT			(STR_SVT_PRNDLG_START+22)
 #define STR_SVT_PRNDLG_USER_INTERVENTION	(STR_SVT_PRNDLG_START+23)
 #define STR_SVT_PRNDLG_OUT_OF_MEMORY		(STR_SVT_PRNDLG_START+24)
 #define STR_SVT_PRNDLG_DOOR_OPEN			(STR_SVT_PRNDLG_START+25)
 #define STR_SVT_PRNDLG_POWER_SAVE			(STR_SVT_PRNDLG_START+26)
 #define STR_SVT_PRNDLG_DEFPRINTER			(STR_SVT_PRNDLG_START+27)
-#define STR_SVT_PRNDLG_JOBCOUNT 			(STR_SVT_PRNDLG_START+28)
+#define STR_SVT_PRNDLG_JOBCOUNT             (STR_SVT_PRNDLG_START+28)
 #define STR_SVT_PRNDLG_END					(RID_IMG_PRNDLG_NOCOLLATE_HC)
 
 #define STR_SVT_CALENDAR_START				(STR_SVT_PRNDLG_END+1)
 #define STR_SVT_PVER_PERSONAL				(STR_SVT_PVER_START+2)
 #define STR_SVT_PVER_PROFESSIONAL			(STR_SVT_PVER_START+3)
 #define STR_SVT_PVER_BUSINESS				(STR_SVT_PVER_START+4)
-#define STR_SVT_PVER_ENTERPRICE 			(STR_SVT_PVER_START+5)
+#define STR_SVT_PVER_ENTERPRICE             (STR_SVT_PVER_START+5)
 #define STR_SVT_PVER_EDUCATION				(STR_SVT_PVER_START+6)
 #define STR_SVT_PVER_DEMO					(STR_SVT_PVER_START+7)
 #define STR_SVT_PVER_BETA					(STR_SVT_PVER_START+8)
 #define STR_SVT_PVER_OEM					(STR_SVT_PVER_START+9)
-#define STR_SVT_PVER_NOT_REGISTERED 		(STR_SVT_PVER_START+10)
+#define STR_SVT_PVER_NOT_REGISTERED         (STR_SVT_PVER_START+10)
 #define STR_SVT_PVER_PILOT					(STR_SVT_PVER_START+11)
-#define STR_SVT_PVER_CAMPUS 				(STR_SVT_PVER_START+12)
-#define STR_SVT_PVER_EVALUATION 			(STR_SVT_PVER_START+13)
+#define STR_SVT_PVER_CAMPUS                 (STR_SVT_PVER_START+12)
+#define STR_SVT_PVER_EVALUATION             (STR_SVT_PVER_START+13)
 #define STR_SVT_PVER_PARTNER				(STR_SVT_PVER_START+14)
 #define STR_SVT_PVER_SMALLBUSINESS			(STR_SVT_PVER_START+15)
 #define STR_SVT_PVER_OEM_PROFESSIONAL		(STR_SVT_PVER_START+16)
 #define STR_SVT_PVER_END					(STR_SVT_PVER_OEM_PROFESSIONAL)
 
-#define STR_SVT_STYLE_START 				(STR_SVT_PVER_END+1)
-#define STR_SVT_STYLE_LIGHT 				(STR_SVT_STYLE_START+0)
+#define STR_SVT_STYLE_START                 (STR_SVT_PVER_END+1)
+#define STR_SVT_STYLE_LIGHT                 (STR_SVT_STYLE_START+0)
 #define STR_SVT_STYLE_LIGHT_ITALIC			(STR_SVT_STYLE_START+1)
 #define STR_SVT_STYLE_NORMAL				(STR_SVT_STYLE_START+2)
-#define STR_SVT_STYLE_NORMAL_ITALIC 		(STR_SVT_STYLE_START+3)
+#define STR_SVT_STYLE_NORMAL_ITALIC         (STR_SVT_STYLE_START+3)
 #define STR_SVT_STYLE_BOLD					(STR_SVT_STYLE_START+4)
 #define STR_SVT_STYLE_BOLD_ITALIC			(STR_SVT_STYLE_START+5)
-#define STR_SVT_STYLE_BLACK 				(STR_SVT_STYLE_START+6)
+#define STR_SVT_STYLE_BLACK                 (STR_SVT_STYLE_START+6)
 #define STR_SVT_STYLE_BLACK_ITALIC			(STR_SVT_STYLE_START+7)
 #define STR_SVT_STYLE_END					(STR_SVT_STYLE_BLACK_ITALIC)
 
 #define STR_SVT_FONTMAP_START				(STR_SVT_STYLE_END+1)
 #define STR_SVT_FONTMAP_BOTH				(STR_SVT_FONTMAP_START+0)
-#define STR_SVT_FONTMAP_PRINTERONLY 		(STR_SVT_FONTMAP_START+1)
+#define STR_SVT_FONTMAP_PRINTERONLY         (STR_SVT_FONTMAP_START+1)
 #define STR_SVT_FONTMAP_SCREENONLY			(STR_SVT_FONTMAP_START+2)
 #define STR_SVT_FONTMAP_SIZENOTAVAILABLE	(STR_SVT_FONTMAP_START+3)
 #define STR_SVT_FONTMAP_STYLENOTAVAILABLE	(STR_SVT_FONTMAP_START+4)
 #define STR_SVT_FONTMAP_NOTAVAILABLE		(STR_SVT_FONTMAP_START+5)
-#define STR_SVT_FONTMAP_END 				(STR_SVT_FONTMAP_NOTAVAILABLE)
+#define STR_SVT_FONTMAP_END                 (STR_SVT_FONTMAP_NOTAVAILABLE)
 
 #define STR_SVT_ERRORCONTEXT_START			(STR_SVT_FONTMAP_END+1)
-#define STR_ERR_HDLMESS					    (STR_SVT_ERRORCONTEXT_START+0)
-#define RID_ERRHDL_CLASS        			(STR_SVT_ERRORCONTEXT_START+1)
+#define STR_ERR_HDLMESS                         (STR_SVT_ERRORCONTEXT_START+0)
+#define RID_ERRHDL_CLASS                    (STR_SVT_ERRORCONTEXT_START+1)
 #define RID_ERRCTX                          (STR_SVT_ERRORCONTEXT_START+2)
 #define RID_ERRHDL                          (STR_SVT_ERRORCONTEXT_START+3)
 #define STR_SVT_ERRORCONTEXT_END			(RID_ERRHDL)
 #define STR_WIZDLG_ROADMAP_TITLE            (STR_WIZARDDIALOG_START + 3)
 #define STR_WIZARDDIALOG_END				(STR_WIZDLG_ROADMAP_TITLE)
 
-#define STR_SVT_COLLATE_START 				(STR_WIZARDDIALOG_END+1)
+#define STR_SVT_COLLATE_START               (STR_WIZARDDIALOG_END+1)
 #define STR_SVT_COLLATE_NORMAL				(STR_SVT_COLLATE_START+0)
 #define STR_SVT_COLLATE_DICTIONARY			(STR_SVT_COLLATE_START+1)
 #define STR_SVT_COLLATE_PINYIN				(STR_SVT_COLLATE_START+2)
 #define STR_SVT_COLLATE_RADICAL				(STR_SVT_COLLATE_START+4)
 #define STR_SVT_COLLATE_CHARSET				(STR_SVT_COLLATE_START+5)
 #define STR_SVT_COLLATE_ZHUYIN				(STR_SVT_COLLATE_START+6)
-#define STR_SVT_COLLATE_ALPHANUMERIC 		(STR_SVT_COLLATE_START+7)
+#define STR_SVT_COLLATE_ALPHANUMERIC        (STR_SVT_COLLATE_START+7)
 #define STR_SVT_COLLATE_UNICODE				(STR_SVT_COLLATE_START+8)
 #define STR_SVT_COLLATE_PHONEBOOK			(STR_SVT_COLLATE_START+9)
 #define STR_SVT_COLLATE_PHONETIC_F			(STR_SVT_COLLATE_START+10)
 #define STR_SVT_COLLATE_PHONETIC_L			(STR_SVT_COLLATE_START+11)
-#define STR_SVT_COLLATE_END 				(STR_SVT_COLLATE_PHONETIC_L)
+#define STR_SVT_COLLATE_END                 (STR_SVT_COLLATE_PHONETIC_L)
 
-#define STR_SVT_FILEPICKER_START 					(STR_SVT_COLLATE_END+1)
+#define STR_SVT_FILEPICKER_START                    (STR_SVT_COLLATE_END+1)
 #define STR_SVT_FILEPICKER_AUTO_EXTENSION			(STR_SVT_FILEPICKER_START+ 0)
 #define STR_SVT_FILEPICKER_PASSWORD					(STR_SVT_FILEPICKER_START+ 1)
 #define STR_SVT_FILEPICKER_FILTER_OPTIONS			(STR_SVT_FILEPICKER_START+ 2)
 #define STR_SVT_FILEPICKER_IMAGE_TEMPLATE			(STR_SVT_FILEPICKER_START+ 9)
 #define STR_SVT_FILEPICKER_SELECTION				(STR_SVT_FILEPICKER_START+10)
 #define STR_SVT_FILEPICKER_FILTER_TITLE				(STR_SVT_FILEPICKER_START+11)
-#define STR_SVT_FILEPICKER_PLACES           		(STR_SVT_FILEPICKER_START+12)
-#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE			(STR_SVT_FILEPICKER_START+13)
-#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION	(STR_SVT_FILEPICKER_START+14)
-#define STR_SVT_FILEPICKER_END 						(STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
+#define STR_SVT_FILEPICKER_PLACES                   (STR_SVT_FILEPICKER_START+12)
+#define STR_SVT_FILEPICKER_WORKPLACE                (STR_SVT_FILEPICKER_START+13)
+#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE			(STR_SVT_FILEPICKER_START+14)
+#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION	(STR_SVT_FILEPICKER_START+15)
+#define STR_SVT_FILEPICKER_END                          (STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
 
 // String-Ids for accessibility
 #define STR_SVT_ACC_BEGIN					(STR_SVT_FILEPICKER_END+1)
 //remain the same.
 #define STR_SVT_JAVAERROR_START             (STR_SVT_INDEXENTRY_END + 1)
 #define STR_QUESTION_JAVADISABLED			(STR_SVT_JAVAERROR_START+0)
-#define STR_ERROR_JVMCREATIONFAILED		    (STR_SVT_JAVAERROR_START+1)
+#define STR_ERROR_JVMCREATIONFAILED             (STR_SVT_JAVAERROR_START+1)
 #define STR_WARNING_JAVANOTFOUND            (STR_SVT_JAVAERROR_START+2)
 #define STR_WARNING_INVALIDJAVASETTINGS     (STR_SVT_JAVAERROR_START+3)
 #define STR_ERROR_RESTARTREQUIRED           (STR_SVT_JAVAERROR_START+4)
-#define STR_SVT_JAVAERROR_END               (STR_ERROR_RESTARTREQUIRED)  
+#define STR_SVT_JAVAERROR_END               (STR_ERROR_RESTARTREQUIRED)
 
 // String array to match UI language names to LanguageType values and vice versa
 #define STR_ARR_SVT_LANGUAGE_TABLE_START    (STR_SVT_JAVAERROR_END + 1)
 // dialogs
 #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_TITLE                (DLG_EXPORT_START+1)
 #define DLG_EXPORT_END					(DLG_EXPORT_TITLE)
 
 #define DLG_LOGIN						(RID_SVTOOLS_START+113)
 //.............................................................................
 // bitmaps
 
-#define BMP_DEMO_FINGER 				(RID_SVTOOLS_BITMAP_START +   0)
+#define BMP_DEMO_FINGER                 (RID_SVTOOLS_BITMAP_START +   0)
 #define BMP_HELP_AGENT_IMAGE			(RID_SVTOOLS_BITMAP_START +   1)
 #define BMP_HELP_AGENT_CLOSER			(RID_SVTOOLS_BITMAP_START +   2)
 #define BMP_PLUGIN                      (RID_SVTOOLS_BITMAP_START +   3)
 // image lists
 
 #define RID_IMG_EXPANDER							(RID_SVTOOLS_IMAGELIST_START +  0)
-#define RID_SVTOOLS_IMAGELIST_BIG           		(RID_SVTOOLS_IMAGELIST_START +  1)
-#define RID_SVTOOLS_IMAGELIST_SMALL         		(RID_SVTOOLS_IMAGELIST_START +  2)
+#define RID_SVTOOLS_IMAGELIST_BIG                   (RID_SVTOOLS_IMAGELIST_START +  1)
+#define RID_SVTOOLS_IMAGELIST_SMALL                 (RID_SVTOOLS_IMAGELIST_START +  2)
 #define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX			(RID_SVTOOLS_IMAGELIST_START +  3)
 #define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST		(RID_SVTOOLS_IMAGELIST_START +  4)
 #define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST	(RID_SVTOOLS_IMAGELIST_START +  5)
 //These strings come from project desktop
 //There was no time for translation, therefore the defines needed to
 //remain the same.
-#define QBX_JAVADISABLED	         		(RID_SVTOOLS_START+20)
-#define ERRORBOX_JVMCREATIONFAILED  		(RID_SVTOOLS_START+21)
+#define QBX_JAVADISABLED                    (RID_SVTOOLS_START+20)
+#define ERRORBOX_JVMCREATIONFAILED          (RID_SVTOOLS_START+21)
 #define WARNINGBOX_JAVANOTFOUND             (RID_SVTOOLS_START+22)
 #define WARNINGBOX_INVALIDJAVASETTINGS      (RID_SVTOOLS_START+23)
 #define ERRORBOX_RESTARTREQUIRED            (RID_SVTOOLS_START+24)
 #define RID_IMG_TREENODE_COLLAPSED_HC	(RID_SVTOOLS_START +  2)
 #define RID_IMG_TREENODE_EXPANDED_HC	(RID_SVTOOLS_START +  3)
 
-#define RID_IMG_PRINTERFONT 			(RID_SVTOOLS_START + 12)
+#define RID_IMG_PRINTERFONT             (RID_SVTOOLS_START + 12)
 #define RID_IMG_BITMAPFONT				(RID_SVTOOLS_START + 13)
 #define RID_IMG_SCALABLEFONT			(RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC 			(RID_SVTOOLS_START + 15)
+#define RID_IMG_PRINTERFONT_HC              (RID_SVTOOLS_START + 15)
 #define RID_IMG_BITMAPFONT_HC			(RID_SVTOOLS_START + 16)
 #define RID_IMG_SCALABLEFONT_HC			(RID_SVTOOLS_START + 17)
 
 #endif	// #ifndef _SVTOOLS_HRC
 
 // ******************************************************************* EOF
-