diff options
Diffstat (limited to 'cui/source')
308 files changed, 2933 insertions, 6684 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 80847fd8ae27..4b955b653cd4 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - //----------------------------------------------- // include own files @@ -42,6 +40,8 @@ #include <sfx2/sfxresid.hxx> #include <svl/stritem.hxx> +#include <sal/macros.h> + #include "cuires.hrc" #include "acccfg.hrc" @@ -54,13 +54,10 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/form/XReset.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -94,25 +91,25 @@ using namespace com::sun::star; // definitions //----------------------------------------------- -static ::rtl::OUString SERVICE_STORAGEFACTORY = ::rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory" ); -static ::rtl::OUString SERVICE_UICONFIGMGR = ::rtl::OUString::createFromAscii("com.sun.star.ui.UIConfigurationManager" ); -static ::rtl::OUString SERVICE_DESKTOP = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop" ); -static ::rtl::OUString SERVICE_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager" ); -static ::rtl::OUString SERVICE_GLOBALACCCFG = ::rtl::OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration" ); -static ::rtl::OUString SERVICE_MODULEUICONFIGSUPPLIER = ::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); -static ::rtl::OUString SERVICE_UICMDDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription" ); +static ::rtl::OUString SERVICE_STORAGEFACTORY (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory" )); +static ::rtl::OUString SERVICE_UICONFIGMGR (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager" )); +static ::rtl::OUString SERVICE_DESKTOP (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" )); +static ::rtl::OUString SERVICE_MODULEMANAGER (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager" )); +static ::rtl::OUString SERVICE_GLOBALACCCFG (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration" )); +static ::rtl::OUString SERVICE_MODULEUICONFIGSUPPLIER (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")); +static ::rtl::OUString SERVICE_UICMDDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription" )); -static ::rtl::OUString MODULEPROP_SHORTNAME = ::rtl::OUString::createFromAscii("ooSetupFactoryShortName" ); -static ::rtl::OUString MODULEPROP_UINAME = ::rtl::OUString::createFromAscii("ooSetupFactoryUIName" ); -static ::rtl::OUString CMDPROP_UINAME = ::rtl::OUString::createFromAscii("Name" ); +static ::rtl::OUString MODULEPROP_SHORTNAME (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName" )); +static ::rtl::OUString MODULEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryUIName" )); +static ::rtl::OUString CMDPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("Name" )); -static ::rtl::OUString FOLDERNAME_UICONFIG = ::rtl::OUString::createFromAscii("Configurations2" ); +static ::rtl::OUString FOLDERNAME_UICONFIG (RTL_CONSTASCII_USTRINGPARAM("Configurations2" )); -static ::rtl::OUString MEDIATYPE_PROPNAME = ::rtl::OUString::createFromAscii("MediaType" ); -static ::rtl::OUString MEDIATYPE_UICONFIG = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.ui.configuration" ); +static ::rtl::OUString MEDIATYPE_PROPNAME (RTL_CONSTASCII_USTRINGPARAM("MediaType" )); +static ::rtl::OUString MEDIATYPE_UICONFIG (RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.ui.configuration" )); //----------------------------------------------- -static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = +static sal_uInt16 KEYCODE_ARRAY[] = { KEY_F1 , KEY_F2 , @@ -126,6 +123,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 , KEY_F11 , KEY_F12 , + KEY_F13 , + KEY_F14 , + KEY_F15 , + KEY_F16 , KEY_DOWN , KEY_UP , @@ -166,6 +167,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_SHIFT, KEY_F11 | KEY_SHIFT, KEY_F12 | KEY_SHIFT, + KEY_F13 | KEY_SHIFT, + KEY_F14 | KEY_SHIFT, + KEY_F15 | KEY_SHIFT, + KEY_F16 | KEY_SHIFT, KEY_DOWN | KEY_SHIFT, KEY_UP | KEY_SHIFT, @@ -218,6 +223,9 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_MOD1 , KEY_Y | KEY_MOD1 , KEY_Z | KEY_MOD1 , + KEY_SEMICOLON | KEY_MOD1 , + KEY_BRACKETLEFT | KEY_MOD1 , + KEY_BRACKETRIGHT | KEY_MOD1, KEY_F1 | KEY_MOD1 , KEY_F2 | KEY_MOD1 , @@ -231,6 +239,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_MOD1 , KEY_F11 | KEY_MOD1 , KEY_F12 | KEY_MOD1 , + KEY_F13 | KEY_MOD1 , + KEY_F14 | KEY_MOD1 , + KEY_F15 | KEY_MOD1 , + KEY_F16 | KEY_MOD1 , KEY_DOWN | KEY_MOD1 , KEY_UP | KEY_MOD1 , @@ -287,6 +299,9 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD1, KEY_Y | KEY_SHIFT | KEY_MOD1, KEY_Z | KEY_SHIFT | KEY_MOD1, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 , + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 , + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1, KEY_F1 | KEY_SHIFT | KEY_MOD1, KEY_F2 | KEY_SHIFT | KEY_MOD1, @@ -300,6 +315,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_SHIFT | KEY_MOD1, KEY_F11 | KEY_SHIFT | KEY_MOD1, KEY_F12 | KEY_SHIFT | KEY_MOD1, + KEY_F13 | KEY_SHIFT | KEY_MOD1, + KEY_F14 | KEY_SHIFT | KEY_MOD1, + KEY_F15 | KEY_SHIFT | KEY_MOD1, + KEY_F16 | KEY_SHIFT | KEY_MOD1, KEY_DOWN | KEY_SHIFT | KEY_MOD1, KEY_UP | KEY_SHIFT | KEY_MOD1, @@ -351,6 +370,9 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_MOD2 , KEY_Y | KEY_MOD2 , KEY_Z | KEY_MOD2 , + KEY_SEMICOLON | KEY_MOD2 , + KEY_BRACKETLEFT | KEY_MOD2 , + KEY_BRACKETRIGHT | KEY_MOD2, KEY_F1 | KEY_MOD2 , KEY_F2 | KEY_MOD2 , @@ -364,6 +386,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_MOD2 , KEY_F11 | KEY_MOD2 , KEY_F12 | KEY_MOD2 , + KEY_F13 | KEY_MOD2 , + KEY_F14 | KEY_MOD2 , + KEY_F15 | KEY_MOD2 , + KEY_F16 | KEY_MOD2 , KEY_DOWN | KEY_MOD2 , KEY_UP | KEY_MOD2 , @@ -415,6 +441,9 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD2, KEY_Y | KEY_SHIFT | KEY_MOD2, KEY_Z | KEY_SHIFT | KEY_MOD2, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 , + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 , + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD2, @@ -428,6 +457,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_SHIFT | KEY_MOD2, KEY_F11 | KEY_SHIFT | KEY_MOD2, KEY_F12 | KEY_SHIFT | KEY_MOD2, + KEY_F13 | KEY_SHIFT | KEY_MOD2, + KEY_F14 | KEY_SHIFT | KEY_MOD2, + KEY_F15 | KEY_SHIFT | KEY_MOD2, + KEY_F16 | KEY_SHIFT | KEY_MOD2, KEY_DOWN | KEY_SHIFT | KEY_MOD2, KEY_UP | KEY_SHIFT | KEY_MOD2, @@ -492,6 +525,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_MOD1 | KEY_MOD2 , KEY_F11 | KEY_MOD1 | KEY_MOD2 , KEY_F12 | KEY_MOD1 | KEY_MOD2 , + KEY_F13 | KEY_MOD1 | KEY_MOD2 , + KEY_F14 | KEY_MOD1 | KEY_MOD2 , + KEY_F15 | KEY_MOD1 | KEY_MOD2 , + KEY_F16 | KEY_MOD1 | KEY_MOD2 , KEY_DOWN | KEY_MOD1 | KEY_MOD2 , KEY_UP | KEY_MOD1 | KEY_MOD2 , @@ -543,6 +580,9 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, @@ -556,6 +596,10 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_F10 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F11 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F12 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_F13 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_F14 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_F15 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_F16 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_DOWN | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_UP | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, @@ -572,7 +616,7 @@ static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] = KEY_DELETE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2 }; -static sal_uInt16 KEYCODE_ARRAY_SIZE = (sizeof(KEYCODE_ARRAY) / sizeof(KEYCODE_ARRAY[0])); +static sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY); //----------------------------------------------- // seems to be needed to layout the list box, which shows all @@ -619,11 +663,6 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos , sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry ) { - /*/ ??? realy needed !!! - Font aOldFont(rDevice.GetFont()); - Font aNewFont(aOldFont ); - rDevice.SetFont( aFont ); - */ if (!pEntry) return; @@ -637,7 +676,6 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos , else rDevice.DrawCtrlText(aPos, GetText(), 0, STRING_LEN, TEXT_DRAW_DISABLE); - //rDev.SetFont( aOldFont ); } //----------------------------------------------- @@ -1536,3 +1574,5 @@ SvxShortcutAssignDlg::~SvxShortcutAssignDlg() // .uno:InsertSymbol?Symbols:string=bla + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc index d358b757949c..eaa39b11e97b 100644 --- a/cui/source/customize/acccfg.hrc +++ b/cui/source/customize/acccfg.hrc @@ -26,50 +26,43 @@ ************************************************************************/ #define GRP_FUNCTIONS 22 -#define BTN_ACC_OK 1 -#define BTN_ACC_CANCEL 2 -#define BTN_ACC_CHANGE 3 -#define BTN_ACC_REMOVE 4 -#define BOX_ACC_ENTRIES 5 -#define TXT_ACC_DESCRIPTIONTEXT 6 -#define TXT_ACC_DESCRIPTIONINFO 7 -#define GRP_ACC_KEYBOARD 8 -#define TXT_ACC_GROUP 9 -#define BOX_ACC_GROUP 10 -#define TXT_ACC_FUNCTION 11 -#define BOX_ACC_FUNCTION 12 -#define TXT_ACC_KEY 13 -#define BOX_ACC_KEY 14 -#define GRP_ACC_FUNCTIONS 15 -#define BTN_RESET 20 -#define BTN_LOAD 40 -#define BTN_SAVE 41 -#define RB_OFFICE 44 -#define RB_MODULE 45 -#define STR_LOADACCELCONFIG 46 -#define STR_SAVEACCELCONFIG 47 +#define BTN_ACC_OK 1 +#define BTN_ACC_CANCEL 2 +#define BTN_ACC_CHANGE 3 +#define BTN_ACC_REMOVE 4 +#define BOX_ACC_ENTRIES 5 +#define TXT_ACC_DESCRIPTIONTEXT 6 +#define TXT_ACC_DESCRIPTIONINFO 7 +#define GRP_ACC_KEYBOARD 8 +#define TXT_ACC_GROUP 9 +#define BOX_ACC_GROUP 10 +#define TXT_ACC_FUNCTION 11 +#define BOX_ACC_FUNCTION 12 +#define TXT_ACC_KEY 13 +#define BOX_ACC_KEY 14 +#define GRP_ACC_FUNCTIONS 15 +#define BTN_RESET 20 +#define BTN_LOAD 40 +#define BTN_SAVE 41 +#define RB_OFFICE 44 +#define RB_MODULE 45 +#define STR_LOADACCELCONFIG 46 +#define STR_SAVEACCELCONFIG 47 -#define IMG_HARDDISK 48 -#define IMG_HARDDISK_HC 49 -#define STR_PRODMACROS 50 -#define STR_MYMACROS 51 -#define IMG_LIB 52 -#define IMG_LIB_HC 53 -#define IMG_MACRO 54 -#define IMG_MACRO_HC 55 -#define IMG_DOC 56 -#define IMG_DOC_HC 57 -#define STR_GROUP_STYLES 58 -#define STR_PDF_EXPORT_SEND 59 -#define STR_RECHECK_DOCUMENT 60 -#define IMG_INFO 61 +#define IMG_HARDDISK 48 +#define STR_PRODMACROS 50 +#define STR_MYMACROS 51 +#define IMG_LIB 52 +#define IMG_MACRO 54 +#define IMG_DOC 56 +#define STR_GROUP_STYLES 58 +#define STR_PDF_EXPORT_SEND 59 +#define STR_RECHECK_DOCUMENT 60 +#define IMG_INFO 61 // FREE -#define BMP_COLLAPSED 63 -#define BMP_EXPANDED 64 -#define BMP_COLLAPSED_HC 65 -#define BMP_EXPANDED_HC 66 -#define STR_BASICMACROS 67 -#define STR_DLG_MACROS 68 -#define STR_HUMAN_APPNAME 69 -#define STR_FILTERNAME_CFG 70 - +#define BMP_COLLAPSED 63 +#define BMP_EXPANDED 64 +#define STR_BASICMACROS 67 +#define STR_DLG_MACROS 68 +#define STR_HUMAN_APPNAME 69 +#define STR_FILTERNAME_CFG 70 diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index a03fa9c3eb00..7e8322fc6eef 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -236,40 +236,21 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; }; MASKCOLOR }; - Image IMG_HARDDISK_HC - { - ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; }; - MASKCOLOR - }; Image IMG_LIB { ImageBitmap = Bitmap { File = "im30820.png"; }; MASKCOLOR }; - Image IMG_LIB_HC - { - ImageBitmap = Bitmap { File = "imh30820.png"; }; - MASKCOLOR - }; Image IMG_MACRO { ImageBitmap = Bitmap { File = "im30821.png"; }; MASKCOLOR }; - Image IMG_MACRO_HC - { - ImageBitmap = Bitmap { File = "imh30821.png"; }; - MASKCOLOR - }; Image IMG_DOC { ImageBitmap = Bitmap { File = "im30826.png"; }; MASKCOLOR }; - Image IMG_DOC_HC - { - ImageBitmap = Bitmap { File = "imh30826.png"; }; - MASKCOLOR }; Image BMP_COLLAPSED { @@ -277,7 +258,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX { File = "plus.bmp" ; }; - // MaskColor = Color { Predefine = COL_GREEN ; }; }; Image BMP_EXPANDED { @@ -285,72 +265,7 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX { File = "minus.bmp" ; }; - // MaskColor = Color { Predefine = COL_GREEN ; }; - }; - Image BMP_EXPANDED_HC - { - ImageBitmap = Bitmap - { - File = "minus_h.bmp" ; - }; - }; - Image BMP_COLLAPSED_HC - { - ImageBitmap = Bitmap - { - File = "plus_h.bmp" ; - }; }; }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 1da522170ab2..7ab975de6ce2 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,28 +26,15 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <stdlib.h> #include <time.h> -#ifndef _HELP_HXX //autogen #include <vcl/help.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/decoview.hxx> #include <vcl/toolbox.hxx> #include <vcl/scrbar.hxx> -//added for issue73355 -//#ifndef _SV_SVDATA_HXX -//#include <vcl/svdata.hxx> -//#endif -//issue73355 ends - #include <sfx2/app.hxx> #include <sfx2/sfxdlg.hxx> #include <sfx2/viewfrm.hxx> @@ -64,7 +52,6 @@ #include <toolkit/unohlp.hxx> #include <algorithm> -//add #include <cuires.hrc> #include "cfg.hrc" #include "helpid.hrc" @@ -76,9 +63,7 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#ifndef _UNOTOOLS_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> -#endif #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> @@ -91,9 +76,7 @@ #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIElement.hpp> -#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_ #include <com/sun/star/ui/UIElementType.hpp> -#endif #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> @@ -125,9 +108,9 @@ static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_"; static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; -static const char __FAR_DATA pSeparatorStr[] = +static const char pSeparatorStr[] = "----------------------------------"; -static const char __FAR_DATA pMenuSeparatorStr[] = " | "; +static const char pMenuSeparatorStr[] = " | "; #ifdef _MSC_VER #pragma warning (disable:4355) @@ -156,14 +139,14 @@ void printPropertySet( OSL_TRACE("printPropertySet: %d properties", aPropDetails.getLength()); - for ( sal_Int32 i = 0; i < aPropDetails.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aPropDetails.getLength(); ++i ) { OUString tmp; sal_Int32 ival; uno::Any a = xPropSet->getPropertyValue( aPropDetails[i].Name ); - if ( ( a >>= tmp ) /* && tmp.getLength() != 0 */ ) + if ( a >>= tmp ) { OSL_TRACE("%s: Got property: %s = %s", PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), PRTSTR(tmp)); @@ -185,7 +168,7 @@ void printProperties( const OUString& prefix, const uno::Sequence< beans::PropertyValue >& aProp ) { - for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProp.getLength(); ++i ) { OUString tmp; @@ -200,7 +183,7 @@ void printEntries(SvxEntries* entries) { SvxEntries::const_iterator iter = entries->begin(); - for ( ; iter != entries->end(); iter++ ) + for ( ; iter != entries->end(); ++iter ) { SvxConfigEntry* entry = *iter; @@ -229,7 +212,7 @@ OUString replaceSaveInName( const OUString& rSaveInName ) { OUString name; - OUString placeholder = OUString::createFromAscii( "%SAVE IN SELECTION%" ); + OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%SAVE IN SELECTION%" )); sal_Int32 pos = rMessage.indexOf( placeholder ); @@ -238,10 +221,6 @@ OUString replaceSaveInName( name = rMessage.replaceAt( pos, placeholder.getLength(), rSaveInName ); } - else - { - // don't change the message - } return name; } @@ -273,10 +252,10 @@ generateCustomName( { // find and replace the %n placeholder in the prefix string OUString name; - OUString placeholder = OUString::createFromAscii( "%n" ); + OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%n" )); sal_Int32 pos = prefix.indexOf( - OUString::createFromAscii( "%n" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "%n" )) ); if ( pos != -1 ) { @@ -301,7 +280,7 @@ generateCustomName( { break; } - iter++; + ++iter; } if ( iter != entries->end() ) @@ -323,8 +302,8 @@ OUString generateCustomURL( SvxEntries* entries ) { - OUString url = OUString::createFromAscii( ITEM_TOOLBAR_URL ); - url += OUString::createFromAscii( CUSTOM_TOOLBAR_STR ); + OUString url = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL )); + url += OUString(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_TOOLBAR_STR )); // use a random number to minimize possible clash with existing custom toolbars url += OUString::valueOf( sal_Int64( generateRandomValue() ), 16 ); @@ -341,7 +320,7 @@ generateCustomURL( { break; } - iter++; + ++iter; } if ( iter != entries->end() ) @@ -358,7 +337,7 @@ generateCustomMenuURL( SvxEntries* entries, sal_Int32 suffix = 1 ) { - OUString url = OUString::createFromAscii( CUSTOM_MENU_STR ); + OUString url(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_MENU_STR )); url += OUString::valueOf( suffix ); // now check is there is an already existing entry with this url @@ -373,7 +352,7 @@ generateCustomMenuURL( { break; } - iter++; + ++iter; } if ( iter != entries->end() ) @@ -399,13 +378,6 @@ void InitImageType() { theImageType |= css::ui::ImageType::SIZE_LARGE; } - - Window* topwin = Application::GetActiveTopWindow(); - if ( topwin != NULL && - topwin->GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - theImageType |= css::ui::ImageType::COLOR_HIGHCONTRAST; - } } sal_Int16 GetImageType() @@ -424,7 +396,7 @@ void RemoveEntry( SvxEntries* pEntries, SvxConfigEntry* pChildEntry ) pEntries->erase( iter ); break; } - iter++; + ++iter; } } @@ -433,8 +405,8 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) { OSL_TRACE("SupportsDocumentConfig: %s", PRTSTR(aModuleId)); - if ( aModuleId.equalsAscii( "com.sun.star.script.BasicIDE" ) - || aModuleId.equalsAscii( "com.sun.star.frame.Bibliography" ) + if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) ) + || aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.frame.Bibliography" ) ) ) { return sal_False; @@ -444,31 +416,31 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) OUString GetModuleName( const OUString& aModuleId ) { - if ( aModuleId.equalsAscii( "com.sun.star.text.TextDocument" ) || - aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) ) - return OUString::createFromAscii("Writer"); - else if ( aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) ) - return OUString::createFromAscii("Writer/Web"); - else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ) - return OUString::createFromAscii("Draw"); - else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ) - return OUString::createFromAscii("Impress"); - else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) ) - return OUString::createFromAscii("Calc"); - else if ( aModuleId.equalsAscii( "com.sun.star.script.BasicIDE" ) ) - return OUString::createFromAscii("Basic"); - else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) ) - return OUString::createFromAscii("Math"); - else if ( aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) ) - return OUString::createFromAscii("Relation Design"); - else if ( aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) ) - return OUString::createFromAscii("Query Design"); - else if ( aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) ) - return OUString::createFromAscii("Table Design"); - else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) ) - return OUString::createFromAscii("Data Source Browser" ); - else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) ) - return OUString::createFromAscii("Database" ); + if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) || + aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.script.BasicIDE" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design")); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DataSourceBrowser" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" )); + else if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.DatabaseDocument" ) ) ) + return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" )); return ::rtl::OUString(); } @@ -490,9 +462,9 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css:: if ( a >>= aSeq ) { OUString aUIName; - for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i ) { - if ( aSeq[i].Name.equalsAscii( "ooSetupFactoryUIName" )) + if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryUIName" ) )) { aSeq[i].Value >>= aModuleUIName; break; @@ -529,7 +501,7 @@ bool GetMenuItemData( uno::Sequence< beans::PropertyValue > aProp; if ( rItemContainer->getByIndex( nIndex ) >>= aProp ) { - for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProp.getLength(); ++i ) { if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL )) { @@ -574,7 +546,7 @@ bool GetToolbarItemData( uno::Sequence< beans::PropertyValue > aProp; if ( rItemContainer->getByIndex( nIndex ) >>= aProp ) { - for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProp.getLength(); ++i ) { if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL )) { @@ -651,7 +623,7 @@ ConvertSvxConfigEntry( uno::Sequence< beans::PropertyValue > tmpPropSeq; if ( a >>= tmpPropSeq ) { - for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); ++i ) { if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) ) { @@ -732,7 +704,7 @@ ConvertToolbarEntry( uno::Sequence< beans::PropertyValue > tmpPropSeq; if ( a >>= tmpPropSeq ) { - for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); ++i ) { if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) ) { @@ -796,9 +768,9 @@ SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet ) sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFrame ) { - static ::rtl::OUString SERVICENAME_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"); - static ::rtl::OUString SERVICENAME_DESKTOP = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop" ); - static ::rtl::OUString MODULEID_STARTMODULE = ::rtl::OUString::createFromAscii("com.sun.star.frame.StartModule" ); + static ::rtl::OUString SERVICENAME_MODULEMANAGER (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.ModuleManager") ); + static ::rtl::OUString SERVICENAME_DESKTOP (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.Desktop" ) ); + static ::rtl::OUString MODULEID_STARTMODULE (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.StartModule" ) ); try { @@ -851,7 +823,7 @@ SvxConfigDialog::SvxConfigDialog( { OUString text = ((const SfxStringItem*)pItem)->GetValue(); - if (text.indexOf(OUString::createFromAscii(ITEM_TOOLBAR_URL)) == 0) + if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0) { SetCurPageId( RID_SVXPAGE_TOOLBARS ); } @@ -924,7 +896,7 @@ SaveInData::SaveInData( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); xProps->getPropertyValue( - OUString::createFromAscii( "DefaultContext" )) + OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= m_xComponentContext; m_aSeparatorSeq.realloc( 1 ); @@ -986,7 +958,7 @@ uno::Reference< graphic::XGraphic > GetGraphic( if ( xImageManager.is() ) { - // TODO handle large and high contrast graphics + // TODO handle large graphics uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq; uno::Sequence< OUString > aImageCmdSeq( 1 ); @@ -1158,7 +1130,7 @@ bool MenuSaveInData::LoadSubMenus( if ( !xMenuSettings.is() ) return true; - for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ ) + for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); ++nIndex ) { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; @@ -1192,7 +1164,7 @@ bool MenuSaveInData::LoadSubMenus( uno::Sequence< beans::PropertyValue > aPropSeq; if ( a >>= aPropSeq ) { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aPropSeq.getLength(); ++i ) { if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) ) { @@ -1312,7 +1284,7 @@ void MenuSaveInData::Apply( SvxEntries::const_iterator iter = GetEntries()->begin(); SvxEntries::const_iterator end = GetEntries()->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntryData = *iter; @@ -1341,7 +1313,7 @@ void MenuSaveInData::ApplyMenu( SvxEntries::const_iterator iter = pMenuData->GetEntries()->begin(); SvxEntries::const_iterator end = pMenuData->GetEntries()->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntry = *iter; @@ -1443,7 +1415,7 @@ public: while ( n <= nHalfSize ) { rOutDev.DrawRect( Rectangle( nX+n, nY+n, nX+n, nY+nSize-n ) ); - n++; + ++n; } rOutDev.SetFillColor( aOldFillColor ); @@ -1710,7 +1682,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) OUString aModuleName = GetUIModuleName( aModuleId, xModuleManager ); OUString title = aTopLevelSeparator.GetText(); - OUString aSearchString = OUString::createFromAscii( "%MODULENAME" ); + OUString aSearchString(RTL_CONSTASCII_USTRINGPARAM( "%MODULENAME" )); sal_Int32 index = title.indexOf( aSearchString ); if ( index != -1 ) @@ -1748,7 +1720,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) OUString label; utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::PRODUCTNAME ) >>= label; - label += OUString::createFromAscii( " " ); + label += OUString(RTL_CONSTASCII_USTRINGPARAM( " " )); label += aModuleName; nPos = aSaveInListBox.InsertEntry( label ); @@ -1851,7 +1823,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) DBG_UNHANDLED_EXCEPTION(); } - for ( sal_Int32 i = 0; i < aFrameList.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aFrameList.getLength(); ++i ) { SaveInData* pData = NULL; uno::Reference < frame::XFrame > xf = aFrameList[i]; @@ -1984,7 +1956,7 @@ sal_Bool SvxConfigPage::FillItemSet( SfxItemSet& ) { bool result = sal_False; - for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); ++i ) { SaveInData* pData = (SaveInData*) aSaveInListBox.GetEntryData( i ); @@ -2044,7 +2016,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect ) SvxEntries::const_iterator iter = GetSaveInData()->GetEntries()->begin(); SvxEntries::const_iterator end = GetSaveInData()->GetEntries()->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntryData = *iter; sal_uInt16 nPos = aTopLevelListBox.InsertEntry( stripHotKey( pEntryData->GetName() ) ); @@ -2078,7 +2050,7 @@ void SvxConfigPage::AddSubMenusToUI( SvxEntries::const_iterator iter = pParentData->GetEntries()->begin(); SvxEntries::const_iterator end = pParentData->GetEntries()->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntryData = *iter; @@ -2102,7 +2074,7 @@ SvxEntries* SvxConfigPage::FindParentForChild( SvxEntries::const_iterator iter = pRootEntries->begin(); SvxEntries::const_iterator end = pRootEntries->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntryData = *iter; @@ -2160,7 +2132,7 @@ SvLBoxEntry* SvxConfigPage::AddFunction( return NULL; } - iter++; + ++iter; } } @@ -2201,12 +2173,12 @@ SvLBoxEntry* SvxConfigPage::InsertEntry( sal_uInt16 nPos = 0; while (*iter != pEntryData && ++iter != end) { - nPos++; + ++nPos; } // Now step past it to the entry after the currently selected one - iter++; - nPos++; + ++iter; + ++nPos; // Now add the new entry to the UI and to the parent's list if ( iter != end ) @@ -2431,7 +2403,7 @@ void SvxMenuConfigPage::Init() SvxMenuConfigPage::~SvxMenuConfigPage() { - for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); ++i ) { MenuSaveInData* pData = (MenuSaveInData*) aSaveInListBox.GetEntryData( i ); @@ -2587,7 +2559,7 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox ) SvxEntries* pEntries = pMenuData->GetEntries(); SvxEntries::const_iterator iter = pEntries->begin(); - for ( ; iter != pEntries->end(); iter++ ) + for ( ; iter != pEntries->end(); ++iter ) { SvxConfigEntry* pEntry = *iter; InsertEntryIntoUI( pEntry ); @@ -2630,7 +2602,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) GetSaveInData()->SetModified( sal_True ); } - // #i68101# Moemory leak (!) + // #i68101# Memory leak (!) delete pNameDialog; break; @@ -2860,7 +2832,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( { aMenuListBox.Select( pLBEntry ); } - iter++; + ++iter; } } @@ -3085,7 +3057,7 @@ SvxConfigEntry::~SvxConfigEntry() { SvxEntries::const_iterator iter = pEntries->begin(); - for ( ; iter != pEntries->end(); iter++ ) + for ( ; iter != pEntries->end(); ++iter ) { delete *iter; } @@ -3184,8 +3156,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( // default toolbar to select is standardbar unless a different one // has been passed in - m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL ); - m_aURLToSelect += OUString::createFromAscii( "standardbar" ); + m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL )); + m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" )); const SfxPoolItem* pItem = rSet.GetItem( rSet.GetPool()->GetWhich( SID_CONFIG ) ); @@ -3193,7 +3165,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( if ( pItem ) { OUString text = ((const SfxStringItem*)pItem)->GetValue(); - if (text.indexOf(OUString::createFromAscii(ITEM_TOOLBAR_URL)) == 0) + if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0) { m_aURLToSelect = text.copy( 0 ); } @@ -3217,7 +3189,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( SvxToolbarConfigPage::~SvxToolbarConfigPage() { - for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); ++i ) { ToolbarSaveInData* pData = (ToolbarSaveInData*) aSaveInListBox.GetEntryData( i ); @@ -3470,7 +3442,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) sal_uInt16 nSelectionPos = 0; // find position of entry within the list - for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); ++i ) { if ( aContentsListBox->GetEntry( 0, i ) == pActEntry ) { @@ -3567,7 +3539,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) sal_uInt16 nSelectionPos = 0; // find position of entry within the list - for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); ++i ) { if ( aContentsListBox->GetEntry( 0, i ) == pActEntry ) { @@ -3650,7 +3622,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) sal_uInt16 nSelectionPos = 0; // find position of entry within the list - for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); ++i ) { if ( aContentsListBox->GetEntry( 0, i ) == pActEntry ) { @@ -3722,7 +3694,7 @@ void SvxToolbarConfigPage::Init() sal_uInt16 nPos = 0; if ( m_aURLToSelect.getLength() != 0 ) { - for ( sal_uInt16 i = 0 ; i < aTopLevelListBox.GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0 ; i < aTopLevelListBox.GetEntryCount(); ++i ) { SvxConfigEntry* pData = (SvxConfigEntry*) aTopLevelListBox.GetEntryData( i ); @@ -3735,8 +3707,8 @@ void SvxToolbarConfigPage::Init() } // in future select the default toolbar: Standard - m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL ); - m_aURLToSelect += OUString::createFromAscii( "standardbar" ); + m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL )); + m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" )); } aTopLevelListBox.SelectEntryPos(nPos, sal_True); @@ -3841,7 +3813,7 @@ void ToolbarSaveInData::SetSystemStyle( const OUString& rResourceURL, sal_Int32 nStyle ) { - if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 && + if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3853,7 +3825,7 @@ void ToolbarSaveInData::SetSystemStyle( if ( a >>= aProps ) { - for ( sal_Int32 i = 0; i < aProps.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProps.getLength(); ++i ) { if ( aProps[ i ].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE) ) { @@ -3880,7 +3852,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL ) { sal_Int32 result = 0; - if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 && + if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3891,7 +3863,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL ) if ( a >>= aProps ) { - for ( sal_Int32 i = 0; i < aProps.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProps.getLength(); ++i ) { if ( aProps[ i ].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE) ) { @@ -3914,7 +3886,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) { OUString result; - if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 && + if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3925,7 +3897,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) if ( a >>= aProps ) { - for ( sal_Int32 i = 0; i < aProps.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aProps.getLength(); ++i ) { if ( aProps[ i ].Name.equalsAscii( ITEM_DESCRIPTOR_UINAME) ) { @@ -3940,7 +3912,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) } } - if ( rResourceURL.indexOf( OUString::createFromAscii( ".uno" ) ) == 0 && + if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( ".uno" )) ) == 0 && m_xCommandToLabelMap.is() && m_xCommandToLabelMap->hasByName( rResourceURL ) ) { @@ -3952,7 +3924,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) uno::Sequence< beans::PropertyValue > aPropSeq; if ( a >>= aPropSeq ) { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aPropSeq.getLength(); ++i ) { if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) ) { @@ -3977,7 +3949,7 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarInfo; @@ -3994,7 +3966,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() GetConfigManager()->getUIElementsInfo( css::ui::UIElementType::TOOLBAR ); - for ( sal_Int32 i = 0; i < info.getLength(); i++ ) + for ( sal_Int32 i = 0; i < info.getLength(); ++i ) { uno::Sequence< beans::PropertyValue > props = info[ i ]; @@ -4002,7 +3974,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() OUString systemname; OUString uiname; - for ( sal_Int32 j = 0; j < props.getLength(); j++ ) + for ( sal_Int32 j = 0; j < props.getLength(); ++j ) { if ( props[ j ].Name.equalsAscii( ITEM_DESCRIPTOR_RESOURCEURL) ) { @@ -4038,10 +4010,10 @@ SvxEntries* ToolbarSaveInData::GetEntries() pEntry->SetStyle( GetSystemStyle( url ) ); - // insert into hash_map to filter duplicates from the parent + // insert into boost::unordered_map to filter duplicates from the parent aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true )); - OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR); + OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR)); if ( systemname.indexOf( custom ) == 0 ) { pEntry->SetUserDefined( sal_True ); @@ -4071,7 +4043,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() xParentCfgMgr->getUIElementsInfo( css::ui::UIElementType::TOOLBAR ); - for ( sal_Int32 i = 0; i < info_.getLength(); i++ ) + for ( sal_Int32 i = 0; i < info_.getLength(); ++i ) { uno::Sequence< beans::PropertyValue > props = info_[ i ]; @@ -4079,7 +4051,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() OUString systemname; OUString uiname; - for ( sal_Int32 j = 0; j < props.getLength(); j++ ) + for ( sal_Int32 j = 0; j < props.getLength(); ++j ) { if ( props[ j ].Name.equalsAscii( ITEM_DESCRIPTOR_RESOURCEURL) ) { @@ -4093,7 +4065,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() } // custom toolbars of the parent are not visible in the document layer - OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR); + OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR)); if ( systemname.indexOf( custom ) == 0 ) continue; @@ -4183,7 +4155,7 @@ ToolbarSaveInData::HasURL( const OUString& rURL ) return sal_True; } - iter++; + ++iter; } return sal_False; } @@ -4204,7 +4176,7 @@ void ToolbarSaveInData::Reset() SvxEntries::const_iterator end = GetEntries()->end(); // reset each toolbar by calling removeSettings for it's toolbar URL - for ( ; toolbars != end; toolbars++ ) + for ( ; toolbars != end; ++toolbars ) { SvxConfigEntry* pToolbar = *toolbars; @@ -4215,7 +4187,7 @@ void ToolbarSaveInData::Reset() } catch ( uno::Exception& ) { - // error occured removing the settings + // error occurred removing the settings // TODO - add error dialog in future? } } @@ -4254,7 +4226,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxEntries::const_iterator iter = pToolbarData->GetEntries()->begin(); SvxEntries::const_iterator end = pToolbarData->GetEntries()->end(); - for ( ; iter != end; iter++ ) + for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntry = *iter; @@ -4312,7 +4284,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar ) if ( pToolbar->IsUserDefined() ) { xProps->setPropertyValue( - OUString::createFromAscii( ITEM_DESCRIPTOR_UINAME ), + OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_UINAME )), uno::makeAny( OUString( pToolbar->GetName() ) ) ); } @@ -4360,7 +4332,7 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar ) xPropertySet( xSettings, uno::UNO_QUERY ); xPropertySet->setPropertyValue( - OUString::createFromAscii( ITEM_DESCRIPTOR_UINAME ), + OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_UINAME )), uno::makeAny( pToolbar->GetName() ) ); try @@ -4408,7 +4380,7 @@ void ToolbarSaveInData::RemoveToolbar( SvxConfigEntry* pToolbar ) } catch ( uno::Exception& ) { - // error occured removing the settings + // error occurred removing the settings } } @@ -4454,7 +4426,7 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar ) // in the toolbar SvxEntries::const_iterator iter = pToolbar->GetEntries()->begin(); uno::Sequence< OUString > aURLSeq( 1 ); - for ( ; iter != pToolbar->GetEntries()->end(); iter++ ) + for ( ; iter != pToolbar->GetEntries()->end(); ++iter ) { SvxConfigEntry* pEntry = *iter; aURLSeq[ 0 ] = pEntry->GetCommand(); @@ -4483,7 +4455,7 @@ bool ToolbarSaveInData::LoadToolbar( { SvxEntries* pEntries = pParentData->GetEntries(); - for ( sal_Int32 nIndex = 0; nIndex < xToolbarSettings->getCount(); nIndex++ ) + for ( sal_Int32 nIndex = 0; nIndex < xToolbarSettings->getCount(); ++nIndex ) { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; @@ -4519,7 +4491,7 @@ bool ToolbarSaveInData::LoadToolbar( uno::Sequence< beans::PropertyValue > aPropSeq; if ( a >>= aPropSeq ) { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < aPropSeq.getLength(); ++i ) { if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) ) { @@ -4678,7 +4650,7 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox ) SvxEntries* pEntries = pToolbar->GetEntries(); SvxEntries::const_iterator iter = pEntries->begin(); - for ( ; iter != pEntries->end(); iter++ ) + for ( ; iter != pEntries->end(); ++iter ) { SvxConfigEntry* pEntry = *iter; @@ -4717,7 +4689,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) SvxNewToolbarDialog* pNameDialog = new SvxNewToolbarDialog( 0, aNewName ); sal_uInt16 nInsertPos; - for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ ) + for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); ++i ) { SaveInData* pData = (SaveInData*) aSaveInListBox.GetEntryData( i ); @@ -4844,8 +4816,6 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox( m_pButtonData = new SvLBoxButtonData( this ); BuildCheckBoxButtonImages( m_pButtonData ); EnableCheckButton( m_pButtonData ); - - m_bHiContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode(); } // -------------------------------------------------------- @@ -4920,9 +4890,6 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) if (( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { - // We have to reset all images because we change to/from high contrast mode - m_bHiContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode(); - BuildCheckBoxButtonImages( m_pButtonData ); Invalidate(); } @@ -5083,7 +5050,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { FreeResource(); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageInfo; @@ -5105,8 +5072,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { m_xGraphProvider = uno::Reference< graphic::XGraphicProvider >( xServiceManager->createInstance( - ::rtl::OUString::createFromAscii( - "com.sun.star.graphic.GraphicProvider" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider" ) ) ), uno::UNO_QUERY ); } @@ -5116,7 +5082,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, } uno::Reference< beans::XPropertySet > xPropSet( - xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ), + xServiceManager->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" ) ) ), uno::UNO_QUERY ); uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfig" ) ) ); @@ -5144,7 +5110,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, uno::Reference< lang::XSingleServiceFactory > xStorageFactory( xServiceManager->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.embed.FileSystemStorageFactory" )), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.FileSystemStorageFactory" ) ) ), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs( 2 ); @@ -5167,7 +5133,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, m_xImportedImageManager = uno::Reference< com::sun::star::ui::XImageManager >( xServiceManager->createInstanceWithArguments( - ::rtl::OUString::createFromAscii( "com.sun.star.ui.ImageManager" ), aProp ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ImageManager" ) ), aProp ), uno::UNO_QUERY ); ImageInfo mImageInfo; @@ -5175,7 +5141,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, if ( m_xImportedImageManager.is() ) { names = m_xImportedImageManager->getAllImageNames( GetImageType() ); - for ( sal_Int32 n = 0; n < names.getLength(); n++ ) + for ( sal_Int32 n = 0; n < names.getLength(); ++n ) mImageInfo.insert( ImageInfo::value_type( names[n], false )); } sal_uInt16 nId = 1; @@ -5205,12 +5171,12 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, if ( m_xParentImageManager.is() ) { names = m_xParentImageManager->getAllImageNames( GetImageType() ); - for ( sal_Int32 n = 0; n < names.getLength(); n++ ) + for ( sal_Int32 n = 0; n < names.getLength(); ++n ) aImageInfo.insert( ImageInfo::value_type( names[n], false )); } names = m_xImageManager->getAllImageNames( GetImageType() ); - for ( sal_Int32 n = 0; n < names.getLength(); n++ ) + for ( sal_Int32 n = 0; n < names.getLength(); ++n ) { ImageInfo::iterator pIter = aImageInfo.find( names[n] ); if ( pIter != aImageInfo.end() ) @@ -5270,7 +5236,7 @@ SvxIconSelectorDialog::~SvxIconSelectorDialog() { sal_uInt16 nCount = aTbSymbol.GetItemCount(); - for (sal_uInt16 n = 0; n < nCount; n++ ) + for (sal_uInt16 n = 0; n < nCount; ++n ) { sal_uInt16 nId = aTbSymbol.GetItemId(n); @@ -5289,7 +5255,7 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon() uno::Reference< graphic::XGraphic > result; sal_uInt16 nId; - for ( sal_uInt16 n = 0; n < aTbSymbol.GetItemCount(); n++ ) + for ( sal_uInt16 n = 0; n < aTbSymbol.GetItemCount(); ++n ) { nId = aTbSymbol.GetItemId( n ); if ( aTbSymbol.IsItemChecked( nId ) ) @@ -5309,7 +5275,7 @@ IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox ) sal_uInt16 nCount = aTbSymbol.GetItemCount(); - for (sal_uInt16 n = 0; n < nCount; n++ ) + for (sal_uInt16 n = 0; n < nCount; ++n ) { sal_uInt16 nId = aTbSymbol.GetItemId( n ); @@ -5376,7 +5342,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) { sal_uInt16 nCount = aTbSymbol.GetItemCount(); - for (sal_uInt16 n = 0; n < nCount; n++ ) + for (sal_uInt16 n = 0; n < nCount; ++n ) { sal_uInt16 nId = aTbSymbol.GetItemId( n ); @@ -5410,7 +5376,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< graphic::XGraphic > xGraphic; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL"); + aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") ); aMediaProps[0].Value <<= aURL; com::sun::star::awt::Size aSize; @@ -5422,7 +5388,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< beans::XPropertySet > props = m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); uno::Any a = props->getPropertyValue( - OUString::createFromAscii("SizePixel") ); + OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) ); a >>= aSize; if (0 == aSize.Width || 0 == aSize.Height) return sal_False; @@ -5436,7 +5402,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( bool bResult( false ); sal_uInt16 nCount = aTbSymbol.GetItemCount(); - for (sal_uInt16 n = 0; n < nCount; n++ ) + for (sal_uInt16 n = 0; n < nCount; ++n ) { sal_uInt16 nId = aTbSymbol.GetItemId( n ); @@ -5452,7 +5418,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) ) { BitmapEx aBitmap = aImage.GetBitmapEx(); - BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize); + BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize); aImage = Image( aBitmapex); } aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify @@ -5489,7 +5455,7 @@ void SvxIconSelectorDialog::ImportGraphics( uno::Sequence< OUString > URLs(1); uno::Sequence< uno::Reference<graphic::XGraphic > > aImportGraph( 1 ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL"); + aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") ); uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPer( m_xImportedImageManager, uno::UNO_QUERY ); @@ -5518,9 +5484,9 @@ void SvxIconSelectorDialog::ImportGraphics( { ::rtl::OUString aSourcePath( rPaths[0] ); if ( rPaths[0].lastIndexOf( '/' ) != rPaths[0].getLength() -1 ) - aSourcePath = rPaths[0] + ::rtl::OUString::createFromAscii( "/" ); + aSourcePath = rPaths[0] + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) ); - for ( sal_Int32 i = 1; i < rPaths.getLength(); i++ ) + for ( sal_Int32 i = 1; i < rPaths.getLength(); ++i ) { ::rtl::OUString aPath = aSourcePath + rPaths[i]; if ( m_xImportedImageManager->hasImage( GetImageType(), aPath ) ) @@ -5534,7 +5500,7 @@ void SvxIconSelectorDialog::ImportGraphics( } else if ( ret == 5 ) { - for ( sal_Int32 k = i; k < rPaths.getLength(); k++ ) + for ( sal_Int32 k = i; k < rPaths.getLength(); ++k ) { aPath = aSourcePath + rPaths[k]; bool bHasReplaced = ReplaceGraphicItem( aPath ); @@ -5545,7 +5511,7 @@ void SvxIconSelectorDialog::ImportGraphics( if ( result == sal_False ) { rejected[ rejectedCount ] = rPaths[i]; - rejectedCount++; + ++rejectedCount; } } } @@ -5558,7 +5524,7 @@ void SvxIconSelectorDialog::ImportGraphics( if ( result == sal_False ) { rejected[ rejectedCount ] = rPaths[i]; - rejectedCount++; + ++rejectedCount; } } } @@ -5566,12 +5532,12 @@ void SvxIconSelectorDialog::ImportGraphics( if ( rejectedCount != 0 ) { - OUString message =OUString::createFromAscii(""); - OUString newLine = OUString::createFromAscii("\n"); - rtl::OUString fPath = OUString::createFromAscii(""); + OUString message; + OUString newLine(RTL_CONSTASCII_USTRINGPARAM("\n")); + OUString fPath; if (rejectedCount > 1) - fPath = rPaths[0].copy(8) + ::rtl::OUString::createFromAscii( "/" ); - for ( sal_Int32 i = 0; i < rejectedCount; i++ ) + fPath = rPaths[0].copy(8) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + for ( sal_Int32 i = 0; i < rejectedCount; ++i ) { message += fPath + rejected[i]; message += newLine; @@ -5590,7 +5556,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) ++m_nNextId; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL"); + aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") ); uno::Reference< graphic::XGraphic > xGraphic; com::sun::star::awt::Size aSize; @@ -5602,7 +5568,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); uno::Any a = props->getPropertyValue( - OUString::createFromAscii("SizePixel") ); + OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) ); xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); if ( xGraphic.is() ) @@ -5616,7 +5582,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) ) { BitmapEx aBitmap = aImage.GetBitmapEx(); - BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize); + BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize); aImage = Image( aBitmapex); } if ( bOK && !!aImage ) @@ -5693,7 +5659,7 @@ rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMess { rtl::OUString name; rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ); - rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" ); + rtl::OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%ICONNAME" )); sal_Int32 pos = message.indexOf( placeholder ); if ( pos != -1 ) { @@ -5733,8 +5699,6 @@ SvxIconChangeDialog::SvxIconChangeDialog( BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize) { Point aEmptyPoint(0,0); - sal_Int32 imgNewWidth = 0; - sal_Int32 imgNewHeight = 0; double imgposX = 0; double imgposY = 0; BitmapEx aRet = aBitmap; @@ -5744,6 +5708,9 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a Size aScaledSize; if (imgOldWidth >= aStandardSize || imgOldHeight >= aStandardSize) { + sal_Int32 imgNewWidth = 0; + sal_Int32 imgNewHeight = 0; + if (imgOldWidth >= imgOldHeight) { imgNewWidth = aStandardSize; @@ -5768,7 +5735,6 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5; } - Size aBmpSize = aRet.GetSizePixel(); Size aStdSize( aStandardSize, aStandardSize ); Rectangle aRect(aEmptyPoint, aStdSize ); @@ -5785,3 +5751,5 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a return aRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 59fc088abe1e..6ae157ad4426 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "cfgutil.hxx" #include <com/sun/star/beans/XPropertySet.hpp> @@ -79,8 +77,8 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::document; namespace css = ::com::sun::star; -static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.ui.UICategoryDescription" ); -static ::rtl::OUString SERVICE_UICMDDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription"); +static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UICategoryDescription") ); +static ::rtl::OUString SERVICE_UICMDDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription") ); SfxStylesInfo_Impl::SfxStylesInfo_Impl() {} @@ -90,20 +88,20 @@ void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference< ::com: m_xDoc = xModel; } -static ::rtl::OUString FAMILY_CHARACTERSTYLE = ::rtl::OUString::createFromAscii("CharacterStyles"); -static ::rtl::OUString FAMILY_PARAGRAPHSTYLE = ::rtl::OUString::createFromAscii("ParagraphStyles"); -static ::rtl::OUString FAMILY_FRAMESTYLE = ::rtl::OUString::createFromAscii("FrameStyles" ); -static ::rtl::OUString FAMILY_PAGESTYLE = ::rtl::OUString::createFromAscii("PageStyles" ); -static ::rtl::OUString FAMILY_NUMBERINGSTYLE = ::rtl::OUString::createFromAscii("NumberingStyles"); +static ::rtl::OUString FAMILY_CHARACTERSTYLE (RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") ); +static ::rtl::OUString FAMILY_PARAGRAPHSTYLE (RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") ); +static ::rtl::OUString FAMILY_FRAMESTYLE (RTL_CONSTASCII_USTRINGPARAM("FrameStyles" ) ); +static ::rtl::OUString FAMILY_PAGESTYLE (RTL_CONSTASCII_USTRINGPARAM("PageStyles" ) ); +static ::rtl::OUString FAMILY_NUMBERINGSTYLE (RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") ); -static ::rtl::OUString CMDURL_SPART = ::rtl::OUString::createFromAscii(".uno:StyleApply?Style:string="); -static ::rtl::OUString CMDURL_FPART2 = ::rtl::OUString::createFromAscii("&FamilyName:string="); +static ::rtl::OUString CMDURL_SPART (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?Style:string=") ); +static ::rtl::OUString CMDURL_FPART2 (RTL_CONSTASCII_USTRINGPARAM("&FamilyName:string=") ); -static ::rtl::OUString CMDURL_STYLEPROT_ONLY = ::rtl::OUString::createFromAscii(".uno:StyleApply?"); -static ::rtl::OUString CMDURL_SPART_ONLY = ::rtl::OUString::createFromAscii("Style:string="); -static ::rtl::OUString CMDURL_FPART_ONLY = ::rtl::OUString::createFromAscii("FamilyName:string="); +static ::rtl::OUString CMDURL_STYLEPROT_ONLY (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?") ); +static ::rtl::OUString CMDURL_SPART_ONLY (RTL_CONSTASCII_USTRINGPARAM("Style:string=") ); +static ::rtl::OUString CMDURL_FPART_ONLY (RTL_CONSTASCII_USTRINGPARAM("FamilyName:string=") ); -static ::rtl::OUString STYLEPROP_UINAME = ::rtl::OUString::createFromAscii("DisplayName"); +static ::rtl::OUString STYLEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") ); ::rtl::OUString SfxStylesInfo_Impl::generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle) { @@ -183,15 +181,6 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) if (!aStyle.sLabel.getLength()) { aStyle.sLabel = aStyle.sCommand; - /* - #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUStringBuffer sMsg(256); - sMsg.appendAscii("There is no UIName for the style command \""); - sMsg.append (aStyle.sCommand ); - sMsg.appendAscii("\". The UI will be invalid then ..." ); - OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); - #endif - */ } } @@ -237,7 +226,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) ::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const ::rtl::OUString& sFamily) { - static ::rtl::OUString PROP_UINAME = ::rtl::OUString::createFromAscii("DisplayName"); + static ::rtl::OUString PROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") ); css::uno::Sequence< ::rtl::OUString > lStyleNames; css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY_THROW); @@ -289,7 +278,7 @@ SfxConfigFunctionListBox_Impl::SfxConfigFunctionListBox_Impl( Window* pParent, c SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); GetModel()->SetSortMode( SortAscending ); - // Timer f"ur die BallonHelp + // Timer for the BallonHelp aTimer.SetTimeout( 200 ); aTimer.SetTimeoutHdl( LINK( this, SfxConfigFunctionListBox_Impl, TimerHdl ) ); @@ -302,21 +291,8 @@ SfxConfigFunctionListBox_Impl::~SfxConfigFunctionListBox_Impl() void SfxConfigFunctionListBox_Impl::MouseMove( const MouseEvent& ) { - /* --> PB 2004-12-01 #i37000# - no own help text needed any longer - Point aMousePos = rMEvt.GetPosPixel(); - pCurEntry = GetCurEntry(); - - if ( pCurEntry && GetEntry( aMousePos ) == pCurEntry ) - aTimer.Start(); - else - { - Help::ShowBalloon( this, aMousePos, String() ); - aTimer.Stop(); - } - */ } - IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer) /* Beschreibung Timer-Handler f"ur die Einblendung eines Hilfetextes. Wenn nach Ablauf des Timers @@ -325,16 +301,6 @@ IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer) */ { (void)pTimer; // unused - /* --> PB 2004-12-01 #i37000# - no own help text needed any longer - aTimer.Stop(); - Point aMousePos = GetPointerPosPixel(); - SvLBoxEntry *pEntry = GetCurEntry(); - if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry ) - { - String sHelpText = GetHelpText( pEntry ); - Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), sHelpText ); - } - */ return 0L; } @@ -345,7 +311,7 @@ void SfxConfigFunctionListBox_Impl::ClearAll() */ { sal_uInt16 nCount = aArr.Count(); - for ( sal_uInt16 i=0; i<nCount; i++ ) + for ( sal_uInt16 i=0; i<nCount; ++i ) { SfxGroupInfo_Impl *pData = aArr[i]; @@ -414,9 +380,6 @@ void SfxConfigFunctionListBox_Impl::FunctionSelected() Entry anzeigen soll. */ { - /* --> PB 2004-12-01 #i37000# - no own help text needed any longer - Help::ShowBalloon( this, Point(), String() ); - */ } void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles) @@ -427,13 +390,9 @@ void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles) struct SvxConfigGroupBoxResource_Impl : public Resource { Image m_hdImage; - Image m_hdImage_hc; Image m_libImage; - Image m_libImage_hc; Image m_macImage; - Image m_macImage_hc; Image m_docImage; - Image m_docImage_hc; ::rtl::OUString m_sMyMacros; ::rtl::OUString m_sProdMacros; String m_sMacros; @@ -441,9 +400,7 @@ struct SvxConfigGroupBoxResource_Impl : public Resource String m_aHumanAppName; String m_aStrGroupStyles; Image m_collapsedImage; - Image m_collapsedImage_hc; Image m_expandedImage; - Image m_expandedImage_hc; SvxConfigGroupBoxResource_Impl(); }; @@ -451,13 +408,9 @@ struct SvxConfigGroupBoxResource_Impl : public Resource SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)), m_hdImage(CUI_RES(IMG_HARDDISK)), - m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)), m_libImage(CUI_RES(IMG_LIB)), - m_libImage_hc(CUI_RES(IMG_LIB_HC)), m_macImage(CUI_RES(IMG_MACRO)), - m_macImage_hc(CUI_RES(IMG_MACRO_HC)), m_docImage(CUI_RES(IMG_DOC)), - m_docImage_hc(CUI_RES(IMG_DOC_HC)), m_sMyMacros(String(CUI_RES(STR_MYMACROS))), m_sProdMacros(String(CUI_RES(STR_PRODMACROS))), m_sMacros(String(CUI_RES(STR_BASICMACROS))), @@ -465,9 +418,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : m_aHumanAppName(String(CUI_RES(STR_HUMAN_APPNAME))), m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))), m_collapsedImage(CUI_RES(BMP_COLLAPSED)), - m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)), - m_expandedImage(CUI_RES(BMP_EXPANDED)), - m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC)) + m_expandedImage(CUI_RES(BMP_EXPANDED)) { FreeResource(); } @@ -478,8 +429,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl( , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), pStylesInfo(0) { SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ); - SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL ); - SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST ); + SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage ); } @@ -491,7 +441,7 @@ SfxConfigGroupListBox_Impl::~SfxConfigGroupListBox_Impl() void SfxConfigGroupListBox_Impl::ClearAll() { sal_uInt16 nCount = aArr.Count(); - for ( sal_uInt16 i=0; i<nCount; i++ ) + for ( sal_uInt16 i=0; i<nCount; ++i ) { SfxGroupInfo_Impl *pData = aArr[i]; if ( pData->nKind == SFX_CFGGROUP_SCRIPTCONTAINER @@ -627,7 +577,6 @@ namespace } catch( const Exception& ) { - //DBG_UNHANDLED_EXCEPTION(); } return xDocument; @@ -667,9 +616,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); xCtx.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( - ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW ); rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) ); - //rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) ); } catch( Exception& e ) { @@ -708,9 +656,9 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul rootNode->getChildNodes(); sal_Bool bIsRootNode = sal_False; - ::rtl::OUString user = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString share = ::rtl::OUString::createFromAscii("share"); - if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") )) + ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") ); + ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") ); + if ( rootNode->getName().equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root") ) ) ) { bIsRootNode = sal_True; } @@ -728,7 +676,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul currentDocTitle = ::comphelper::DocumentInfo::getDocumentTitle( xDocument ); } - for ( sal_Int32 n = 0; n < children.getLength(); n++ ) + for ( sal_Int32 n = 0; n < children.getLength(); ++n ) { Reference< browse::XBrowseNode >& theChild = children[n]; sal_Bool bDisplay = sal_True; @@ -754,23 +702,19 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul } if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay ) { - -// We call acquire on the XBrowseNode so that it does not -// get autodestructed and become invalid when accessed later. +// We call acquire on the XBrowseNode so that it does not +// get autodestructed and become invalid when accessed later. theChild->acquire(); SfxGroupInfo_Impl* pInfo = new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER, 0, static_cast<void *>( theChild.get())); - Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL ); + Image aImage = GetImage( theChild, xCtx, bIsRootNode ); SvLBoxEntry* pNewEntry = InsertEntry( uiName, NULL); - SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_HIGHCONTRAST ); - SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); - SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); + SetExpandedEntryBmp( pNewEntry, aImage ); + SetCollapsedEntryBmp( pNewEntry, aImage ); pNewEntry->SetUserData( pInfo ); aArr.Insert( pInfo, aArr.Count() ); @@ -780,7 +724,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul Sequence< Reference< browse::XBrowseNode > > grandchildren = children[n]->getChildNodes(); - for ( sal_Int32 m = 0; m < grandchildren.getLength(); m++ ) + for ( sal_Int32 m = 0; m < grandchildren.getLength(); ++m ) { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { @@ -813,19 +757,20 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul MakeVisible( GetEntry( 0,0 ) ); SetUpdateMode( sal_True ); } -Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ) +Image SfxConfigGroupListBox_Impl::GetImage( + Reference< browse::XBrowseNode > node, + Reference< XComponentContext > xCtx, + bool bIsRootNode +) { Image aImage; if ( bIsRootNode ) { - ::rtl::OUString user = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString share = ::rtl::OUString::createFromAscii("share"); + ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") ); + ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") ); if (node->getName().equals( user ) || node->getName().equals(share ) ) { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = pImp->m_hdImage; - else - aImage = pImp->m_hdImage_hc; + aImage = pImp->m_hdImage; } else { @@ -838,8 +783,8 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod xModuleManager( xCtx->getServiceManager() ->createInstanceWithContext( - ::rtl::OUString::createFromAscii("" // xxx todo - "com.sun.star.frame.ModuleManager"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("" // xxx todo + "com.sun.star.frame.ModuleManager") ), xCtx ), UNO_QUERY_THROW ); Reference<container::XNameAccess> xModuleConfig( @@ -851,7 +796,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod Any aAny = xModuleConfig->getByName(appModule); if( sal_True != ( aAny >>= moduleDescr ) ) { - throw RuntimeException(::rtl::OUString::createFromAscii("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >()); + throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue") ), Reference< XInterface >()); } beans::PropertyValue const * pmoduleDescr = moduleDescr.getConstArray(); @@ -870,40 +815,20 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod } if( factoryURL.getLength() > 0 ) { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_NORMAL ); - else - aImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_HIGHCONTRAST ); + aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } else { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = pImp->m_docImage; - else - aImage = pImp->m_docImage_hc; + aImage = pImp->m_docImage; } } } else { if( node->getType() == browse::BrowseNodeTypes::SCRIPT ) - { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = pImp->m_macImage; - else - aImage = pImp->m_macImage_hc; - } + aImage = pImp->m_macImage; else - { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = pImp->m_libImage; - else - aImage = pImp->m_libImage_hc; - } + aImage = pImp->m_libImage; } return aImage; } @@ -916,7 +841,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC xCtx->getServiceManager(); Reference< frame::XDesktop > desktop ( mcf->createInstanceWithContext( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ), xCtx ), UNO_QUERY ); Reference< container::XEnumerationAccess > componentsAccess = @@ -952,7 +877,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC if (xModuleConf.is()) { ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand)); - sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Name"), ::rtl::OUString()); + sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ), ::rtl::OUString()); } } catch(const css::uno::RuntimeException& exRun) @@ -964,15 +889,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC if (!sUIName.getLength()) { sUIName = sCommand; - /* - #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUStringBuffer sMsg(256); - sMsg.appendAscii("There is no UIName for the internal command \""); - sMsg.append (sCommand ); - sMsg.appendAscii("\". The UI will be invalid then ..." ); - OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); - #endif - */ } return sUIName; @@ -1034,7 +950,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() Sequence< Reference< browse::XBrowseNode > > children = rootNode->getChildNodes(); - for ( sal_Int32 n = 0; n < children.getLength(); n++ ) + for ( sal_Int32 n = 0; n < children.getLength(); ++n ) { if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT) { @@ -1053,14 +969,11 @@ void SfxConfigGroupListBox_Impl::GroupSelected() String* pScriptURI = new String( uri ); SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGFUNCTION_SCRIPT, 0, pScriptURI ); - Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL ); + Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); SvLBoxEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); - pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST ); - pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); - pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); + pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); + pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); pGrpInfo->sCommand = uri; pGrpInfo->sLabel = children[n]->getName(); @@ -1137,7 +1050,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) sal_uLong nParentPos = 0; while ( pEntry && pEntry != pParent ) { - nParentPos++; + ++nParentPos; pEntry = GetNextEntryInView( pEntry ); } @@ -1173,9 +1086,9 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) rootNode->getChildNodes(); sal_Bool bIsRootNode = sal_False; - ::rtl::OUString user = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString share = ::rtl::OUString::createFromAscii("share"); - if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") )) + ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") ); + ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share" )); + if ( rootNode->getName().equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root") ) ) ) { bIsRootNode = sal_True; } @@ -1194,7 +1107,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } sal_Int32 nLen = children.getLength(); - for ( sal_Int32 n = 0; n < nLen; n++ ) + for ( sal_Int32 n = 0; n < nLen; ++n ) { Reference< browse::XBrowseNode >& theChild = children[n]; ::rtl::OUString aName( theChild->getName() ); @@ -1217,14 +1130,11 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER, 0, static_cast<void *>( theChild.get())); - Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL ); + Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False ); SvLBoxEntry* pNewEntry = InsertEntry( theChild->getName(), pEntry ); - SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST ); - SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); - SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); + SetExpandedEntryBmp( pNewEntry, aImage ); + SetCollapsedEntryBmp(pNewEntry, aImage ); pNewEntry->SetUserData( pGrpInfo ); aArr.Insert( pGrpInfo, aArr.Count() ); @@ -1234,7 +1144,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) Sequence< Reference< browse::XBrowseNode > > grandchildren = children[n]->getChildNodes(); - for ( sal_Int32 m = 0; m < grandchildren.getLength(); m++ ) + for ( sal_Int32 m = 0; m < grandchildren.getLength(); ++m ) { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { @@ -1276,7 +1186,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } @@ -1347,3 +1257,5 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic, pEntry = NextSibling( pEntry ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index de4b8dcbf462..7b4c04edbae6 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include *************************************************************** #include <svtools/svmedit.hxx> #include <tools/diagnose_ex.h> @@ -80,8 +78,6 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE )); mpImpl->pMacroImg = new Image( CUI_RES( IMG_MACRO) ); mpImpl->pComponentImg = new Image( CUI_RES( IMG_COMPONENT) ); - mpImpl->pMacroImg_h = new Image( CUI_RES( IMG_MACRO_H) ); - mpImpl->pComponentImg_h = new Image( CUI_RES( IMG_COMPONENT_H) ); FreeResource(); @@ -95,11 +91,10 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, uno::Reference< document::XEventsSupplier > xSupplier; -// xSupplier = uno::Reference< document::XEventsSupplier >( new GlobalEventConfig()); xSupplier = uno::Reference< document::XEventsSupplier > ( ::comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii( - "com.sun.star.frame.GlobalEventBroadcaster" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.frame.GlobalEventBroadcaster" )) ), uno::UNO_QUERY ); sal_uInt16 nPos(0); @@ -203,7 +198,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) uno::Reference< frame::XFramesSupplier > xFramesSupplier( ::comphelper::getProcessServiceFactory()->createInstance( - OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), uno::UNO_QUERY ); uno::Reference< frame::XFrame > xFrame = @@ -244,3 +239,4 @@ void SvxEventConfigPage::Reset( const SfxItemSet& ) _SvxMacroTabPage::Reset(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 26e4f5848134..bbd839b7e2aa 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src index 8b19a1e79794..c4ef082b286d 100644 --- a/cui/source/customize/eventdlg.src +++ b/cui/source/customize/eventdlg.src @@ -101,14 +101,4 @@ TabPage RID_SVXPAGE_EVENTS ImageBitmap = Bitmap { File = "component_16.png"; }; MASKCOLOR }; - Image IMG_MACRO_H - { - ImageBitmap = Bitmap { File = "idh018.png"; }; - MASKCOLOR - }; - Image IMG_COMPONENT_H - { - ImageBitmap = Bitmap { File = "component_16_h.png"; }; - MASKCOLOR - }; }; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 3d0763b8d378..62731acc4b68 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <basic/basmgr.hxx> #include "macropg.hxx" @@ -58,10 +57,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -static ::rtl::OUString aVndSunStarUNO = - ::rtl::OUString::createFromAscii( "vnd.sun.star.UNO:" ); -static ::rtl::OUString aVndSunStarScript = - ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" ); +static ::rtl::OUString aVndSunStarUNO( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.UNO:") ); +static ::rtl::OUString aVndSunStarScript( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:") ); _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) : pAssignFT( NULL ), @@ -70,8 +67,6 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) : pDeletePB( NULL ), pMacroImg( NULL ), pComponentImg( NULL ), - pMacroImg_h( NULL ), - pComponentImg_h( NULL ), pStrEvent( NULL ), pAssignedMacro( NULL ), pEventLB( NULL ), @@ -91,8 +86,6 @@ _SvxMacroTabPage_Impl::~_SvxMacroTabPage_Impl() delete pDeletePB; delete pMacroImg; delete pComponentImg; - delete pMacroImg_h; - delete pComponentImg_h; delete pStrEvent; delete pAssignedMacro; delete pEventLB; @@ -128,7 +121,6 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) { Size aSz; sal_uInt16 _nTabs = maHeaderBar.GetItemCount(); - long nTmpSz = 0; long nWidth = maHeaderBar.GetItemSize( ITEMID_EVENT ); long nBarWidth = maHeaderBar.GetSizePixel().Width(); @@ -138,7 +130,7 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) maHeaderBar.SetItemSize( ITEMID_EVENT, nBarWidth - TAB_WIDTH_MIN ); { - long _nWidth; + long _nWidth, nTmpSz = 0; for( sal_uInt16 i = 1 ; i < _nTabs ; ++i ) { _nWidth = maHeaderBar.GetItemSize( i ); @@ -282,9 +274,6 @@ void _SvxMacroTabPage::InitResources() aDisplayNames.push_back( EventDisplayName( "OnPrint", RID_SVXSTR_EVENT_PRINTDOC ) ); aDisplayNames.push_back( EventDisplayName( "OnModifyChanged", RID_SVXSTR_EVENT_MODIFYCHANGED ) ); aDisplayNames.push_back( EventDisplayName( "OnTitleChanged", RID_SVXSTR_EVENT_TITLECHANGED ) ); -// aDisplayNames.push_back( EventDisplayName( "OnModeChanged", RID_SVXSTR_EVENT_MODECHANGED ) ); -// aDisplayNames.push_back( EventDisplayName( "OnVisAreaChanged", RID_SVXSTR_EVENT_VISAREACHANGED ) ); -// aDisplayNames.push_back( EventDisplayName( "OnStorageChanged", RID_SVXSTR_EVENT_STORAGECHANGED ) ); // application specific events aDisplayNames.push_back( EventDisplayName( "OnMailMerge", RID_SVXSTR_EVENT_MAILMERGE ) ); @@ -294,7 +283,6 @@ void _SvxMacroTabPage::InitResources() aDisplayNames.push_back( EventDisplayName( "OnPageCountChange", RID_SVXSTR_EVENT_PAGECOUNTCHANGE ) ); aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened", RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) ); aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed", RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) ); -// aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished", RID_SVXSTR_EVENT_LAYOUT_FINISHED ) ); aDisplayNames.push_back( EventDisplayName( "OnSelect", RID_SVXSTR_EVENT_SELECTIONCHANGED ) ); aDisplayNames.push_back( EventDisplayName( "OnDoubleClick", RID_SVXSTR_EVENT_DOUBLECLICK ) ); aDisplayNames.push_back( EventDisplayName( "OnRightClick", RID_SVXSTR_EVENT_RIGHTCLICK ) ); @@ -334,7 +322,7 @@ void _SvxMacroTabPage::InitResources() aDisplayNames.push_back( EventDisplayName( "approveCursorMove", RID_SVXSTR_EVENT_POSITIONING ) ); aDisplayNames.push_back( EventDisplayName( "cursorMoved", RID_SVXSTR_EVENT_POSITIONED ) ); aDisplayNames.push_back( EventDisplayName( "approveParameter", RID_SVXSTR_EVENT_APPROVEPARAMETER ) ); - aDisplayNames.push_back( EventDisplayName( "errorOccured", RID_SVXSTR_EVENT_ERROROCCURED ) ); + aDisplayNames.push_back( EventDisplayName( "errorOccurred", RID_SVXSTR_EVENT_ERROROCCURRED ) ); aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged", RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) ); } @@ -453,25 +441,20 @@ class IconLBoxString : public SvLBoxString { Image* m_pMacroImg; Image* m_pComponentImg; - Image* m_pMacroImg_h; - Image* m_pComponentImg_h; int m_nxImageOffset; public: IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText, - Image* pMacroImg, Image* pComponentImg, - Image* pMacroImg_h, Image* pComponentImg_h ); + Image* pMacroImg, Image* pComponentImg ); virtual void Paint(const Point& aPos, SvLBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText, - Image* pMacroImg, Image* pComponentImg, Image* pMacroImg_h, Image* pComponentImg_h ) + Image* pMacroImg, Image* pComponentImg ) : SvLBoxString( pEntry, nFlags, sText ) , m_pMacroImg( pMacroImg ) , m_pComponentImg( pComponentImg ) - , m_pMacroImg_h( pMacroImg_h ) - , m_pComponentImg_h( pComponentImg_h ) { m_nxImageOffset = 20; } @@ -487,12 +470,7 @@ void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice, sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO ); bool bUNO = nIndex == 0; - sal_Bool bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode(); - const Image* pImg; - if( bHC ) - pImg = bUNO ? m_pComponentImg_h : m_pMacroImg_h; - else - pImg = bUNO ? m_pComponentImg : m_pMacroImg; + const Image* pImg = bUNO ? m_pComponentImg : m_pMacroImg; aDevice.DrawImage( aPos, *pImg ); ::rtl::OUString aPureMethod; @@ -576,8 +554,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) _pE->SetUserData( (void*)pEventName ); String sNew( eventURL ); _pE->ReplaceItem( new IconLBoxString( _pE, 0, sNew, - mpImpl->pMacroImg, mpImpl->pComponentImg, - mpImpl->pMacroImg_h, mpImpl->pComponentImg_h ), LB_MACROS_ITEMPOS ); + mpImpl->pMacroImg, mpImpl->pComponentImg ), LB_MACROS_ITEMPOS ); rListBox.GetModel()->InvalidateEntry( _pE ); rListBox.Select( _pE ); rListBox.MakeVisible( _pE ); @@ -667,7 +644,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* if( pBtn == pImpl->pDeletePB ) { // delete pressed - sEventType = ::rtl::OUString::createFromAscii("Script"); + sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script") ); sEventURL = ::rtl::OUString(); if(!pThis->bAppEvents) pThis->bDocModified = true; @@ -685,7 +662,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* short ret = pAssignDlg->Execute(); if( ret ) { - sEventType = ::rtl::OUString::createFromAscii("UNO"); + sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO")); sEventURL = pAssignDlg->getURL(); if(!pThis->bAppEvents) pThis->bDocModified = true; @@ -701,7 +678,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* short ret = pDlg->Execute(); if ( ret ) { - sEventType = ::rtl::OUString::createFromAscii("Script"); + sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")); sEventURL = pDlg->GetScriptURL(); if(!pThis->bAppEvents) pThis->bDocModified = true; @@ -725,10 +702,8 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* // update the listbox entry pImpl->pEventLB->SetUpdateMode( sal_False ); - // pE->ReplaceItem( new SvLBoxString( pE, 0, sEventURL ), LB_MACROS_ITEMPOS ); pE->ReplaceItem( new IconLBoxString( pE, 0, sEventURL, - pImpl->pMacroImg, pImpl->pComponentImg, - pImpl->pMacroImg_h, pImpl->pComponentImg_h ), LB_MACROS_ITEMPOS ); + pImpl->pMacroImg, pImpl->pComponentImg ), LB_MACROS_ITEMPOS ); rListBox.GetModel()->InvalidateEntry( pE ); rListBox.Select( pE ); @@ -851,8 +826,6 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram mpImpl->pAssignComponentPB = new PushButton( this, CUI_RES( PB_ASSIGN_COMPONENT ) ); mpImpl->pMacroImg = new Image( CUI_RES(IMG_MACRO) ); mpImpl->pComponentImg = new Image( CUI_RES(IMG_COMPONENT) ); - mpImpl->pMacroImg_h = new Image( CUI_RES(IMG_MACRO_H) ); - mpImpl->pComponentImg_h = new Image( CUI_RES(IMG_COMPONENT_H) ); FreeResource(); @@ -860,9 +833,6 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram if( !mpImpl->bIDEDialogMode ) { - // Size aSizeAssign; - // Point aPosAssign; - // mpImpl->pAssignPB->GetPosSizePixel( aPosAssign, aSizeAssign ); Point aPosAssign = mpImpl->pAssignPB->GetPosPixel(); Point aPosComp = mpImpl->pAssignComponentPB->GetPosPixel(); @@ -1051,3 +1021,5 @@ void SvxMacroAssignSingleTabDialog::SetTabPage( SfxTabPage* pTabPage ) SetUniqueId( pPage->GetUniqueId() ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc index a7387e410432..b8ffa3694be2 100644 --- a/cui/source/customize/macropg.hrc +++ b/cui/source/customize/macropg.hrc @@ -43,8 +43,6 @@ // Starting new IDs with 30 as eventdlg.hrc also includes this file #define IMG_MACRO 30 #define IMG_COMPONENT 31 -#define IMG_MACRO_H 32 -#define IMG_COMPONENT_H 33 #define RID_PB_OK 41 #define RID_PB_CANCEL 42 diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 50e8498dc8e9..6de18774547c 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -101,16 +101,6 @@ TabPage RID_SVXPAGE_MACROASSIGN ImageBitmap = Bitmap { File = "component_16.png"; }; MASKCOLOR }; - Image IMG_MACRO_H - { - ImageBitmap = Bitmap { File = "idh018.png"; }; - MASKCOLOR - }; - Image IMG_COMPONENT_H - { - ImageBitmap = Bitmap { File = "component_16_h.png"; }; - MASKCOLOR - }; }; ModalDialog RID_SVXDLG_ASSIGNCOMPONENT @@ -283,7 +273,7 @@ String RID_SVXSTR_EVENT_CONFIRMDELETE { Text [ en-US ] = "Confirm deletion" ; }; -String RID_SVXSTR_EVENT_ERROROCCURED +String RID_SVXSTR_EVENT_ERROROCCURRED { Text [ en-US ] = "Error occurred" ; }; diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 3ecf625419a4..c79b91f50fff 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,8 +41,6 @@ public: PushButton* pDeletePB; Image* pMacroImg; Image* pComponentImg; - Image* pMacroImg_h; - Image* pComponentImg_h; String* pStrEvent; String* pAssignedMacro; _HeaderTabListBox* pEventLB; @@ -71,3 +70,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 5a1cc3b91e29..0900a1ff4847 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <vcl/help.hxx> #include <vcl/msgbox.hxx> #include <vcl/metric.hxx> @@ -92,7 +91,7 @@ SvxConfigFunctionListBox_Impl::SvxConfigFunctionListBox_Impl( Window* pParent, c SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); GetModel()->SetSortMode( SortAscending ); - // Timer f"ur die BallonHelp + // Timer for the BallonHelp aTimer.SetTimeout( 200 ); aTimer.SetTimeoutHdl( LINK( this, SvxConfigFunctionListBox_Impl, TimerHdl ) ); @@ -143,7 +142,7 @@ IMPL_LINK( SvxConfigFunctionListBox_Impl, TimerHdl, Timer*, EMPTYARG) void SvxConfigFunctionListBox_Impl::ClearAll() { sal_uInt16 nCount = aArr.Count(); - for ( sal_uInt16 i=0; i<nCount; i++ ) + for ( sal_uInt16 i=0; i<nCount; ++i ) { SvxGroupInfo_Impl *pData = aArr[i]; delete pData; @@ -208,13 +207,9 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl( : SvTreeListBox( pParent, rResId ) , m_bShowSlots( _bShowSlots ), m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())), - m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())), m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())), - m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())), m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())), - m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())), m_docImage(ResId(IMG_DOC,*rResId.GetResMgr())), - m_docImage_hc(ResId(IMG_DOC_HC,*rResId.GetResMgr())), m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))), m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr()))) { @@ -231,13 +226,8 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl( SetNodeBitmaps( aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL ); - - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST ); + aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) + ); } @@ -249,7 +239,7 @@ SvxConfigGroupListBox_Impl::~SvxConfigGroupListBox_Impl() void SvxConfigGroupListBox_Impl::ClearAll() { sal_uInt16 nCount = aArr.Count(); - for ( sal_uInt16 i=0; i<nCount; i++ ) + for ( sal_uInt16 i=0; i<nCount; ++i ) { SvxGroupInfo_Impl *pData = aArr[i]; delete pData; @@ -326,7 +316,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows Sequence< Reference< browse::XBrowseNode > > children = _rxRootNode->getChildNodes(); - sal_Bool bIsRootNode = _rxRootNode->getName().equalsAscii("Root"); + sal_Bool bIsRootNode = _rxRootNode->getName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Root")); /* To mimic current starbasic behaviour we need to make sure that only the current document @@ -341,7 +331,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows sCurrentDocTitle = ::comphelper::DocumentInfo::getDocumentTitle( xWorkingDocument ); } - for ( long n = 0; n < children.getLength(); n++ ) + for ( long n = 0; n < children.getLength(); ++n ) { Reference< browse::XBrowseNode >& theChild = children[n]; //#139111# some crash reports show that it might be unset @@ -356,12 +346,12 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows // then the user & share are added at depth=1 ) { - if ( sUIName.equalsAscii( "user" ) ) + if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) ) { sUIName = m_sMyMacros; bIsRootNode = sal_True; } - else if ( sUIName.equalsAscii( "share" ) ) + else if ( sUIName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) ) { sUIName = m_sProdMacros; bIsRootNode = sal_True; @@ -381,13 +371,9 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry ); ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); - Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL ); - SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL ); - SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL ); - - aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_HIGHCONTRAST ); - SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST ); + Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode ); + SetExpandedEntryBmp( pNewEntry, aImage ); + SetCollapsedEntryBmp( pNewEntry, aImage ); SvxGroupInfo_Impl* pInfo = new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild ); @@ -409,7 +395,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows Sequence< Reference< browse::XBrowseNode > > grandchildren = children[n]->getChildNodes(); - for ( sal_Int32 m = 0; m < grandchildren.getLength(); m++ ) + for ( sal_Int32 m = 0; m < grandchildren.getLength(); ++m ) { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { @@ -451,8 +437,8 @@ void SvxConfigGroupListBox_Impl::Init() Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( xMCF->createInstanceWithContext( - OUString::createFromAscii( - "com.sun.star.frame.ModuleManager" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.frame.ModuleManager" )), xContext ), UNO_QUERY ); @@ -464,8 +450,8 @@ void SvxConfigGroupListBox_Impl::Init() Reference< container::XNameAccess > xNameAccess( xMCF->createInstanceWithContext( - OUString::createFromAscii( - "com.sun.star.frame.UICommandDescription" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.frame.UICommandDescription" )), xContext ), UNO_QUERY ); @@ -476,8 +462,8 @@ void SvxConfigGroupListBox_Impl::Init() Reference< container::XNameAccess > xAllCategories( xMCF->createInstanceWithContext( - OUString::createFromAscii( - "com.sun.star.ui.UICategoryDescription" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ui.UICategoryDescription" )), xContext ), UNO_QUERY ); @@ -507,7 +493,7 @@ void SvxConfigGroupListBox_Impl::Init() Sequence< sal_Int16 > gids = xDIP->getSupportedCommandGroups(); - for ( sal_Int32 i = 0; i < gids.getLength(); i++ ) + for ( sal_Int32 i = 0; i < gids.getLength(); ++i ) { Sequence< frame::DispatchInformation > commands; try @@ -559,7 +545,7 @@ void SvxConfigGroupListBox_Impl::Init() ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); xCtx.set( _xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( - OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW ); rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) ); } catch( const Exception& ) @@ -592,17 +578,18 @@ void SvxConfigGroupListBox_Impl::Init() SetUpdateMode( sal_True ); } -Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ) +Image SvxConfigGroupListBox_Impl::GetImage( + Reference< browse::XBrowseNode > node, + Reference< XComponentContext > xCtx, + bool bIsRootNode +) { Image aImage; if ( bIsRootNode ) { - if ( node->getName().equalsAscii( "user" ) || node->getName().equalsAscii( "share" ) ) + if ( node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) || node->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "share" ) ) ) { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = m_hdImage; - else - aImage = m_hdImage_hc; + aImage = m_hdImage; } else { @@ -615,7 +602,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod xModuleManager( xCtx->getServiceManager() ->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.frame.ModuleManager"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")), xCtx ), UNO_QUERY_THROW ); Reference<container::XNameAccess> xModuleConfig( @@ -627,7 +614,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod Any aAny = xModuleConfig->getByName(appModule); if( sal_True != ( aAny >>= moduleDescr ) ) { - throw RuntimeException(OUString::createFromAscii("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >()); + throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue")), Reference< XInterface >()); } beans::PropertyValue const * pmoduleDescr = moduleDescr.getConstArray(); @@ -644,40 +631,20 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod } if( factoryURL.getLength() > 0 ) { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_NORMAL ); - else - aImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_HIGHCONTRAST ); + aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); } else { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = m_docImage; - else - aImage = m_docImage_hc; + aImage = m_docImage; } } } else { if( node->getType() == browse::BrowseNodeTypes::SCRIPT ) - { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = m_macImage; - else - aImage = m_macImage_hc; - } + aImage = m_macImage; else - { - if( bHighContrast == BMP_COLOR_NORMAL ) - aImage = m_libImage; - else - aImage = m_libImage_hc; - } + aImage = m_libImage; } return aImage; } @@ -691,7 +658,7 @@ SvxConfigGroupListBox_Impl::getDocumentModel( xCtx->getServiceManager(); Reference< frame::XDesktop > desktop ( mcf->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), xCtx ), UNO_QUERY ); Reference< container::XEnumerationAccess > componentsAccess = @@ -751,7 +718,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() { } - for ( sal_Int32 i = 0; i < commands.getLength(); i++ ) + for ( sal_Int32 i = 0; i < commands.getLength(); ++i ) { if ( commands[i].Command.getLength() == 0 ) { @@ -775,9 +742,9 @@ void SvxConfigGroupListBox_Impl::GroupSelected() if ( a >>= aPropSeq ) { - for ( sal_Int32 k = 0; k < aPropSeq.getLength(); k++ ) + for ( sal_Int32 k = 0; k < aPropSeq.getLength(); ++k ) { - if ( aPropSeq[k].Name.equalsAscii( "Name" ) ) + if ( aPropSeq[k].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ) ) { aPropSeq[k].Value >>= aLabel; break; @@ -828,7 +795,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected() Sequence< Reference< browse::XBrowseNode > > children = rootNode->getChildNodes(); - for ( long n = 0; n < children.getLength(); n++ ) + for ( long n = 0; n < children.getLength(); ++n ) { if (!children[n].is()) continue; @@ -861,14 +828,11 @@ void SvxConfigGroupListBox_Impl::GroupSelected() new SvxGroupInfo_Impl( SVX_CFGFUNCTION_SCRIPT, 123, uri, description ); - Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL ); + Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); SvLBoxEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); - pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL); - aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST ); - pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); - pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST); + pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); + pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); pNewEntry->SetUserData( _pGroupInfo ); @@ -922,7 +886,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) sal_uLong nParentPos = 0; while ( pEntry && pEntry != pParent ) { - nParentPos++; + ++nParentPos; pEntry = GetNextEntryInView( pEntry ); } @@ -952,7 +916,7 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } @@ -1002,7 +966,6 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( aCategories.SetFunctionListBox( &aCommands ); aCategories.Init(); - // aCategories.Select( aCategories.GetEntry( 0, 0 ) ); aCategories.SetSelectHdl( LINK( this, SvxScriptSelectorDialog, SelectHdl ) ); @@ -1208,3 +1171,5 @@ SvxScriptSelectorDialog::GetSelectedHelpText() { return aCommands.GetHelpText( aCommands.GetLastSelectedEntry() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc index 78929c8c9de5..a8dee0cc128a 100644 --- a/cui/source/customize/selector.hrc +++ b/cui/source/customize/selector.hrc @@ -35,14 +35,11 @@ #define BTN_SELECTOR_HELP 8 #define GRP_SELECTOR_DESCRIPTION 9 #define TXT_SELECTOR_DESCRIPTION 10 + #define IMG_HARDDISK 1 -#define IMG_HARDDISK_HC 2 #define IMG_LIB 3 -#define IMG_LIB_HC 4 #define IMG_MACRO 5 -#define IMG_MACRO_HC 6 #define IMG_DOC 7 -#define IMG_DOC_HC 8 #define STR_SELECTOR_ADD 310 #define STR_SELECTOR_CLOSE 311 diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src index cd4ea9dd5d12..34e7a7726804 100644 --- a/cui/source/customize/selector.src +++ b/cui/source/customize/selector.src @@ -128,41 +128,21 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; }; MASKCOLOR }; - Image IMG_HARDDISK_HC - { - ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; }; - MASKCOLOR - }; Image IMG_LIB { ImageBitmap = Bitmap { File = "im30820.png"; }; MASKCOLOR }; - Image IMG_LIB_HC - { - ImageBitmap = Bitmap { File = "imh30820.png"; }; - MASKCOLOR - }; Image IMG_MACRO { ImageBitmap = Bitmap { File = "im30821.png"; }; MASKCOLOR }; - Image IMG_MACRO_HC - { - ImageBitmap = Bitmap { File = "imh30821.png"; }; - MASKCOLOR - }; Image IMG_DOC { ImageBitmap = Bitmap { File = "im30826.png"; }; MASKCOLOR }; - Image IMG_DOC_HC - { - ImageBitmap = Bitmap { File = "imh30826.png"; }; - MASKCOLOR - }; }; FixedText TXT_SELECTOR_COMMANDS { diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index 4d3240597259..34dd071e50e9 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <SpellAttrib.hxx> #include <vcl/font.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -36,137 +34,120 @@ using namespace svx; using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; -/*-- 26.06.2008 10:41:57--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rDesc ) { } -/*-- 10.09.2003 12:54:34--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription ) { } -/*-- 10.09.2003 12:54:34--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::~SpellErrorAttrib() { } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellErrorAttrib::SetFont( Font& ) const { //this attribute doesn't have a visual effect } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellErrorAttrib::Clone() const { return new SpellErrorAttrib(*this); } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(eLang) { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(rAttr.m_eLanguage) { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::~SpellLanguageAttrib() { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellLanguageAttrib::SetFont( Font& ) const { //no visual effect } -/*-- 10.09.2003 14:27:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellLanguageAttrib::Clone() const { return new SpellLanguageAttrib(*this); } -/*-- 10.09.2003 14:27:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } -/*-- 31.10.2003 16:07:45--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { } -/*-- 31.10.2003 16:07:45--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rAttr.m_aBackgroundColor) { } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::~SpellBackgroundAttrib() { } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellBackgroundAttrib::SetFont( Font& rFont ) const { rFont.SetFillColor(m_aBackgroundColor); } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellBackgroundAttrib::Clone() const { return new SpellBackgroundAttrib(*this); } -/*-- 31.10.2003 16:07:47--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index bbd631f056b0..9ebc229380ce 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/linguistic2/XProofreader.hpp> #include <tools/color.hxx> -//namespace com{ namespace sun{ namespace star{ namespace linguistic2{ -// class XSpellAlternatives; -//}}}} #define TEXTATTR_SPELL_ERROR (TEXTATTR_USER_START + 1) #define TEXTATTR_SPELL_LANGUAGE (TEXTATTR_USER_START + 2) @@ -96,21 +94,18 @@ struct SpellErrorDescription sRuleId == rDesc.sRuleId; } }; -/* -----------------10.09.2003 14:23----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellErrorAttrib : public TextAttrib { public: private: - //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives; SpellErrorDescription m_aSpellErrorDescription; //not accessible SpellErrorAttrib(); public: -// SpellErrorAttrib(com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> xAlternatives); SpellErrorAttrib( const SpellErrorDescription& ); SpellErrorAttrib( const SpellErrorAttrib& rAttr ); ~SpellErrorAttrib(); @@ -122,9 +117,8 @@ public: virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; }; -/* -----------------10.09.2003 14:23----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellLanguageAttrib : public TextAttrib { LanguageType m_eLanguage; @@ -146,9 +140,8 @@ public: virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; }; -/* -----------------31.10.2003 16:01----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellBackgroundAttrib : public TextAttrib { Color m_aBackgroundColor; @@ -171,3 +164,5 @@ public: }; }//namespace svx #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 8ded7a2cc78b..b185e3191aa7 100755..100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/ref.hxx> @@ -86,7 +84,6 @@ struct SpellDialog_Impl Sequence< Reference< XDictionary > > aDics; }; // ----------------------------------------------------------------------- -//#define VENDOR_IMAGE_HEIGHT 44 //as specified #define SPELLUNDO_START 200 @@ -160,7 +157,6 @@ public: void SetErrorLanguageSelected(bool bSet){ m_bIsErrorLanguageSelected = bSet;} bool IsErrorLanguageSelected() const {return m_bIsErrorLanguageSelected;} - void SetDictionary(Reference<XDictionary> xDict) { m_xDictionary = xDict; } Reference<XDictionary> GetDictionary() const {return m_xDictionary;} void SetAddedWord(const ::rtl::OUString& rWord) {m_sAddedWord = rWord;} @@ -175,22 +171,19 @@ public: }; }//namespace svx using namespace ::svx; -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellUndoAction_Impl::~SpellUndoAction_Impl() { } -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellUndoAction_Impl::Undo() { m_rActionLink.Call(this); } -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- sal_uInt16 SpellUndoAction_Impl::GetId()const { return m_nId; @@ -234,7 +227,6 @@ SpellDialog::SpellDialog( aBackgroundGB ( this, CUI_RES( GB_BACKGROUND ) ), aVendorImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), - aVendorImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ), aResumeST ( CUI_RES(ST_RESUME )), aIgnoreOnceST ( aIgnorePB.GetText()), @@ -331,13 +323,11 @@ void SpellDialog::UpdateBoxes_Impl() const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); LanguageType nAltLanguage = LANGUAGE_NONE; - //String aAltWord; Sequence< ::rtl::OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { nAltLanguage = SvxLocaleToLanguage( pSpellErrorDescription->aLocale ); - //aAltWord = String( xAlt->getWord() ); aNewWords = pSpellErrorDescription->aSuggestions; bIsGrammarError = pSpellErrorDescription->bIsGrammarError; aExplainPB.SetExplanation(pSpellErrorDescription->sExplanation ); @@ -353,7 +343,6 @@ void SpellDialog::UpdateBoxes_Impl() SetTitle_Impl( nAltLanguage ); SetSelectedLang_Impl( nAltLanguage ); - // Alternativen eintragen const ::rtl::OUString *pNewWords = aNewWords.getConstArray(); const sal_Int32 nSize = aNewWords.getLength(); @@ -369,7 +358,6 @@ void SpellDialog::UpdateBoxes_Impl() if(!nSize) aSuggestionLB.InsertEntry( aNoSuggestionsST ); aAutoCorrPB.Enable( nSize > 0 ); - //aSentenceED.GrabFocus(); aSuggestionFT.Enable(nSize > 0); aSuggestionLB.Enable(nSize > 0); @@ -420,7 +408,6 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent } while(aControls[++nIdx]); - } if( bNextSentence ) { @@ -430,10 +417,9 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent } } } -/* -----------------10.09.2003 14:04----------------- - Initialize, asynchronous to prevent virtial calls - from a constructor - --------------------------------------------------*/ +/* Initialize, asynchronous to prevent virtial calls + from a constructor + */ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) { pThis->SetUpdateMode( sal_False ); @@ -489,7 +475,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) aVendorSize.Width() = aImageSize.Width(); pThis->aVendorImageFI.SetSizePixel( aVendorSize ); } - //aVendorSize.Height() = nDiff; sal_Int32 nDiff = aVendorSize.Height(); pThis->aVendorImageFI.SetSizePixel(aVendorSize); Control* aControls[] = { @@ -637,7 +622,6 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG ) return 1; } - // ----------------------------------------------------------------------- IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG ) @@ -720,9 +704,8 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) aSentenceED.UndoActionEnd(); return 1; } -/*-- 06.11.2003 11:24:08--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) { aSentenceED.Undo(); @@ -730,9 +713,8 @@ IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) aUndoPB.Enable(sal_False); return 0; } -/*-- 06.11.2003 12:19:15--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) { switch(pAction->GetId()) @@ -809,7 +791,6 @@ IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG ) return 1; } - // ----------------------------------------------------------------------- sal_Bool SpellDialog::Close() @@ -833,9 +814,8 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const sal_Int16 nLang = aLanguageLB.GetSelectLanguage(); return nLang; } -/* -----------------28.10.2003 14:27----------------- - --------------------------------------------------*/ +//------------------------------------------------- IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) { //if currently an error is selected then search for alternatives for @@ -876,9 +856,7 @@ void SpellDialog::SetLanguage( sal_uInt16 nLang ) // den richtigen Eintrag finden, da sortiert aLanguageLB.SelectLanguage( nLang ); } -/*-- 16.06.2008 11:27:02--------------------------------------------------- - -----------------------------------------------------------------------*/ static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) { Image aRes; @@ -901,9 +879,8 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); ::rtl::OUString sSuggestionImageUrl = - SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast ); + SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName ); aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) ); uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); if( xDisplayName.is() ) @@ -911,8 +888,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage ); + aVendorImageFI.SetImage( aVendorImage ); } if( sVendor.Len() ) @@ -922,7 +898,6 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - //bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); sTitle = m_sTitleSpellingGrammar; } } @@ -997,9 +972,8 @@ void SpellDialog::InitUserDicts() aAddToDictMB.SetPopupMenu(pMenu); aAddToDictMB.Enable( bEnable ); } -/*-- 20.10.2003 15:31:06--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) { aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP ); @@ -1049,9 +1023,8 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) aSentenceED.UndoActionEnd(); return 0; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) { if (&aSentenceED == pEd) @@ -1076,9 +1049,8 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) } return 0; }; -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) { //apply changes and ignored text parts first - if there are any @@ -1086,9 +1058,8 @@ IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) Close(); return 0; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellDialog::Paint( const Rectangle& rRect ) { ModelessDialog::Paint(rRect ); @@ -1096,9 +1067,8 @@ void SpellDialog::Paint( const Rectangle& rRect ) DecorationView aDecoView( this ); aDecoView.DrawButton( aRect, BUTTON_DRAW_NOFILL); } -/*-- 28.10.2003 13:26:39--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- long SpellDialog::Notify( NotifyEvent& rNEvt ) { /* #i38338# @@ -1125,9 +1095,8 @@ long SpellDialog::Notify( NotifyEvent& rNEvt ) } return SfxModelessDialog::Notify(rNEvt); } -/* -----------------10.09.2003 08:26----------------- - --------------------------------------------------*/ +//------------------------------------------------- void SpellDialog::InvalidateDialog() { if( bFocusLocked ) @@ -1159,13 +1128,11 @@ void SpellDialog::InvalidateDialog() SfxModelessDialog::Deactivate(); } -/*-- 10.09.2003 08:35:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) { bool bRet = false; - if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/) + if(!bUseSavedSentence) { //apply changes and ignored text parts rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck); @@ -1199,7 +1166,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) // hidden text has to be ignored if(!aStart->bIsHidden) sText += aStart->sText; - aStart++; + ++aStart; } aSentenceED.SetText(sText); aStart = aSentence.begin(); @@ -1241,7 +1208,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) aSentenceED.SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); nStartPosition = nEndPosition; } - aStart++; + ++aStart; } //the edit field needs to be modified to apply the change from the ApplyChangeAllList if(!bHasReplaced) @@ -1252,7 +1219,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) } return bRet; } -/*-- 12.11.2003 15:21:25--------------------------------------------------- +/*------------------------------------------------------------------------- replace errrors that have a replacement in the ChangeAllList returns false if the result doesn't contain errors after the replacement -----------------------------------------------------------------------*/ @@ -1281,13 +1248,12 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe } else if( aStart->bIsGrammarError ) bRet = true; - aStart++; + ++aStart; } return bRet; } -/*-- 10.09.2003 10:40:21--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const ResId& rResId ) : MultiLineEdit( pParent, rResId ), m_nErrorStart(0), @@ -1296,13 +1262,12 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const Re { DisableSelectionOnFocus(); } -/*-- 10.09.2003 10:40:11--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SentenceEditWindow_Impl::~SentenceEditWindow_Impl() { } -/*-- 20.10.2003 13:42:34--------------------------------------------------- +/*------------------------------------------------------------------------- The selection before inputting a key may have a range or not and it may be inside or outside of field or error attributes. A range may include the attribute partially, completely or together @@ -1394,7 +1359,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bool bHasError = false; bool bHasFieldLeft = false; bool bHasErrorLeft = false; -// bool bInsideAttr = false; bool bHasRange = rCurrentSelection.HasRange(); sal_uInt8 nSelectionType = 0; // invalid type! @@ -1474,7 +1438,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) pErrorAttrLeft = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR ); bHasFieldLeft = pBackAttrLeft !=0; bHasErrorLeft = pErrorAttrLeft != 0; -// bInsideAttr = (bHasField || bHasError) && (bHasFieldLeft || bHasErrorLeft); ++aCursor.GetIndex(); } } @@ -1489,9 +1452,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bool bBackspace = rKeyCode.GetCode() == KEY_BACKSPACE; sal_Int8 nAction = ACTION_CONTINUE; -// nAction = ACTION_UNDOEDIT -// nAction = ACTION_SELECTFIELD -// nAction = ACTION_EXPAND switch(nSelectionType) { // 1 - backspace delete any other @@ -1645,9 +1605,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) long nRet = bChange ? 1 : MultiLineEdit::PreNotify(rNEvt); return nRet; } -/*-- 10.09.2003 13:38:14--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) { if (bIgnoreCurrentError) @@ -1683,7 +1642,6 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) Reference<XDictionary> xChangeAll( SvxGetChangeAllList(), UNO_QUERY ); Reference<XDictionaryEntry> xEntry; -// Reference <XSpellAlternatives> xAlternatives; const SpellErrorDescription* pSpellErrorDescription = 0; if(pNextError) { @@ -1733,9 +1691,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) return bRet; } -/*-- 06.11.2003 13:30:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError) { TextEngine* pTextEngine = GetTextEngine(); @@ -1747,9 +1703,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd m_nErrorEnd = nEnd; } -/*-- 17.09.2003 10:13:08--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage) { //calculate length changes @@ -1760,7 +1714,6 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT pTextEngine->UndoActionStart(); const TextCharAttrib* pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR ); DBG_ASSERT(pErrorAttrib, "no error attribute found"); -// Reference <XSpellAlternatives> xAlternatives; const SpellErrorDescription* pSpellErrorDescription = 0; if(pErrorAttrib) { @@ -1769,7 +1722,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT } const TextCharAttrib* pBackAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_BACKGROUND ); pTextEngine->ReplaceText( aSel, rNewWord ); - // + if(!m_nErrorStart) { //attributes following an error at the start of the text are not moved but expanded from the @@ -1812,16 +1765,14 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT SetAttrib( SpellLanguageAttrib(eLanguage), 0, m_nErrorStart, m_nErrorEnd ); pTextEngine->UndoActionEnd(); } -/* -----------------08.10.2003 13:18----------------- - --------------------------------------------------*/ +//------------------------------------------------- String SentenceEditWindow_Impl::GetErrorText() const { return GetTextEngine()->GetText(TextSelection(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd) )); } -/*-- 26.06.2008 10:54:13--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() { TextPaM aCursor(0, m_nErrorStart); @@ -1829,9 +1780,8 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)); return pAttrib ? &pAttrib->GetErrorDescription() : 0; } -/*-- 06.09.2004 10:50:32--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::RestoreCurrentError() { TextPaM aCursor(0, m_nErrorStart); @@ -1844,9 +1794,8 @@ void SentenceEditWindow_Impl::RestoreCurrentError() ChangeMarkedWord(rDesc.sErrorText, SvxLocaleToLanguage( rDesc.aLocale )); } } -/*-- 28.10.2003 14:44:10--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xAlt ) { TextPaM aCursor(0, m_nErrorStart); @@ -1870,25 +1819,20 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd ); } -/*-- 10.09.2003 14:43:02--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ) { GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd); } -/*-- 10.09.2003 14:43:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetText( const String& rStr ) { m_nErrorStart = m_nErrorEnd = 0; GetTextEngine()->SetText(rStr); -// InitScrollBars(); } -/*-- 08.10.2003 14:35:52--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- struct LanguagePosition_Impl { sal_uInt16 nPosition; @@ -1925,7 +1869,7 @@ void lcl_InsertBreakPosition_Impl( } rBreakPositions.push_back(LanguagePosition_Impl(nInsert, eLanguage)); } -/*-- 17.09.2003 14:26:59--------------------------------------------------- +/*------------------------------------------------------------------------- Returns the text in spell portions. Each portion contains text with an equal language and attribute. The spell alternatives are empty. -----------------------------------------------------------------------*/ @@ -1962,7 +1906,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore } aCursor.GetIndex()++; } - // + if(nTextLen && aBreakPositions.empty()) { //if all content has been overwritten the attributes may have been removed, too @@ -1990,7 +1934,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore aPortion1.sText = pTextEngine->GetText( TextSelection(TextPaM(0, nStart), TextPaM(0, aStart->nPosition))); bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) != m_aIgnoreErrorsAt.end(); - if( bSetIgnoreFlag && bIsIgnoreError /*m_nErrorStart == nStart*/ ) + if( bSetIgnoreFlag && bIsIgnoreError ) { aPortion1.bIgnoreThisError = true; } @@ -2029,9 +1973,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore return aRet; } -/*-- 06.11.2003 11:30:10--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::Undo() { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); @@ -2050,47 +1992,40 @@ void SentenceEditWindow_Impl::Undo() if(bSaveUndoEdit || SPELLUNDO_CHANGE_GROUP == nId) GetSpellDialog()->UpdateBoxes_Impl(); } -/*-- 06.11.2003 11:30:10--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::ResetUndo() { GetTextEngine()->ResetUndo(); } -/*-- 06.11.2003 12:30:41--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg ) { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); rUndoMgr.AddUndoAction(pAction, bTryMerg); GetSpellDialog()->aUndoPB.Enable(); } -/*-- 06.11.2003 12:38:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount() { return GetTextEngine()->GetUndoManager().GetUndoActionCount(); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::UndoActionStart( sal_uInt16 nId ) { GetTextEngine()->UndoActionStart(nId); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::UndoActionEnd() { GetTextEngine()->UndoActionEnd(); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) { if(nOffset > 0) @@ -2098,9 +2033,8 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) else m_nErrorEnd = m_nErrorEnd -(sal_uInt16)- nOffset; } -/*-- 13.11.2003 15:15:19--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) { DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?"); @@ -2141,15 +2075,12 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pSpellDialog->aChangePB.Enable(); } -/*-- 30.06.2008 14:15:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- ExplainButton::~ExplainButton() { } -/*-- 30.06.2008 14:15:19--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void ExplainButton::RequestHelp( const HelpEvent& ) { Help::ShowBalloon( this, GetPosPixel(), m_sExplanation ); @@ -2159,3 +2090,5 @@ void ExplainButton::Click() { RequestHelp( HelpEvent() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc index 5c9a82ffef0e..d51ec1e82249 100644 --- a/cui/source/dialogs/SpellDialog.hrc +++ b/cui/source/dialogs/SpellDialog.hrc @@ -51,5 +51,4 @@ #define PB_EXPLAIN 55 #define IMG_VENDOR 56 #define IMG_DEFAULT_VENDOR 57 -#define IMG_DEFAULT_VENDOR_HC 58 #define PB_IGNORERULE 59 diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 3c3c7a6be3ca..663b156b467a 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -229,29 +229,5 @@ ModelessDialog RID_SVXDLG_SPELLCHECK { ImageBitmap = Bitmap { File = "vendor01.png"; }; }; - Image IMG_DEFAULT_VENDOR_HC - { - ImageBitmap = Bitmap { File = "vendor01h.png"; }; - }; - }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 115630b86b68..4f91a0ebd3a1 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,13 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "commonlingui.hxx" #include <cuires.hrc> #include <dialmgr.hxx> #include <vcl/decoview.hxx> +#include <sal/macros.h> #include "hangulhanjadlg.hrc" @@ -78,7 +78,7 @@ XubString SvxClickInfoCtr::GetText() const } //----------------------------------------------------------------------------- -__EXPORT SvxClickInfoCtr::~SvxClickInfoCtr() +SvxClickInfoCtr::~SvxClickInfoCtr() { } @@ -104,11 +104,6 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) ,aAuditBox ( this, CUI_RES( GB_AUDIT ) ) { FreeResource(); - -#ifdef FS_PRIV_DEBUG - SetType( WINDOW_TABPAGE ); -#endif - aAktWord.SetAccessibleName(aWordText.GetText()); SetPosSizePixel( Point( 0, 0 ), _pParent->GetOutputSizePixel() ); Show(); @@ -207,7 +202,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY ) { this, &aAuditBox, &aStatusText }; - for ( sal_uInt32 i = 0; i < sizeof( pResize ) / sizeof( pResize[0] ); ++i ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pResize ); ++i ) { aSize = pResize[i]->GetSizePixel( ); pResize[i]->SetSizePixel( Size( aSize.Width() + _nX, aSize.Height() + _nY ) ); @@ -220,7 +215,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY ) { &aStatusText, &aHelpBtn, &aCancelBtn }; - for ( sal_uInt32 i = 0; i < sizeof( pMoveDown ) / sizeof( pMoveDown[0] ); ++i ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pMoveDown ); ++i ) { aPos = pMoveDown[i]->GetPosPixel(); aPos.Y() += _nY; @@ -234,7 +229,7 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY ) { &aIgnoreBtn, &aIgnoreAllBtn, &aChangeBtn, &aChangeAllBtn, &aOptionsBtn, &aHelpBtn, &aCancelBtn }; - for ( sal_uInt32 i = 0; i < sizeof( pMoveRight ) / sizeof( pMoveRight[0] ); ++i ) + for ( sal_uInt32 i = 0; i < SAL_N_ELEMENTS( pMoveRight ); ++i ) { aPos = pMoveRight[i]->GetPosPixel(); aPos.X() += _nX; @@ -242,3 +237,5 @@ void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index c6eb11b9a48c..37e27b89658b 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <svtools/stdctrl.hxx> #include <vcl/edit.hxx> #include <svtools/svxbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/dialog.hxx> @@ -157,3 +156,5 @@ public: #endif // SVX_COMMON_LINGUI_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src index 60a1eff0e14f..639c5ef755ef 100644 --- a/cui/source/dialogs/commonlingui.src +++ b/cui/source/dialogs/commonlingui.src @@ -134,20 +134,3 @@ Window RID_SVX_WND_COMMON_LINGU Text [ en-US ] = "~Close" ; }; }; - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6c6d7ed4b47a..777851cce643 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <stdio.h> @@ -37,15 +35,16 @@ #include <tools/debug.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> -#include <vcl/msgbox.hxx> #include <svtools/colorcfg.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svl/stritem.hxx> #include <svl/itempool.hxx> #include <rtl/textenc.h> #include <svx/ucsubset.hxx> +#include <sfx2/objsh.hxx> +#include <vcl/msgbox.hxx> +#include <svl/stritem.hxx> #include <cuires.hrc> #include <dialmgr.hxx> @@ -263,12 +262,10 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* : mpDialog( pDialog ), aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ), aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ), -// aShowShortcut ( pDialog, ResId( CT_ASSIGN, *pResContext ) ), aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ), aCancelBtn ( pDialog, ResId( BTN_CHAR_CANCEL, *pResContext ) ), aHelpBtn ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ), aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ), -// aAssignBtn ( pDialog, ResId( BT_ASSIGN, *pResContext ) ), aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ), aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ), aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ), @@ -276,7 +273,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ), aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ), aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ), -// aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ), bOne( bOne_ ), pSubsetMap( NULL ) { @@ -312,7 +308,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* // the font may not be in the list => // try to find a font name token in list and select found font, // else select topmost entry - FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); + bool bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); if( !bFound ) { for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i ) @@ -341,7 +337,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* aShowSet.SetHighlightHdl( LINK( this, SvxCharMapData, CharHighlightHdl ) ); aShowSet.SetPreSelectHdl( LINK( this, SvxCharMapData, CharPreSelectHdl ) ); aDeleteBtn.SetClickHdl( LINK( this, SvxCharMapData, DeleteHdl ) ); -// aAssignBtn.SetClickHdl( LINK( this, SvxCharMapData, AssignHdl ) ); if( SvxShowCharSet::getSelectedChar() == ' ') aOKBtn.Disable(); @@ -351,7 +346,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* // left align aShowText field int nLeftEdge = aSymbolText.GetPosPixel().X(); nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() ); - Size aNewSize = aShowText.GetOutputSizePixel(); aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) ); } @@ -564,10 +558,6 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG ) return 0; } -#include <sfx2/objsh.hxx> -#include <vcl/msgbox.hxx> -#include <svl/stritem.hxx> - IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG ) { SfxAllItemSet aSet( SfxObjectShell::Current()->GetPool() ); @@ -587,3 +577,5 @@ IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG ) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index a761efcdca28..b4556cccdf3e 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -47,6 +45,7 @@ #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> #include <svx/svxdlg.hxx> +#include <sal/macros.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; @@ -72,7 +71,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) // hide the options for the japanese search Control* pFieldsToMove[] = { &m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint }; - implMoveControls(pFieldsToMove, sizeof(pFieldsToMove)/sizeof(pFieldsToMove[0]), nDifference, &m_flOptions); + implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flOptions); m_aSoundsLikeCJK.Hide(); m_aSoundsLikeCJKSettings.Hide(); @@ -83,7 +82,6 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) m_aHalfFullFormsCJK.Hide(); // never ignore the width (ignoring is expensive) if the option is not available at all - // 04.12.2001 - 91973 - fs@openoffice.org m_pSearchEngine->SetIgnoreWidthCJK( sal_False ); } @@ -171,7 +169,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c &m_pbApproxSettings, &m_aHalfFullFormsCJK, &m_aSoundsLikeCJK, &m_aSoundsLikeCJKSettings, &m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint }; - implMoveControls(pFieldsToMove, sizeof(pFieldsToMove)/sizeof(pFieldsToMove[0]), nDifference, &m_flWhere); + implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flWhere); Point pt = m_rbAllFields.GetPosPixel(); pt.X() = m_ftForm.GetPosPixel().X(); @@ -239,7 +237,7 @@ FmSearchDialog::~FmSearchDialog() //------------------------------------------------------------------------ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sInitialText) { - // die Initialisierung all der Controls + //the initialization of all the Controls m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNotNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); @@ -267,19 +265,19 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_aHalfFullFormsCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); m_aSoundsLikeCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); - // die Listboxen fuellen - // die Methoden des Feldvergleiches + // fill the listboxes + // method of field comparison sal_uInt16 nResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, RID_STR_SEARCH_END, RID_STR_SEARCH_WHOLE }; - for ( size_t i=0; i<sizeof(nResIds)/sizeof(nResIds[0]); ++i ) + for ( size_t i=0; i<SAL_N_ELEMENTS(nResIds); ++i ) m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) ); m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); - // die Feld-Listbox + // the field listbox for (sal_uInt16 i=0; i<strVisibleFields.GetTokenCount(';'); ++i) m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';')); @@ -288,14 +286,15 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI LoadParams(); m_cmbSearchText.SetText(sInitialText); - // wenn die Edit-Zeile den Text veraendert hat (weil er zum Beispiel Steuerzeichen enthielt, wie das bei Memofeldern der Fall - // sein kann), nehme ich einen leeren UniString + // if the Edit-line has changed the text (e.g. because it contains + // control characters, as can be the case with memo fields), I use + // an empty UniString. UniString sRealSetText = m_cmbSearchText.GetText(); if (!sRealSetText.Equals(sInitialText)) m_cmbSearchText.SetText(UniString()); LINK(this, FmSearchDialog, OnSearchTextModified).Call(&m_cmbSearchText); - // initial die ganzen UI-Elemente fuer die Suche an + // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); m_aDelayedPaint.SetTimeout(500); EnableSearchUI(sal_True); @@ -309,8 +308,10 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI //------------------------------------------------------------------------ sal_Bool FmSearchDialog::Close() { - // Wenn der Close-Button disabled ist und man im Dialog ESC drueckt, dann wird irgendwo vom Frame trotzdem Close aufgerufen, - // was ich allerdings nicht will, wenn ich gerade mitten in einer (eventuell in einem extra Thread laufenden) Suche bin + // If the close button is disabled and ESC is pressed in a dialog, + // then Frame will call Close anyway, which I don't want to happen + // while I'm in the middle of a search (maybe one that's running + // in its own thread) if (!m_pbClose.IsEnabled()) return sal_False; return ModalDialog::Close(); @@ -324,7 +325,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) EnableSearchForDependees(sal_True); } else - // die Feldlistbox entsprechend en- oder disablen + // en- or disable field list box accordingly if (pButton == &m_rbSingleField) { m_lbField.Enable(); @@ -411,23 +412,22 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) else if (&m_aSoundsLikeCJKSettings == pButton) { SfxItemSet aSet( SFX_APP()->GetPool() ); - //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - aDlg->Execute(); //CHINA001 aDlg.Execute(); + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + aDlg->Execute(); - sal_Int32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 sal_Int32 nFlags = aDlg.GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); m_pSearchEngine->SetTransliterationFlags(nFlags); m_cbCase.Check(m_pSearchEngine->GetCaseSensitive()); OnCheckBoxToggled( &m_cbCase ); m_aHalfFullFormsCJK.Check( !m_pSearchEngine->GetIgnoreWidthCJK() ); OnCheckBoxToggled( &m_aHalfFullFormsCJK ); - delete aDlg; //add for CHINA001 + delete aDlg; } } @@ -492,7 +492,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) { // die beiden jeweils anderen Boxes disablen oder enablen CheckBox* pBoxes[] = { &m_cbWildCard, &m_cbRegular, &m_cbApprox }; - for (sal_uInt32 i=0; i<sizeof(pBoxes)/sizeof(CheckBox*); ++i) + for (sal_uInt32 i=0; i< SAL_N_ELEMENTS(pBoxes); ++i) { if (pBoxes[i] != pBox) { @@ -629,7 +629,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( !bEnable ) { // if one of my children has the focus, remember it - // 104332 - 2002-10-17 - fs@openoffice.org Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) m_pPreSearchFocus = pFocusWindow; @@ -664,7 +663,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) { // this means we're preparing for starting a search // In this case, EnableSearchForDependees disabled the search button // But as we're about to use it for cancelling the search, we really need to enable it, again - // 07.12.2001 - 95246 - fs@openoffice.org m_pbSearchAgain.Enable( sal_True ); } } @@ -677,7 +675,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( bEnable ) { // restore focus - // 104332 - 2002-10-17 - fs@openoffice.org if ( m_pPreSearchFocus ) { m_pPreSearchFocus->GrabFocus(); @@ -725,13 +722,13 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) &m_pbSearchAgain, &m_pbClose }; if (!bEnable) - for (sal_uInt32 i=0; i<sizeof(pAffectedControls)/sizeof(pAffectedControls[0]); ++i) + for (sal_uInt32 i=0; i<SAL_N_ELEMENTS(pAffectedControls); ++i) { pAffectedControls[i]->SetUpdateMode(bEnable); pAffectedControls[i]->EnablePaint(bEnable); } else - for (sal_uInt32 i=0; i<sizeof(pAffectedControls)/sizeof(pAffectedControls[0]); ++i) + for (sal_uInt32 i=0; i<SAL_N_ELEMENTS(pAffectedControls); ++i) { pAffectedControls[i]->EnablePaint(bEnable); pAffectedControls[i]->SetUpdateMode(bEnable); @@ -769,7 +766,7 @@ void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_I //------------------------------------------------------------------------ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // diese eine Methode Thread-sicher machen (das ist ein Overkill, die ganze restliche Applikation dafuer zu blockieren, // aber im Augenblick haben wir kein anderes Sicherheitskonpzept) @@ -808,7 +805,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) : RID_SVXERR_SEARCH_NORECORD; ErrorBox(this, CUI_RES(nErrorId)).Execute(); } - // KEIN break ! + // NO break ! case FmSearchProgress::STATE_CANCELED: EnableSearchUI(sal_True); if (m_lnkCanceledNotFoundHdl.IsSet()) @@ -963,3 +960,4 @@ void FmSearchDialog::SaveParams() const m_pConfig->setParams( aCurrentSettings ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 98600eb765ff..9b2c7cc52606 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <algorithm> #include <ucbhelper/content.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <avmedia/mediawindow.hxx> @@ -138,7 +136,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, sal_Bool bRecursive ) { { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpProgress->SetDirectory( rStartURL ); mpProgress->Sync(); @@ -150,8 +148,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); Sequence< OUString > aProps( 2 ); - aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" ); - aProps.getArray()[ 1 ] = OUString::createFromAscii( "IsDocument" ); + aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" )); + aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" )); ::com::sun::star::uno::Reference< XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); @@ -193,14 +191,14 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, String(aFoundURL.GetExtension().toAsciiLowerCase()) ) != rFormats.end() ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; - mpBrowser->aFoundList.Insert( - new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ), - LIST_APPEND ); + mpBrowser->aFoundList.push_back( + new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ) + ); mpBrowser->aLbxFound.InsertEntry( GetReducedString( aFoundURL, 50 ), - (sal_uInt16) mpBrowser->aFoundList.Count() - 1 ); + (sal_uInt16) mpBrowser->aFoundList.size() - 1 ); } } } @@ -306,7 +304,7 @@ void SAL_CALL TakeThread::run() GalleryProgress* pStatusProgress; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pStatusProgress = new GalleryProgress; nEntries = mpBrowser->bTakeAll ? mpBrowser->aLbxFound.GetEntryCount() : mpBrowser->aLbxFound.GetSelectEntryCount(); pThm->LockBroadcaster(); @@ -316,15 +314,15 @@ void SAL_CALL TakeThread::run() { // kompletten Filenamen aus FoundList holen if( mpBrowser->bTakeAll ) - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = i )); + aURL = INetURLObject( *mpBrowser->aFoundList[ nPos = i ] ); else - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) )); + aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]); // Position in Taken-Liste uebernehmen mrTakenList.Insert( (void*) (sal_uLong)nPos, LIST_APPEND ); { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpProgress->SetFile( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ); pStatusProgress->Update( i, nEntries - 1 ); @@ -334,7 +332,7 @@ void SAL_CALL TakeThread::run() } { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pThm->UnlockBroadcaster(); delete pStatusProgress; @@ -385,7 +383,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) { TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); - ::std::bit_vector aRemoveEntries( mpBrowser->aFoundList.Count(), false ); + ::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false ); ::std::vector< String > aRemainingVector; sal_uInt32 i, nCount; @@ -402,15 +400,14 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) // refill found list for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i ) if( !aRemoveEntries[ i ] ) - aRemainingVector.push_back( *mpBrowser->aFoundList.GetObject( i ) ); - - for( String* pStr = mpBrowser->aFoundList.First(); pStr; pStr = mpBrowser->aFoundList.Next() ) - delete pStr; + aRemainingVector.push_back( *mpBrowser->aFoundList[ i ] ); - mpBrowser->aFoundList.Clear(); + for ( i = 0, nCount = mpBrowser->aFoundList.size(); i < nCount; ++i ) + delete mpBrowser->aFoundList[ i ]; + mpBrowser->aFoundList.clear(); for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i ) - mpBrowser->aFoundList.Insert( new String( aRemainingVector[ i ] ), LIST_APPEND ); + mpBrowser->aFoundList.push_back( new String( aRemainingVector[ i ] ) ); aRemainingVector.clear(); @@ -712,7 +709,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) aFtMSShowContent.SetText( aOutStr ); // get locale wrapper (singleton) - const LocaleDataWrapper& aLocaleData = SvtSysLocale().GetLocaleData(); + const SvtSysLocale aSysLocale; + const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); // ChangeDate/Time aAccess = aLocaleData.getDate( pData->aThemeChangeDate ); @@ -826,8 +824,8 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() xMediaPlayer.clear(); xDialogListener.clear(); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; for( void* pEntry = aFilterEntryList.First(); pEntry; pEntry = aFilterEntryList.Next() ) delete (FilterEntry*) pEntry; @@ -1005,10 +1003,10 @@ void TPGalleryThemeProperties::SearchFiles() { SearchProgress* pProgress = new SearchProgress( this, aURL ); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; + aFoundList.clear(); - aFoundList.Clear(); aLbxFound.Clear(); pProgress->SetFileType( aCbbFileType.GetText() ); @@ -1041,7 +1039,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if( xMgr.is() ) { xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >( - xMgr->createInstance( OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" )), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ))), UNO_QUERY ); if ( xFolderPicker.is() ) { @@ -1069,9 +1067,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) } catch(IllegalArgumentException) { -#ifdef DBG_UTIL - DBG_ERROR( "Folder picker failed with illegal arguments" ); -#endif + OSL_FAIL( "Folder picker failed with illegal arguments" ); } } @@ -1123,7 +1119,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { - INetURLObject _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) ); + INetURLObject _aURL( *aFoundList[ aLbxFound.GetEntryPos( aString ) ] ); bInputAllowed = sal_False; if ( !aWndPreview.SetGraphic( _aURL ) ) @@ -1205,7 +1201,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) else aCbxPreview.Disable(); - if( aFoundList.Count() ) + if( aFoundList.size() ) aBtnTakeAll.Enable(); else aBtnTakeAll.Disable(); @@ -1246,7 +1242,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG ) IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG ) { - if( aFoundList.Count() ) + if( aFoundList.size() ) { aLbxFound.SelectEntryPos( 0 ); aBtnTakeAll.Enable(); @@ -1275,3 +1271,4 @@ IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dial return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index eea084548b2b..2e8caee8b188 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> @@ -40,280 +38,6 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_... -// -------------------- -// - SvxGraphicFilter - -// -------------------- -/* -sal_uLong SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) -{ - const Graphic& rGraphic = rFilterObject.GetGraphic(); - sal_uLong nRet; - - if( rGraphic.GetType() == GRAPHIC_BITMAP ) - { - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL; - Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; - Graphic aGraphic; - - switch( rReq.GetSlot() ) - { - case( SID_GRFFILTER_INVERT ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Invert() ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Invert() ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_SMOOTH ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Filter( BMP_FILTER_SMOOTH ) ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_SMOOTH ) ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_SHARPEN ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Filter( BMP_FILTER_SHARPEN ) ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_SHARPEN ) ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_REMOVENOISE ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Filter( BMP_FILTER_REMOVENOISE ) ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_REMOVENOISE ) ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_SOBEL ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Filter( BMP_FILTER_SOBEL_GREY ) ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_SOBEL_GREY ) ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_MOSAIC ): - { - GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False ); - - if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - } - break; - - case( SID_GRFFILTER_EMBOSS ): - { - GraphicFilterEmboss aDlg( pWindow, rGraphic, RP_MM ); - - if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - } - break; - - case( SID_GRFFILTER_POSTER ): - { - GraphicFilterPoster aDlg( pWindow, rGraphic, 16 ); - - if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - } - break; - - case( SID_GRFFILTER_POPART ): - { - if( pShell ) - pShell->SetWaitCursor( sal_True ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnimation( rGraphic.GetAnimation() ); - - if( aAnimation.Filter( BMP_FILTER_POPART ) ) - aGraphic = aAnimation; - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - - if( aBmpEx.Filter( BMP_FILTER_POPART ) ) - aGraphic = aBmpEx; - } - - if( pShell ) - pShell->SetWaitCursor( sal_False ); - } - break; - - case( SID_GRFFILTER_SEPIA ): - { - GraphicFilterSepia aDlg( pWindow, rGraphic, 10 ); - - if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - } - break; - - case( SID_GRFFILTER_SOLARIZE ): - { - GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False ); - - if( aDlg.Execute() == RET_OK ) - aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); - } - break; - - default: - { - DBG_ERROR( "SvxGraphicFilter: selected filter slot not yet implemented" ); - nRet = SVX_GRAPHICFILTER_UNSUPPORTED_SLOT; - } - break; - } - - if( aGraphic.GetType() != GRAPHIC_NONE ) - { - rFilterObject.SetGraphic( aGraphic ); - nRet = SVX_GRAPHICFILTER_ERRCODE_NONE; - } - } - else - nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; - - return nRet; -} - -// ----------------------------------------------------------------------------- - -void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) -{ - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER ) ) - rSet.DisableItem( SID_GRFFILTER ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_INVERT ) ) - rSet.DisableItem( SID_GRFFILTER_INVERT ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) ) - rSet.DisableItem( SID_GRFFILTER_SMOOTH ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) ) - rSet.DisableItem( SID_GRFFILTER_SHARPEN ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) ) - rSet.DisableItem( SID_GRFFILTER_REMOVENOISE ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) ) - rSet.DisableItem( SID_GRFFILTER_SOBEL ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) ) - rSet.DisableItem( SID_GRFFILTER_MOSAIC ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) ) - rSet.DisableItem( SID_GRFFILTER_EMBOSS ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POSTER ) ) - rSet.DisableItem( SID_GRFFILTER_POSTER ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_POPART ) ) - rSet.DisableItem( SID_GRFFILTER_POPART ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) ) - rSet.DisableItem( SID_GRFFILTER_SEPIA ); - - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) - rSet.DisableItem( SID_GRFFILTER_SOLARIZE ); -}; -*/ // -------------------------------------- // - GraphicFilterDialog::PreviewWindow - // -------------------------------------- @@ -729,7 +453,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); + default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); case( RP_LT ): nAzim = 4500, nElev = 4500; break; case( RP_MT ): nAzim = 9000, nElev = 4500; break; case( RP_RT ): nAzim = 13500, nElev = 4500; break; @@ -760,3 +484,5 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, return aRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index f394ba629af2..cc2cd69f53d7 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> @@ -111,29 +109,24 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) mbGrabFocus = sal_True; // insert pages Image aImage; - Image aImageHC; String aStrTitle; SvxIconChoiceCtrlEntry* pEntry = NULL; aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP ); aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) ); - aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create ); + pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, SvxHyperlinkInternetTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP ); aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) ); - aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create ); + pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, SvxHyperlinkMailTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP ); aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) ); - aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create ); + pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, SvxHyperlinkDocTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP ); aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) ); - aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create ); + pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, SvxHyperlinkNewDocTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // create itemset for tabpages @@ -234,26 +227,6 @@ void SvxHpLinkDlg::Move() Window::Move(); } -/*long SvxHpLinkDlg::PreNotify( NotifyEvent& rNEvt ) -{ - long nRet = 0; - - if( rNEvt.GetType() == EVENT_KEYINPUT ) - { - DBG_ASSERT( rNEvt.GetKeyEvent(), "-SvxHpLinkDlg::PreNotify(): no KeyEvent for key event?!" ); - - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - - if( KEY_MOD2 == pKEvt->GetKeyCode().GetModifier() && pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) ) - nRet = 1; - } - - if( !nRet ) - nRet = IconChoiceDialog::PreNotify( rNEvt ); - - return nRet; -}*/ - /************************************************************************* |* |* Click on Apply-button @@ -410,3 +383,5 @@ void SvxHpLinkDlg::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& rPage ) OSL_ENSURE( xDocumentFrame.is(), "SvxHpLinkDlg::PageCreated: macro assignment functionality won't work with a proper frame!" ); rHyperlinkPage.SetDocumentFrame( xDocumentFrame ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 950d400bb42e..f04dc998bedd 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> @@ -87,11 +85,13 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT maEdtDescription.SetText( rDescription ); maEdtName.SetText( rName ); - for( String* pStr = rTargetList.First(); pStr; pStr = rTargetList.Next() ) - maCbbTargets.InsertEntry( *pStr ); + for( size_t i = 0, n = rTargetList.size(); i < n; ++i ) + maCbbTargets.InsertEntry( *rTargetList[ i ] ); if( !rTarget.Len() ) maCbbTargets.SetText( String::CreateFromAscii( "_self" ) ); else maCbbTargets.SetText( rTarget ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index f7a30c9637e3..2e14b9752ab0 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> @@ -63,3 +61,5 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) FreeResource(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 0fd1b4275eb4..78cef105a297 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/ref.hxx> -#include <tools/list.hxx> #include <tools/shl.hxx> #include <tools/debug.hxx> #include <vcl/msgbox.hxx> @@ -37,7 +34,7 @@ #include <cuires.hrc> #include "dlgname.hxx" -#include "defdlgname.hxx" //CHINA001 +#include "defdlgname.hxx" #include "dlgname.hrc" #include <dialmgr.hxx> @@ -80,9 +77,6 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String } } -/* -----------------------------27.02.2002 15:22------------------------------ - - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) { if(aCheckNameHdl.IsSet()) @@ -229,8 +223,9 @@ void SvxMessDialog::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index 0c6c864005fd..291a50fbc47c 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -248,28 +248,3 @@ ModalDialog RID_SVXDLG_MESSBOX }; }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 0970049622fb..c13eaf373b2a 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -77,7 +77,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Maximum = 999 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; First = 1 ; Last = 999 ; SpinSize = 1 ; @@ -103,7 +103,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Maximum = 999 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; First = 1 ; Last = 999 ; SpinSize = 1 ; @@ -183,7 +183,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 100 ; SpinSize = 1 ; }; @@ -264,7 +264,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; First = 1 ; Last = 100 ; SpinSize = 1 ; @@ -428,35 +428,3 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 5a7490b174ca..732613dcccb0 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hangulhanjadlg.hxx" #include "hangulhanjadlg.hrc" #include "commonlingui.hxx" @@ -57,15 +55,6 @@ namespace svx { //............................................................................. -/* - using HangulHanjaConversion::eSimpleConversion; - using HangulHanjaConversion::eHangulBracketed; - using HangulHanjaConversion::eHanjaBracketed; - using HangulHanjaConversion::eRubyHanjaAbove; - using HangulHanjaConversion::eRubyHanjaBelow; - using HangulHanjaConversion::eRubyHangulAbove; - using HangulHanjaConversion::eRubyHangulBelow; -*/ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -369,7 +358,7 @@ namespace svx m_aValueSet.SetLineCount( LINE_CNT ); m_aValueSet.SetStyle( m_aValueSet.GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL ); m_aValueSet.SetBorderStyle( WINDOW_BORDER_MONO ); - String aOneCharacter(RTL_CONSTASCII_STRINGPARAM("AU")); + String aOneCharacter(RTL_CONSTASCII_USTRINGPARAM("AU")); long nItemWidth = 2*GetTextWidth( aOneCharacter ); m_aValueSet.SetItemWidth( nItemWidth ); @@ -599,19 +588,15 @@ namespace svx m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, LINK( this, HangulHanjaConversionDialog, OnOption ) ); m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); -// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { -// m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; } else { -// m_aHangulOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHanjaOnly; } -// m_pIgnoreNonPrimary->Check(); // initial focus FocusSuggestion( ); @@ -882,8 +867,6 @@ namespace svx //------------------------------------------------------------------------- sal_Bool HangulHanjaConversionDialog::GetUseBothDirections( ) const { -// DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" ); -// return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True; return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked(); } @@ -912,7 +895,7 @@ namespace svx case HHC::eRubyHangulAbove: m_pHangulAbove->Check(); break; case HHC::eRubyHangulBelow: m_pHangulBelow->Check(); break; default: - DBG_ERROR( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); + OSL_FAIL( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); } } @@ -934,7 +917,7 @@ namespace svx if ( m_pHangulBelow->IsChecked() ) return HHC::eRubyHangulBelow; - DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); + OSL_FAIL( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); return HHC::eSimpleConversion; } @@ -1161,7 +1144,6 @@ namespace svx m_aDictsLB.SetStyle( m_aDictsLB.GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); m_aDictsLB.SetSelectionMode( SINGLE_SELECTION ); m_aDictsLB.SetHighlightRange(); -// m_aDictsLB.SetHelpId( xxx ); m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); @@ -1753,13 +1735,13 @@ namespace svx //fill found entries into boxes sal_uInt32 nCnt = aEntries.getLength(); - sal_uInt32 n = 0; if( nCnt ) { if( !m_pSuggestions ) m_pSuggestions = new SuggestionList( MAXNUM_SUGGESTIONS ); const OUString* pSugg = aEntries.getConstArray(); + sal_uInt32 n = 0; while( nCnt ) { m_pSuggestions->Set( pSugg[ n ], sal_uInt16( n ) ); @@ -1897,3 +1879,5 @@ namespace svx //............................................................................. } // namespace svx //............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index cc0bfdd4522f..356416a61753 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hldocntp.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/docfac.hxx> @@ -123,7 +121,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) { // Set HC bitmaps and disable display of bitmap names. - maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtCreate.EnableTextDisplay (sal_False); InitStdControls(); @@ -135,7 +132,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbPath.Show(); maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath()); -// maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); // set defaults maRbtEditNow.Check(); @@ -210,7 +206,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () // Insert into listbox if ( aDocumentUrl.getLength() ) { - if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) ) // SJ: #106216# do not start + if ( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/simpress?slot=6686" ) ) ) // SJ: #106216# do not start aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress // insert private-url and default-extension as user-data @@ -362,7 +358,6 @@ void SvxHyperlinkNewDocTp::DoApply () SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) ); SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) ); - //SfxBoolItem aFrame( SID_OPEN_NEW_VIEW, sal_True ); String aStrFlags ( sal_Unicode('S') ); if ( maRbtEditLater.IsChecked() ) @@ -384,7 +379,6 @@ void SvxHyperlinkNewDocTp::DoApply () pViewFrame = pItem->GetFrame(); if (pViewFrame) { - //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame(); SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC, @@ -488,3 +482,4 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) return( 0L ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index ab87245f293a..63d96e8a0b75 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "cuihyperdlg.hxx" #include <unotools/localfilehelper.hxx> #include <sfx2/filedlghelper.hxx> @@ -35,13 +33,13 @@ #include "hldoctp.hxx" #include "hyperdlg.hrc" -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" -sal_Char __READONLY_DATA sHash[] = "#"; -sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; -sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://"; +sal_Char const sHash[] = "#"; +sal_Char const sFileScheme[] = INET_FILE_SCHEME; +sal_Char const sNewsSRVScheme[] = "news://"; // TODO news:// is nonsense -sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; +sal_Char const sHTTPScheme[] = INET_HTTP_SCHEME; /************************************************************************* |* @@ -63,10 +61,8 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), mbMarkWndOpen ( sal_False ) { - // Set HC bitmaps and disable display of bitmap names. - maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (sal_False); - maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtFileopen.EnableTextDisplay (sal_False); InitStdControls(); @@ -376,3 +372,5 @@ SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( String& aStrPath ) else return Type_ExistsFile; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 9ce0de2ea801..77e4cc1d2531 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,25 +26,22 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> #include <svl/adrparse.hxx> #include "hlinettp.hxx" #include "hyperdlg.hrc" -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" #define STD_DOC_SUBPATH "internal" #define STD_DOC_NAME "url_transfer.htm" -sal_Char __READONLY_DATA sAnonymous[] = "anonymous"; -sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; -sal_Char __READONLY_DATA sHTTPSScheme[] = INET_HTTPS_SCHEME; -sal_Char __READONLY_DATA sFTPScheme[] = INET_FTP_SCHEME; -sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME; +sal_Char const sAnonymous[] = "anonymous"; +sal_Char const sHTTPScheme[] = INET_HTTP_SCHEME; +sal_Char const sHTTPSScheme[] = INET_HTTPS_SCHEME; +sal_Char const sFTPScheme[] = INET_FTP_SCHEME; +sal_Char const sTelnetScheme[] = INET_TELNET_SCHEME; /************************************************************************* |* @@ -70,10 +68,8 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), mbMarkWndOpen ( sal_False ) { - // Set HC bitmaps and display display of bitmap names. - maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (sal_False); - maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtTarget.EnableTextDisplay (sal_False); InitStdControls(); @@ -549,3 +545,5 @@ void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ ) else maBtTarget.Enable( sal_True ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index bb856f596566..bc1ab0b41c61 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -62,8 +60,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte maFtSubject ( this, CUI_RES (FT_SUBJECT) ), maEdSubject ( this, CUI_RES (ED_SUBJECT) ) { - // Set HC bitmaps and disable display of bitmap names. - maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtAdrBook.EnableTextDisplay (sal_False); InitStdControls(); @@ -313,52 +310,8 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG ) } -/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); - if ( xProv.is() ) - { -!!! (pb) we need a new config item here - SfxAppIniManagerProperty aProp; - GetpApp()->Property( aProp ); - if( !aProp.GetIniManager() ) - return ( 0L ); - - String aAddressBook = aProp.GetIniManager()->Get( SFX_KEY_ADDRESSBOOK ); - INetURLObject aObj; - aObj.SetSmartProtocol( INET_PROT_FILE ); - aObj.SetURL( aAddressBook.GetToken( 0, sal_Unicode( ';' ) ) ); - - String aMark( RTL_CONSTASCII_USTRINGPARAM( "db:Table;" ) ); - aMark += aAddressBook.GetToken( 1, sal_Unicode( ';' ) ); - aObj.SetMark( aMark ); - - util::URL aURL; - aURL.Complete = ::rtl::OUString( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); - - uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - if( xFactory.is() ) - { - uno::Reference< util::XURLTransformer > xTrans( xFactory->createInstance - ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), - uno::UNO_QUERY); - xTrans->parseStrict( aURL ); - - uno::Reference< frame::XDispatch > aDisp = xProv->queryDispatch( aURL, - OUString::createFromAscii( "_beamer" ), - frame::FrameSearchFlag::GLOBAL | - frame::FrameSearchFlag::CREATE ); - if ( aDisp.is() ) - { - uno::Sequence< beans::PropertyValue > aArgs(1); - beans::PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = DEFINE_CONST_UNICODE("Referer"); - pArg[0].Value = uno::makeAny( OUString( DEFINE_CONST_UNICODE("private:user") ) ); - aDisp->dispatch( aURL, aArgs ); - } - } - } -*/ - return( 0L ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index fc8e94e52885..e2f666a1e7cb 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/wrkwin.hxx> #include <dialmgr.hxx> #include <sfx2/docfile.hxx> @@ -38,7 +36,6 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/document/XLinkTargetSupplier.hpp> @@ -259,7 +256,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( xFactory.is() ) { - uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), + uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), uno::UNO_QUERY ); if( xDesktop.is() ) { @@ -274,9 +271,9 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) try { uno::Sequence< beans::PropertyValue > aArg(1); - aArg.getArray()[0].Name = OUString::createFromAscii( "Hidden" ); + aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); aArg.getArray()[0].Value <<= (sal_Bool) sal_True; - xComp = xLoader->loadComponentFromURL( aURL, OUString::createFromAscii( "_blank" ), 0, aArg ); + xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg ); } catch( const io::IOException& ) { @@ -318,27 +315,6 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) } return (mnError==0); } -/* -void SvxHlinkDlgMarkWnd::Error(int nNr) -{ - switch(nNr) - { - case 0: - { - Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() ); - //maLbTree.SetTextColor( Color(COL_BLACK) ); - //maLbTree.DrawText( aDrawRect, "Keine Ziele im Dokument vorhanden.", TEXT_DRAW_LEFT);// | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); - maLbTree.DrawText( Point(0,0), "Keine Ziele im Dokument vorhanden."); - maLbTree.DrawLine(aDrawRect.TopLeft(), aDrawRect.BottomRight() ); - } - break; - case 1: - Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() ); - maLbTree.DrawText( aDrawRect, "Das Dokument konnte nicht ge�ffnet werden.", TEXT_DRAW_LEFT | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); - break; - } -} -*/ /************************************************************************* |* |* Fill Tree-Control @@ -409,8 +385,6 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink pParentEntry, sal_False, LIST_APPEND, (void*)pData ); - maLbTree.SetExpandedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST ); - maLbTree.SetCollapsedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST ); nEntries++; } else @@ -544,3 +518,4 @@ IMPL_LINK ( SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, void *, EMPTYARG ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc index 5fba2376eaf2..39c7b2d53d18 100644 --- a/cui/source/dialogs/hlmarkwn.hrc +++ b/cui/source/dialogs/hlmarkwn.hrc @@ -32,6 +32,3 @@ #define STR_MARK_TREE 5000 // ------ IAccessibility2 implementation 2009. -//#define HYPERLINK_BMP_EXPAND 301 -//#define HYPERLINK_BMP_COLLAPSE 302 - diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cd8f1a3c123f..4088f56ec7a4 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> @@ -36,17 +34,17 @@ #include <ucbhelper/content.hxx> #include <unotools/localfilehelper.hxx> #include "hyperdlg.hrc" -#include "cuihyperdlg.hxx" //CHINA001 +#include "cuihyperdlg.hxx" #include "hltpbase.hxx" #include "macroass.hxx" -#include <svx/svxdlg.hxx> //CHINA001 -#include <cuires.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <cuires.hrc> using namespace ::ucbhelper; //######################################################################## //# # -//# ComboBox-Control, wich is filled with all current framenames # +//# ComboBox-Control, which is filled with all current framenames # //# # //######################################################################## @@ -66,17 +64,17 @@ SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId, if ( pFrame ) { pFrame->GetTargetList(*pList); - sal_uInt16 nCount = (sal_uInt16)pList->Count(); - if( nCount ) + if( !pList->empty() ) { - sal_uInt16 i; + size_t nCount = pList->size(); + size_t i; for ( i = 0; i < nCount; i++ ) { - InsertEntry(*pList->GetObject(i)); + InsertEntry( *pList->at( i ) ); } - for ( i = nCount; i; i-- ) + for ( i = nCount; i; ) { - delete pList->GetObject( i - 1 ); + delete pList->at( --i ); } } delete pList; @@ -125,130 +123,6 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -/* -Diese Methode parsed eine EMailadresse aus einem D&D-DataObjekt aus der Adre�datenbank heraus - -#ifndef _OFF_OFADBMGR_HXX -#include <offmgr/ofadbmgr.hxx> -#endif -#ifndef _SFX_APP_HXX -#include <offmgr/app.hxx> -#endif -#ifndef _SDB_SDBCURS_HXX -#include <sdb/sdbcurs.hxx> -#endif - -#define DB_DD_DELIM ((char)11) - -String SvxHyperURLBox::GetAllEmailNamesFromDragItem( sal_uInt16 nItem ) -{ -#if !defined( ICC ) && !defined( SOLARIS ) - String aAddress; - - if ( DragServer::HasFormat( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) ) - { - sal_uLong nLen = DragServer::GetDataLen( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) - 1; - sal_uInt16 i = 0; - String aTxt; - char *pTxt = aTxt.AllocStrBuf( (sal_uInt16)nLen ); - DragServer::PasteData( nItem, pTxt, nLen, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ); - String aDBName = aTxt.GetToken( i++, DB_DD_DELIM ); - String aTableName = aTxt.GetToken( i++, DB_DD_DELIM ); - i++; // Format"anderung - String aStatement = aTxt.GetToken( i++, DB_DD_DELIM ); - if ( !aStatement ) - { - aDBName += DB_DELIM; - aDBName += aTableName; - } - else - { - // use here another delimiter, because the OfaDBMgr uses two - // delimiters ( (char)11 and ; ) - aDBName += ';'; - aDBName += aStatement; - } - SbaSelectionListRef pSelectionList; - pSelectionList.Clear(); - pSelectionList = new SbaSelectionList; - sal_uInt16 nTokCnt = aTxt.GetTokenCount( DB_DD_DELIM ); - - for ( ; i < nTokCnt; ++i ) - pSelectionList->Insert( - (void*)(sal_uInt16)aTxt.GetToken( i, DB_DD_DELIM ), LIST_APPEND ); - - OfaDBMgr* pDBMgr = SFX_APP()->GetOfaDBMgr(); - sal_Bool bBasic = DBMGR_STD; - - if ( !pDBMgr->OpenDB( bBasic, aDBName ) ) - return aAddress; - - OfaDBParam& rParam = pDBMgr->GetDBData( bBasic ); - pDBMgr->ChangeStatement( bBasic, aStatement ); - rParam.pSelectionList->Clear(); - - if ( pSelectionList.Is() && - (long)pSelectionList->GetObject(0) != -1L ) - *rParam.pSelectionList = *pSelectionList; - - if ( !pDBMgr->ToFirstSelectedRecord( bBasic ) ) - { - pDBMgr->CloseAll(); - return aAddress; - } - - if ( pDBMgr->IsSuccessful( bBasic ) ) - { - // Spaltenk"opfe - SbaDBDataDefRef aDBDef = pDBMgr->OpenColumnNames( bBasic ); - - if ( aDBDef.Is() ) - { - SbaColumn* pCol = aDBDef->GetColumn("EMAIL"); - sal_uLong nPos = 0; - - if ( pCol ) - nPos = aDBDef->GetOriginalColumns().GetPos( pCol ) + 1; - for ( i = 0 ; nPos && i < pSelectionList->Count(); ++i ) - { - sal_uLong nIndex = (sal_uLong)pSelectionList->GetObject(i); - - // N"achsten zu lesenden Datensatz ansteuern - - sal_Bool bEnd = rParam.GetCursor()->IsOffRange(); - - if ( !bEnd ) - { - const ODbRowRef aRow = - pDBMgr->GetSelectedRecord( bBasic, i ); - - if ( aRow.Is() ) - { - aAddress += pDBMgr-> - ImportDBField( (sal_uInt16)nPos, &aDBDef, aRow.getBodyPtr() ); - aAddress += ','; - } - else - { - aAddress.Erase(); - break; - } - } - else - break; - } - } - } - pDBMgr->CloseAll(); - } - aAddress.EraseTrailingChars( ',' ); - return aAddress; -#else - return String(); -#endif -} -*/ - void SvxHyperURLBox::Select() { SvtURLBox::Select(); @@ -353,8 +227,6 @@ void SvxHyperlinkTabPageBase::InitStdControls () mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); - - mpBtScript->SetModeImage( Image( ResId( IMG_SCRIPT_HC, *m_pResMgr ) ), BMP_COLOR_HIGHCONTRAST ); mpBtScript->EnableTextDisplay (sal_False); mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore ); @@ -574,7 +446,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) SID_ATTR_MACROITEM ); pItemSet->Put ( aItem, SID_ATTR_MACROITEM ); - // --> PB 2006-01-13 #123474# /* disable HyperLinkDlg for input while the MacroAssignDlg is working because if no JAVA is installed an error box occurs and then it is possible to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF @@ -598,7 +469,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ), SFX_EVENT_MOUSEOUT_OBJECT); - // --> PB 2006-01-13 #123474# if ( bIsInputEnabled ) GetParent()->EnableInput( sal_True ); // <-- @@ -660,12 +530,12 @@ sal_Bool SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); ::rtl::OUString aTitle; - aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= aTitle; + aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ) >>= aTitle; bRet = ( aTitle.getLength() > 0 ); } catch( ... ) { - DBG_ERROR( "FileExists: ucb error" ); + OSL_FAIL( "FileExists: ucb error" ); } } @@ -871,3 +741,5 @@ sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index 0228d65bf3d2..c838ffd9c20d 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.hrc @@ -40,8 +40,6 @@ #define CBX_ANONYMOUS 11 #define BTN_BROWSE 12 #define BTN_TARGET 13 -#define IMG_BROWSE_HC 14 -#define IMG_TARGET_HC 15 /* Tabpage : Hyperlink - Mail & News */ @@ -53,7 +51,6 @@ #define FT_SUBJECT 6 #define ED_SUBJECT 7 #define BTN_ADRESSBOOK 8 -#define IMG_ADRESSBOOK_HC 9 /* Tabpage : Hyperlink - Document */ @@ -66,7 +63,6 @@ #define ED_TARGET_DOC 7 #define FT_URL 8 #define FT_FULL_URL 9 -#define IMG_FILEOPEN_HC 10 /* Tabpage : Hyperlink - New document */ @@ -78,7 +74,6 @@ #define FT_DOCUMENT_TYPES 6 #define LB_DOCUMENT_TYPES 7 #define BTN_CREATE 8 -#define IMG_CREATE_HC 9 /* Tabpage-section : Hyperlink - more justifications */ @@ -92,9 +87,7 @@ #define FT_TEXT 37 #define ED_TEXT 38 #define BTN_SCRIPT 39 -#define IMG_SCRIPT_HC 40 #define COL_OLD 54 #define COL_2 63 #define COL_DIFF (COL_2 - COL_OLD) - diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 29b4b9b5951e..66c9be97525d 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -131,11 +131,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET MASKCOLOR }; }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "browse_hc.bmp" ; }; - MASKCOLOR - }; + ImageButton BTN_TARGET { HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET"; @@ -151,11 +147,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET MASKCOLOR }; }; - Image IMG_TARGET_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; + FixedLine GRP_MORE { Pos = MAP_APPFONT ( 6 , 92 ) ; @@ -241,11 +233,6 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -318,11 +305,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL Text [ en-US ] = "Data Sources..."; QuickHelpText [ en-US ] = "Data Sources..." ; }; - Image IMG_ADRESSBOOK_HC - { - ImageBitmap = Bitmap { File = "adrbook_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -408,11 +390,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -456,12 +433,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Open File"; }; - Image IMG_FILEOPEN_HC - { - ImageBitmap = Bitmap { File = "fileopen_hc.bmp" ; }; - MASKCOLOR - }; - FixedLine GRP_TARGET { Pos = MAP_APPFONT ( 6 , 38 ) ; @@ -507,11 +478,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Target in Document"; }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -597,11 +563,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -682,11 +643,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Text [ en-US ] = "Select Path"; }; - Image IMG_CREATE_HC - { - ImageBitmap = Bitmap { File = "newdoc_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -772,11 +728,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -900,109 +851,3 @@ Image RID_SVXBMP_HLDOCNTP ImageBitmap = Bitmap { File = "hldocntp.bmp" ; }; MASKCOLOR }; - -Image RID_SVXBMP_HLINETTP_H -{ - ImageBitmap = Bitmap { File = "hlinettp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLMAILTP_H -{ - ImageBitmap = Bitmap { File = "hlmailtp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCTP_H -{ - ImageBitmap = Bitmap { File = "hldoctp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCNTP_H -{ - ImageBitmap = Bitmap { File = "hldocntp_h.bmp" ; }; - MASKCOLOR -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 16026aaff6d1..1b9b63bf8231 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hyphen.hxx" #include "hyphen.hrc" #include "cuires.hrc" @@ -39,7 +37,6 @@ #include <svtools/langtab.hxx> #include <svx/dialmgr.hxx> #include <svx/dlgutil.hxx> -#include <tools/list.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> @@ -74,7 +71,6 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) : void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) { -// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch ( nCode ) @@ -104,7 +100,6 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) struct SvxHyphenWordDialog_Impl { SvxHyphenWordDialog * m_pDialog; -// Window * m_pParent; FixedText aWordFT; HyphenEdit_Impl aWordEdit; @@ -513,7 +508,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* try { uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); - const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) ); + const rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "IsHyphAuto" ) ); uno::Any aAny; aAny <<= sal_True; @@ -655,3 +650,4 @@ void SvxHyphenWordDialog::SelRight() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index 39a7cc6fd3d9..f8bf26202bfa 100644 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -31,8 +31,6 @@ String RID_SVXSTR_HMERR_CHECKINSTALL { - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; }; @@ -128,5 +126,3 @@ ModalDialog RID_SVXDLG_HYPHENATE TABSTOP = TRUE ; }; }; - - diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 67fb03eaa5f3..8adc57ddc7ba 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/app.hxx> #include <tools/rc.h> #include <tools/shl.hxx> @@ -45,6 +43,8 @@ #include <vcl/mnemonic.hxx> #include <vcl/i18nhelp.hxx> +using ::std::vector; + #ifdef WNT int __cdecl IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) #else @@ -217,12 +217,12 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos, - const SfxItemSet *pItemSet )//, sal_Bool bEditFmt, const String *pUserButtonText = 0 ) + const SfxItemSet *pItemSet ) : ModalDialog ( pParent, rResId ), meChoicePos ( ePos ), maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | - /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP ), + WB_NODRAGSELECTION | WB_TABSTOP ), mnCurrentPageId ( USHRT_MAX ), aOKBtn ( this, WB_DEFBUTTON ), @@ -241,10 +241,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, bModified ( sal_False ), bItemsReset ( sal_False ) { - // IconChoiceCtrl-Settings - //maIconCtrl.SetBackground ( Wallpaper( Color (146, 146, 186) ) ); - maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); + maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); SetCtrlPos ( meChoicePos ); maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) ); maIconCtrl.Show(); @@ -276,41 +274,17 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // ----------------------------------------------------------------------- -/* -IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, - const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False, - const String *pUserButtonText = 0 ) -: meChoicePos ( PosLeft ), // Default erst ma Links - maIconCtrl ( this, Die_Winbits ), - aOKBtn ( this ), - pUserBtn ( pUserButtonText? new PushButton(this): 0 ), - aCancelBtn ( this ), - aHelpBtn ( this ), - aResetBtn ( this ), - aBaseFmtBtn ( this ), - mnCurrentPageId ( 0 ) -{ - FreeResource(); -} -*/ - -// ----------------------------------------------------------------------- - IconChoiceDialog ::~IconChoiceDialog () { - sal_uLong i; - // save configuration at INI-Manager // and remove pages SvtViewOptions aTabDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) ); aTabDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); aTabDlgOpt.SetPageID( mnCurrentPageId ); - const sal_uLong nCount = maPageList.Count(); - - for ( i = 0; i < nCount; ++i ) + for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { - IconChoicePageData* pData = maPageList.GetObject(i); + IconChoicePageData* pData = maPageList[ i ]; if ( pData->pPage ) { @@ -331,7 +305,7 @@ IconChoiceDialog ::~IconChoiceDialog () } // remove Userdata from Icons - for ( i=0; i<maIconCtrl.GetEntryCount(); i++) + for ( ULONG i=0; i < maIconCtrl.GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); @@ -351,29 +325,98 @@ IconChoiceDialog ::~IconChoiceDialog () | \**********************************************************************/ -SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( sal_uInt16 nId, const String& rIconText, - const Image& rChoiceIcon, - const Image& rChoiceIconHC, - CreatePage pCreateFunc /* != 0 */, - GetPageRanges pRangesFunc /* darf 0 sein */, - sal_Bool bItemsOnDemand, sal_uLong /*nPos*/ ) +SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( + sal_uInt16 nId, + const String& rIconText, + const Image& rChoiceIcon, + CreatePage pCreateFunc /* != 0 */, + GetPageRanges pRangesFunc /* darf 0 sein */, + sal_Bool bItemsOnDemand, + sal_uLong /*nPos*/ +) { IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ); - maPageList.Insert ( pData, LIST_APPEND ); + maPageList.push_back( pData ); pData->fnGetRanges = pRangesFunc; pData->bOnDemand = bItemsOnDemand; sal_uInt16 *pId = new sal_uInt16 ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC ); + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); pEntry->SetUserData ( (void*) pId ); return pEntry; } /********************************************************************** | +| remove page +| +\**********************************************************************/ + +void IconChoiceDialog::RemoveTabPage( sal_uInt16 nId ) +{ + IconChoicePageData* pData = GetPageData ( nId ); + + // remove page from list + if ( pData ) + { + for ( vector< IconChoicePageData* >::iterator i = maPageList.begin(); i < maPageList.end(); ++i ) + { + if ( *i == pData ) + { + maPageList.erase( i ); + break; + } + } + + // save settings + if ( pData->pPage ) + { + pData->pPage->FillUserData(); + String aPageData(pData->pPage->GetUserData()); + if ( aPageData.Len() ) + { + SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) ); + + SetViewOptUserItem( aTabPageOpt, aPageData ); + } + } + + if ( pData->bOnDemand ) + delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); + + delete pData->pPage; + delete pData; + } + + // remove Icon + bool bFound = FALSE; + for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++) + { + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); + sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); + + if ( *pUserData == nId ) + { + delete pUserData; + maIconCtrl.RemoveEntry ( pEntry ); + bFound = true; + } + } + + // was it the current page ? + if ( nId == mnCurrentPageId ) + { + mnCurrentPageId = maPageList.front()->nId; + } + + Invalidate (); +} + +/********************************************************************** +| | Paint-method | \**********************************************************************/ @@ -382,9 +425,9 @@ void IconChoiceDialog::Paint( const Rectangle& rRect ) { Dialog::Paint ( rRect ); - for ( sal_uLong i=0; i<maPageList.Count(); i++ ) + for ( size_t i = 0; i < maPageList.size(); i++ ) { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); + IconChoicePageData* pData = maPageList[ i ]; if ( pData->nId == mnCurrentPageId ) { @@ -453,6 +496,14 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) // ----------------------------------------------------------------------- +void IconChoiceDialog::RemoveResetButton() +{ + aResetBtn.Hide(); + bHideResetBtn = TRUE; +} + +// ----------------------------------------------------------------------- + void IconChoiceDialog::ShowPage( sal_uInt16 nId ) { bool bInvalidate = GetCurPageId() != nId; @@ -539,9 +590,9 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) //////////////////////////////////////// // Pages resizen & positionieren // - for ( sal_uLong i=0; i<maPageList.Count(); i++ ) + for ( size_t i = 0; i < maPageList.size(); i++ ) { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); + IconChoicePageData* pData = maPageList[ i ]; Point aNewPagePos; Size aNewPageSize; @@ -763,9 +814,10 @@ IMPL_LINK( IconChoiceDialog, CancelHdl, Button*, EMPTYARG ) void IconChoiceDialog::ActivatePageImpl () { - DBG_ASSERT( maPageList.Count(), "keine Pages angemeldet" ); + DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" ); IconChoicePageData* pData = GetPageData ( mnCurrentPageId ); DBG_ASSERT( pData, "Id nicht bekannt" ); + BOOL bReadOnly = FALSE; if ( pData ) { if ( !pData->pPage ) @@ -805,11 +857,11 @@ void IconChoiceDialog::ActivatePageImpl () if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); + SetHelpId( pData->pPage->GetHelpId() ); + bReadOnly = pData->pPage->IsReadOnly(); } - SetHelpId( pData->pPage->GetHelpId() ); - sal_Bool bReadOnly = pData->pPage->IsReadOnly(); if ( bReadOnly || bHideResetBtn ) aResetBtn.Hide(); else @@ -867,12 +919,9 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl () pSet = GetRefreshedSet(); DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" ); // alle Pages als neu zu initialsieren flaggen - const sal_uLong nCount = maPageList.Count(); - - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { - IconChoicePageData* pObj = (IconChoicePageData*)maPageList.GetObject(i); - + IconChoicePageData* pObj = maPageList[ i ]; if ( pObj->pPage != pPage ) // eigene Page nicht mehr refreshen pObj->bRefresh = sal_True; else @@ -922,13 +971,11 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) if ( pRanges ) return pRanges; SvUShorts aUS( 16, 16 ); - sal_uLong nCount = maPageList.Count(); - sal_uInt16 i; - for ( i = 0; i < nCount; ++i ) + size_t nCount = maPageList.size(); + for ( size_t i = 0; i < nCount; ++i ) { - IconChoicePageData* pData = maPageList.GetObject (i); - + IconChoicePageData* pData = maPageList[ i ]; if ( pData->fnGetRanges ) { const sal_uInt16* pTmpRanges = (pData->fnGetRanges)(); @@ -947,8 +994,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) #endif { nCount = aUS.Count(); - - for ( i = 0; i < nCount; ++i ) + for ( size_t i = 0; i < nCount; ++i ) aUS[i] = rPool.GetWhich( aUS[i] ); } @@ -975,7 +1021,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { - FASTBOOL bSet = ( pSet != NULL ); + bool bSet = ( pSet != NULL ); pSet = pInSet; @@ -1010,7 +1056,7 @@ SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 ) short IconChoiceDialog::Execute() { - if ( !maPageList.Count() ) + if ( maPageList.empty() ) return RET_CANCEL; Start_Impl(); @@ -1038,10 +1084,9 @@ void IconChoiceDialog::Start( sal_Bool bShow ) sal_Bool IconChoiceDialog::QueryClose() { sal_Bool bRet = sal_True; - const sal_uLong nCount = maPageList.Count(); - for ( sal_uLong i = 0; i < nCount; ++i ) + for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { - IconChoicePageData* pData = maPageList.GetObject(i); + IconChoicePageData* pData = maPageList[i ]; if ( pData->pPage && !pData->pPage->QueryClose() ) { bRet = sal_False; @@ -1059,7 +1104,7 @@ void IconChoiceDialog::Start_Impl() sal_uInt16 nActPage; if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX ) - nActPage = maPageList.GetObject(0)->nId;//First()->nId; + nActPage = maPageList.front()->nId; else nActPage = mnCurrentPageId; @@ -1078,7 +1123,7 @@ void IconChoiceDialog::Start_Impl() nActPage = mnCurrentPageId; if ( GetPageData ( nActPage ) == NULL ) - nActPage = ( (IconChoicePageData*)maPageList.GetObject(0) )->nId; + nActPage = maPageList.front()->nId; } else if ( USHRT_MAX != mnCurrentPageId && GetPageData ( mnCurrentPageId ) != NULL ) nActPage = mnCurrentPageId; @@ -1107,18 +1152,15 @@ const SfxItemSet* IconChoiceDialog::GetRefreshedSet() IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId ) { IconChoicePageData *pRet = NULL; - sal_Bool bFound = sal_False; - - for ( sal_uLong i=0; i<maPageList.Count() && !bFound; i++ ) + for ( size_t i=0; i < maPageList.size(); i++ ) { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); - + IconChoicePageData* pData = maPageList[ i ]; if ( pData->nId == nId ) { pRet = pData; + break; } } - return pRet; } @@ -1176,9 +1218,7 @@ short IconChoiceDialog::Ok() } sal_Bool _bModified = sal_False; - const sal_uLong nCount = maPageList.Count(); - - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { IconChoicePageData* pData = GetPageData ( i ); @@ -1229,3 +1269,6 @@ void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) } } } + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 0923f322e154..891761fcf368 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> @@ -362,7 +360,7 @@ short SvInsertOleDlg::Execute() } else { - OSL_ASSERT( "Can not get InteractionHandler!\n" ); + OSL_FAIL( "Can not get InteractionHandler!\n" ); aMedium.realloc( 1 ); } @@ -524,11 +522,11 @@ short SvInsertPlugInDialog::Execute() uno::Reference < beans::XPropertySet > xSet( m_xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL") ), makeAny( ::rtl::OUString( m_pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) ); uno::Sequence< beans::PropertyValue > aCommandSequence; Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence ); - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginCommands"), makeAny( aCommandSequence ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands") ), makeAny( aCommandSequence ) ); } } else @@ -653,14 +651,14 @@ short SvInsertAppletDialog::Execute() m_xObj->changeState( embed::EmbedStates::RUNNING ); xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY ); ::rtl::OUString aStr; - uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCode") ); + uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ) ); if ( aAny >>= aStr ) SetClass( aStr ); - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ) ); if ( aAny >>= aStr ) SetClassLocation( aStr ); uno::Sequence< beans::PropertyValue > aCommands; - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ) ); if ( aAny >>= aCommands ) { SvCommandList aList; @@ -674,7 +672,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } else @@ -707,24 +705,24 @@ short SvInsertAppletDialog::Execute() // Hack, aFileName wird auch fuer Class benutzt m_aClass = GetClass(); - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCode"), makeAny( ::rtl::OUString( m_aClass ) ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ), makeAny( ::rtl::OUString( m_aClass ) ) ); ::rtl::OUString tmp = aClassLocation; ::osl::File::getFileURLFromSystemPath(tmp, tmp); aClassLocation = tmp; - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase"), makeAny( tmp ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ), makeAny( tmp ) ); m_aCommands = GetAppletOptions(); uno::Sequence< beans::PropertyValue > aCommandSequence; Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence ); - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), makeAny( aCommandSequence ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ), makeAny( aCommandSequence ) ); if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE ); } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } } @@ -840,15 +838,15 @@ short SfxInsertFloatingFrameDialog::Execute() m_xObj->changeState( embed::EmbedStates::RUNNING ); xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY ); ::rtl::OUString aStr; - uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameURL") ); + uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ) ); if ( aAny >>= aStr ) aEDURL.SetText( aStr ); - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ) ); if ( aAny >>= aStr ) aEDName.SetText( aStr ); sal_Int32 nSize = SIZE_NOT_SET; - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ) ); aAny >>= nSize; if ( nSize == SIZE_NOT_SET ) @@ -861,7 +859,7 @@ short SfxInsertFloatingFrameDialog::Execute() else aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) ); - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ) ); aAny >>= nSize; if ( nSize == SIZE_NOT_SET ) @@ -879,11 +877,11 @@ short SfxInsertFloatingFrameDialog::Execute() sal_Bool bScrollAuto = sal_False; sal_Bool bSet = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ) ); aAny >>= bSet; if ( !bSet ) { - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ) ); aAny >>= bSet; bScrollOn = bSet; bScrollOff = !bSet; @@ -896,11 +894,11 @@ short SfxInsertFloatingFrameDialog::Execute() aRBScrollingAuto.Check( bScrollAuto ); bSet = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder") ) ); aAny >>= bSet; if ( !bSet ) { - aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder") ); + aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ) ); aAny >>= bSet; aRBFrameBorderOn.Check( bSet ); aRBFrameBorderOff.Check( !bSet ); @@ -911,7 +909,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } else @@ -974,27 +972,23 @@ short SfxInsertFloatingFrameDialog::Execute() else lMarginHeight = SIZE_NOT_SET; - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameURL"), makeAny( aURL ) ); - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameName"), makeAny( aName ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ), makeAny( aURL ) ); + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ), makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ), makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ), makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); - //if ( aFrmDescr.IsFrameBorderSet() ) - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ), makeAny( bHasBorder ) ); - /*else - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder"), - makeAny( sal_True ) );*/ - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ), makeAny( sal_Int32( lMarginWidth ) ) ); - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight"), + xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ), makeAny( sal_Int32( lMarginHeight ) ) ); if ( bIPActive ) @@ -1002,7 +996,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } } @@ -1055,3 +1049,4 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 4929c45b93e8..d514ef431254 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <dialmgr.hxx> #include <svx/svxdlg.hxx> #include <cuires.hrc> @@ -80,3 +78,4 @@ short SvxInsRowColDlg::Execute(void) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index a991974bd914..9d9b2cece04d 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <linkdlg.hxx> #include <vcl/svapp.hxx> #include "helpid.hrc" @@ -114,7 +112,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bH aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion - //JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird + // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) ); aUpdateTimer.SetTimeout( 1000 ); //IAccessibility2 Implementation 2009----- @@ -131,7 +129,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bH Automatic().SetClickHdl( LINK( this, SvBaseLinksDlg, AutomaticClickHdl ) ); Manual().SetClickHdl( LINK( this, SvBaseLinksDlg, ManualClickHdl ) ); UpdateNow().SetClickHdl( LINK( this, SvBaseLinksDlg, UpdateNowClickHdl ) ); -// OpenSource().SetClickHdl( LINK( this, SvBaseLinksDlg, OpenSourceClickHdl ) ); ChangeSource().SetClickHdl( LINK( this, SvBaseLinksDlg, ChangeSourceClickHdl ) ); if(!bHtmlMode) BreakLink().SetClickHdl( LINK( this, SvBaseLinksDlg, BreakLinkClickHdl ) ); @@ -147,10 +144,6 @@ SvBaseLinksDlg::~SvBaseLinksDlg() /************************************************************************* |* SvBaseLinksDlg::Handler() -|* -|* Beschreibung -|* Ersterstellung MM 14.06.94 -|* Letzte Aenderung JP 30.05.95 *************************************************************************/ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) { @@ -336,18 +329,11 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) rListBox.Select( pE ); rListBox.MakeVisible( pE ); } - } - return 0; -} -/* -IMPL_LINK_INLINE_START( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) -{ - DBG_ASSERT( !this, "Open noch nicht impl." ); + pNewMgr->CloseCachedComps(); + } return 0; } -IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) -*/ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) { @@ -488,7 +474,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) Automatic().Disable(); Manual().Disable(); UpdateNow().Disable(); -// OpenSource().Disable(); ChangeSource().Disable(); BreakLink().Disable(); @@ -505,8 +490,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) { (void)pTimer; -// for( SvLBoxEntry* pBox = Links().First(); pBox; -// pBox = Links().Next( pBox )) Links().SetUpdateMode(sal_False); for( sal_uLong nPos = Links().GetEntryCount(); nPos; ) @@ -532,7 +515,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) if( _pLink && _pLink->WasLastEditOK() ) { - // JP 09.01.98: // StarImpress/Draw tauschen die LinkObjecte selbst aus! // also suche den Link im Manager, wenn der nicht mehr existiert, // dann setze fuelle die Liste komplett neu. Ansonsten braucht @@ -717,3 +699,4 @@ void SvBaseLinksDlg::SetActLink( SvBaseLink * pLink ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 01a4857017da..bdae49e60979 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> @@ -182,3 +180,4 @@ SvxMultiFileDialog::~SvxMultiFileDialog() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 4585e7350c6d..3e763779b7c8 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/debug.hxx> #include <tools/urlobj.hxx> @@ -361,3 +359,4 @@ void SvxMultiPathDialog::EnableRadioButtonMode() aDelBtn.SetPosPixel( aNewPos ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index c16c13b9ed7f..59ea05308786 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -128,26 +128,3 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR { Text [ en-US ] = "The file %1 already exists." ; }; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 2c44e5add84d..b387b4f87369 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "cuires.hrc" @@ -69,3 +67,5 @@ sal_Int32 SvxNewTableDialog::getColumns() const { return sal::static_int_cast< sal_Int32 >( maNumColumns.GetValue() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index f9d3db8c5f0c..aac42ff4b7ef 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -102,37 +102,3 @@ ModalDialog RID_SVX_NEWTABLE_DLG TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index c81897011d36..1634739b0c2e 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "passwdomdlg.hrc" @@ -68,8 +66,6 @@ public: PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { -// currently the spec does not want to display this text anymore... -// m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } @@ -82,16 +78,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) { if (GetText().Len() == 0) { - Push( /*PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR |*/ PUSH_TEXTCOLOR ); -/* - Color aFillColor( GetParent()->GetBackground().GetColor() ); - SetLineColor(); // don't draw a border when painting the Edit field rectangle with the new background color - SetFillColor( aFillColor ); - SetTextFillColor( aFillColor ); - SetTextColor( GetParent()->GetTextColor() ); // use plain text color even if the Edit field is disabled (it is hard to read the text otherwise) - - DrawRect( Rectangle( Point(), GetOutputSizePixel() ) ); -*/ + Push( PUSH_TEXTCOLOR ); SetTextColor( Color( COL_GRAY ) ); DrawText( Point(), m_aDefaultTxt ); @@ -113,7 +100,6 @@ struct PasswordToOpenModifyDialog_Impl Edit m_aPasswdToOpenED; FixedText m_aReenterPasswdToOpenFT; PasswordReenterEdit_Impl m_aReenterPasswdToOpenED; -// FixedImage m_aPasswdToOpenMatchFI; FixedText m_aPasswdNoteFT; FixedLine m_aButtonsFL; MoreButton m_aMoreFewerOptionsBTN; @@ -125,7 +111,6 @@ struct PasswordToOpenModifyDialog_Impl Edit m_aPasswdToModifyED; FixedText m_aReenterPasswdToModifyFT; PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; -// FixedImage m_aPasswdToModifyMatchFI; String m_aOneMismatch; String m_aTwoMismatch; @@ -135,7 +120,6 @@ struct PasswordToOpenModifyDialog_Impl bool m_bIsPasswordToModify; -// DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( OkBtnClickHdl, OKButton * ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, @@ -155,7 +139,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ), -// m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), m_aPasswdNoteFT ( pParent, CUI_RES( FT_PASSWD_NOTE ) ), m_aButtonsFL ( pParent, CUI_RES( FL_BUTTONS ) ), m_aMoreFewerOptionsBTN ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ), @@ -167,35 +150,17 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ), -// m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ) m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ), m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ), m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ), m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ), m_bIsPasswordToModify( bIsPasswordToModify ) { -/* - const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); - const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); - m_aPasswdToOpenMatchFI.SetImage( aImage ); - m_aPasswdToModifyMatchFI.SetImage( aImage ); -*/ - m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) ); m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) ); -#if 0 - Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl ); - m_aPasswdToOpenED.SetModifyHdl( aModifyLink ); - m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink ); - m_aPasswdToModifyED.SetModifyHdl( aModifyLink ); - m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink ); -#endif - m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) ); -// m_aOk.Enable( sal_False ); - if (nMaxPasswdLen) { m_aPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen ); @@ -208,8 +173,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED.GrabFocus(); -// ModifyHdl( NULL ); - m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify ); if (!bIsPasswordToModify) m_aMoreFewerOptionsBTN.Hide( sal_True ); @@ -220,32 +183,6 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } -#if 0 -IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ ) -{ - // force repaints to get the m_aDefaultTxt displayed again - if (m_aReenterPasswdToOpenED.GetText().Len() == 0) - m_aReenterPasswdToOpenED.Invalidate(); - if (m_aReenterPasswdToModifyED.GetText().Len() == 0) - m_aReenterPasswdToModifyED.Invalidate(); - - const sal_Int32 nPasswdToOpenLen = m_aPasswdToOpenED.GetText().Len(); - const sal_Int32 nPasswdToModifyLen = m_aPasswdToModifyED.GetText().Len(); - - const bool bBothEmpty = nPasswdToOpenLen == 0 && nPasswdToModifyLen == 0; - const bool bToOpenMatch = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); - const bool bToModifyMatch = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); - - m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty ); - -// m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); -// m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); - - return 0; -} -#endif - - IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) { bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && @@ -341,3 +278,4 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const ////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 522e4edf1da2..edeae469a3c5 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -58,4 +58,3 @@ #define STR_INVALID_STATE_FOR_OK_BUTTON_V2 57 #endif - diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index edb84813d387..129874b92c45 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -81,13 +81,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Border = TRUE ; PassWord = TRUE ; }; -/* - FixedImage FI_PASSWD_TO_OPEN_MATCH - { - Pos = MAP_APPFONT ( 150, 42 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - }; -*/ + FixedText FT_PASSWD_NOTE { Pos = MAP_APPFONT( 6, 80 ); @@ -176,13 +170,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Border = TRUE ; PassWord = TRUE ; }; -/* - FixedImage FI_PASSWD_TO_MODIFY_MATCH - { - Pos = MAP_APPFONT ( 150, 224 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - }; -*/ String STR_PASSWD_MUST_BE_CONFIRMED { @@ -213,16 +200,4 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; }; -/* - Image IMG_PASSWD_MATCH - { - ImageBitmap = Bitmap { File = "apply.png"; }; - }; - - Image IMG_PASSWD_MATCH_HC - { - ImageBitmap = Bitmap { File = "apply_h.png"; }; - }; -*/ }; - diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 2ae45c319e87..3d034664389c 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/embed/Aspects.hpp> #include <pastedlg.hxx> @@ -124,10 +123,6 @@ SvPasteObjectDialog::~SvPasteObjectDialog() /************************************************************************* |* SvPasteObjectDialog::Insert() -|* -|* Beschreibung -|* Ersterstellung MM 14.06.94 -|* Letzte Aenderung KA 16.03.2001 *************************************************************************/ void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String& rFormatName ) { @@ -165,53 +160,6 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, String* pName = (String*) aSupplementTable.Get( nFormat ); String aName; -#ifdef WNT -/* - if( !pName && - ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) ) - { - sal_Bool IsClipboardObject_Impl( SotDataObject * ); - if( IsClipboardObject_Impl( pDataObj ) ) - { - IDataObject * pDO = NULL; - OleGetClipboard( &pDO ); - if( pDO ) - { - FORMATETC fe; - STGMEDIUM stm; - (fe).cfFormat=RegisterClipboardFormat( "Object Descriptor" ); - (fe).dwAspect=DVASPECT_CONTENT; - (fe).ptd=NULL; - (fe).tymed=TYMED_HGLOBAL; - (fe).lindex=-1; - - if (SUCCEEDED(pDO->GetData(&fe, &stm))) - { - LPOBJECTDESCRIPTOR pOD=(LPOBJECTDESCRIPTOR)GlobalLock(stm.hGlobal); - if( pOD->dwFullUserTypeName ) - { - OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwFullUserTypeName); - aName.Append( pN ); - pName = &aName; - // set format to ole object - nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE; - } - if( pOD->dwSrcOfCopy ) - { - OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwSrcOfCopy); - aSourceName.Append( *pN++ ); - } - else - aSourceName = String( ResId( STR_UNKNOWN_SOURCE, SOAPP->GetResMgr() ) ); - GlobalUnlock(stm.hGlobal); - ReleaseStgMedium(&stm); - } - } - } - } -*/ -#endif - // if there is an "Embed Source" or and "Embedded Object" on the // Clipboard we read the Description and the Source of this object // from an accompanied "Object Descriptor" format on the clipboard @@ -307,3 +255,4 @@ void SvPasteObjectDialog::SetObjName( const SvGlobalName & rClass, const String aObjName = rObjName; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index a0b1f2ef3126..407a0c29d9bc 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <set> #include <map> #include <unotools/processfactory.hxx> @@ -61,7 +59,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc { Reference< XMultiServiceFactory > xMan( ::utl::getProcessServiceFactory() ); Reference< XPluginManager > xPMgr( xMan->createInstance( - rtl::OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), UNO_QUERY ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager") ) ), UNO_QUERY ); if ( xPMgr.is() ) { @@ -124,3 +122,4 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), sal_True ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 67bcf17f68be..e16815ce84ef 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/date.hxx> @@ -261,3 +259,4 @@ IMPL_LINK( SvxPostItDialog, OKHdl, Button *, EMPTYARG ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc index c0df97b971e2..364ab737dc6a 100644 --- a/cui/source/dialogs/postdlg.hrc +++ b/cui/source/dialogs/postdlg.hrc @@ -48,4 +48,3 @@ #endif - diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 50daaedd58b8..9b652357296b 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -126,8 +126,6 @@ ModalDialog RID_SVXDLG_POSTIT }; String STR_NOTIZ_INSERT { - /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ Text [ en-US ] = "Insert note" ; }; }; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index a2eb2cc9c001..182e5bb02d5d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <memory> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cuires.hrc> #include "scriptdlg.hrc" @@ -43,7 +41,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> @@ -86,13 +83,9 @@ void ShowErrorDialog( const Any& aException ) SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) : SvTreeListBox( pParent, ResId( rResId.GetId(),*rResId.GetResMgr() ) ), m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())), - m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())), m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())), - m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())), m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())), - m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())), m_docImage(ResId(IMG_DOCUMENT,*rResId.GetResMgr())), - m_docImage_hc(ResId(IMG_DOCUMENT_HC,*rResId.GetResMgr())), m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))), m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr()))) { @@ -175,11 +168,10 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Sequence< Reference< browse::XBrowseNode > > children; - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); + ::rtl::OUString userStr( RTL_CONSTASCII_USTRINGPARAM("user") ); + ::rtl::OUString shareStr( RTL_CONSTASCII_USTRINGPARAM("share") ); - ::rtl::OUString singleton = ::rtl::OUString::createFromAscii( - "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" ); + ::rtl::OUString singleton( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.browse.theBrowseNodeFactory" ) ); try { @@ -234,7 +226,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) { Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( xCtx->getServiceManager()->createInstanceWithContext( - ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"), xCtx ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager") ), xCtx ), UNO_QUERY_THROW ); Reference<container::XNameAccess> xModuleConfig( @@ -266,7 +258,6 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( children[ n ], lang ); - /*SvLBoxEntry* pBasicManagerRootEntry =*/ insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT, 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); } @@ -282,7 +273,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU xCtx->getServiceManager(); Reference< frame::XDesktop > desktop ( mcf->createInstanceWithContext( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ), xCtx ), UNO_QUERY ); Reference< container::XEnumerationAccess > componentsAccess = @@ -383,17 +374,10 @@ SvLBoxEntry * SFTreeListBox::insertEntry( SvLBoxEntry * p; if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 ) { - Image aImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_NORMAL ); - Image aHCImage = SvFileInformationManager::GetFileImage( - INetURLObject(factoryURL), false, - BMP_COLOR_HIGHCONTRAST ); + Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false ); p = InsertEntry( rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND, aUserData.release()); // XXX possible leak - SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST); - SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST); } else { @@ -406,36 +390,30 @@ SvLBoxEntry * SFTreeListBox::insertEntry( String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData ) { - Image aHCImage, aImage; + Image aImage; if( nBitmap == IMG_HARDDISK ) { aImage = m_hdImage; - aHCImage = m_hdImage_hc; } else if( nBitmap == IMG_LIB ) { aImage = m_libImage; - aHCImage = m_libImage_hc; } else if( nBitmap == IMG_MACRO ) { aImage = m_macImage; - aHCImage = m_macImage_hc; } else if( nBitmap == IMG_DOCUMENT ) { aImage = m_docImage; - aHCImage = m_docImage_hc; } SvLBoxEntry * p = InsertEntry( rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND, aUserData.release()); // XXX possible leak - SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST); - SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST); - return p; + return p; } -void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) +void SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) { SFEntry* userData = 0; if ( !pEntry ) @@ -455,20 +433,8 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) } } -void __EXPORT SFTreeListBox::ExpandedHdl() +void SFTreeListBox::ExpandedHdl() { -/* SvLBoxEntry* pEntry = GetHdlEntry(); - DBG_ASSERT( pEntry, "Was wurde zugeklappt?" ); - - if ( !IsExpanded( pEntry ) && pEntry->HasChildsOnDemand() ) - { - SvLBoxEntry* pChild = FirstChild( pEntry ); - while ( pChild ) - { - GetModel()->Remove( pChild ); // Ruft auch den DTOR - pChild = FirstChild( pEntry ); - } - }*/ } // ---------------------------------------------------------------------------- @@ -583,7 +549,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag FreeResource(); } -__EXPORT SvxScriptOrgDialog::~SvxScriptOrgDialog() +SvxScriptOrgDialog::~SvxScriptOrgDialog() { // clear the SelectHdl so that it isn't called during the dtor aScriptsBox.SetSelectHdl( Link() ); @@ -851,7 +817,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) try { // ISSUE need code to run script here - xInv->invoke( ::rtl::OUString::createFromAscii( "Editable" ), args, outIndex, outArgs ); + xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Editable" ) ), args, outIndex, outArgs ); } catch( Exception& e ) { @@ -922,11 +888,11 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) sal_uInt16 nMode = INPUTMODE_NEWLIB; if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) { - aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ; + aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Library") ) ; } else { - aNewStdName = ::rtl::OUString::createFromAscii( "Macro" ) ; + aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Macro") ) ; nMode = INPUTMODE_NEWMACRO; } //do we need L10N for this? ie somethng like: @@ -1030,7 +996,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) try { Any aResult; - aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Creatable" ), args, outIndex, outArgs ); + aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Creatable") ), args, outIndex, outArgs ); Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY ); aChildNode = newNode; @@ -1120,21 +1086,6 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) { ::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName(); bValid = sal_True; - /* - for( sal_Int32 index = 0; index < childNodes.getLength(); index++ ) - { - if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) ) - { - bValid = sal_False; - String aError( m_createErrStr ); - aError.Append( m_createDupStr ); - ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError ); - aErrorBox.SetText( m_createErrTitleStr ); - aErrorBox.Execute(); - xNewDlg->SetObjectName( aNewName ); - break; - } - } */ if( bValid ) aNewName = aUserSuppliedName; } @@ -1153,7 +1104,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) try { Any aResult; - aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Renamable" ), args, outIndex, outArgs ); + aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Renamable") ), args, outIndex, outArgs ); Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY ); aChildNode = newNode; @@ -1204,7 +1155,7 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry ) try { Any aResult; - aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Deletable" ), args, outIndex, outArgs ); + aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deletable") ), args, outIndex, outArgs ); aResult >>= result; // or do we just assume true if no exception ? } catch( Exception& e ) @@ -1354,25 +1305,25 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString result = unformatted.copy( 0 ); result = ReplaceString( - result, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language ); + result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language ); result = ReplaceString( - result, ::rtl::OUString::createFromAscii( "%SCRIPTNAME" ), script ); + result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%SCRIPTNAME") ), script ); result = ReplaceString( - result, ::rtl::OUString::createFromAscii( "%LINENUMBER" ), line ); + result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LINENUMBER") ), line ); if ( type.getLength() != 0 ) { - result += ::rtl::OUString::createFromAscii( "\n\n" ); + result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL))); - result += ::rtl::OUString::createFromAscii( " " ); + result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ); result += type; } if ( message.getLength() != 0 ) { - result += ::rtl::OUString::createFromAscii( "\n\n" ); + result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") ); result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL))); - result += ::rtl::OUString::createFromAscii( " " ); + result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ); result += message; } @@ -1384,7 +1335,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() { ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) ); - ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); + ::rtl::OUString unknown( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") ); ::rtl::OUString language = unknown; ::rtl::OUString script = unknown; ::rtl::OUString line = unknown; @@ -1427,7 +1378,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) ); - ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); + ::rtl::OUString unknown( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") ); ::rtl::OUString language = unknown; ::rtl::OUString script = unknown; ::rtl::OUString line = unknown; @@ -1475,11 +1426,9 @@ void SvxScriptOrgDialog::RestorePreviousSelection() ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) ); - ::rtl::OUString language = - ::rtl::OUString::createFromAscii( "UNKNOWN" ); + ::rtl::OUString language( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") ); - ::rtl::OUString script = - ::rtl::OUString::createFromAscii( "UNKNOWN" ); + ::rtl::OUString script( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") ); ::rtl::OUString message; @@ -1496,7 +1445,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() message = String( CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); message = ReplaceString( - message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language ); + message, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language ); } else @@ -1556,7 +1505,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection() } else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) ) { - // A Script Framework error has occured + // A Script Framework error has occurred provider::ScriptFrameworkErrorException sfe; aException >>= sfe; return GetErrorMessage( sfe ); @@ -1579,7 +1528,7 @@ SvxScriptErrorDialog::SvxScriptErrorDialog( Window* , ::com::sun::star::uno::Any aException ) : m_sMessage() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_sMessage = GetErrorMessage( aException ); } @@ -1622,3 +1571,5 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage ) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc index 95ba3ddf38c2..5568b447ab96 100644 --- a/cui/source/dialogs/scriptdlg.hrc +++ b/cui/source/dialogs/scriptdlg.hrc @@ -43,13 +43,9 @@ #define SF_PB_HELP 9 #define IMG_HARDDISK 1 -#define IMG_HARDDISK_HC 2 #define IMG_LIB 3 -#define IMG_LIB_HC 4 #define IMG_MACRO 5 -#define IMG_MACRO_HC 6 #define IMG_DOCUMENT 7 -#define IMG_DOCUMENT_HC 8 #define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) #define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13) diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index bb691045dd21..0c58be37e1b1 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -59,41 +59,21 @@ ModalDialog RID_DLG_SCRIPTORGANIZER ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; }; MASKCOLOR }; - Image IMG_HARDDISK_HC - { - ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; }; - MASKCOLOR - }; Image IMG_LIB { ImageBitmap = Bitmap { File = "im30820.png"; }; MASKCOLOR }; - Image IMG_LIB_HC - { - ImageBitmap = Bitmap { File = "imh30820.png"; }; - MASKCOLOR - }; Image IMG_MACRO { ImageBitmap = Bitmap { File = "im30821.png"; }; MASKCOLOR }; - Image IMG_MACRO_HC - { - ImageBitmap = Bitmap { File = "imh30821.png"; }; - MASKCOLOR - }; Image IMG_DOCUMENT { ImageBitmap = Bitmap { File = "im30826.png"; }; MASKCOLOR }; - Image IMG_DOCUMENT_HC - { - ImageBitmap = Bitmap { File = "imh30826.png"; }; - MASKCOLOR - }; String STR_MYMACROS { Text [ en-US ] = "My Macros"; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index de0393a3ca7b..99596c1123c7 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/cjkoptions.hxx> #include <svx/flagsdef.hxx> #include "cuires.hrc" @@ -53,14 +51,6 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* p AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); AddTabPage( RID_SVXPAGE_BORDER ); AddTabPage( RID_SVXPAGE_AREA ); - -/* - SvtCJKOptions aCJKOptions; - if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage( RID_SVXPAGE_PARA_ASIAN); - else - RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); -*/ } SvxFormatCellsDialog::~SvxFormatCellsDialog() @@ -79,13 +69,7 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA ); ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 ); ( (SvxAreaTabPage&) rPage ).SetPos( 0 ); -// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); -// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); -// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); -// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState ); -// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxAreaTabPage&) rPage ).Construct(); - // ActivatePage() wird das erste mal nicht gerufen ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs ); break; @@ -99,3 +83,5 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void SvxFormatCellsDialog::Apply() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index c3ece3326544..7f03cc9010bc 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -100,7 +100,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ de ] = "Zurück" ; Text [ en-US ] = "Return" ; TabStop = TRUE ; @@ -108,34 +107,3 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG }; Text [ x-comment ] = " "; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 62e6e405dbd2..f5b9affb4d80 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "showcols.hxx" #include "fmsearch.hrc" @@ -81,12 +79,11 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) { try { - //CHINA001 xCol->setPropertyValue(::svxform::FM_PROP_HIDDEN, ::cppu::bool2any(sal_False)); xCol->setPropertyValue(CUIFM_PROP_HIDDEN, ::cppu::bool2any(sal_False)); } catch(...) { - DBG_ERROR("FmShowColsDialog::OnClickedOk Exception occured!"); + OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!"); } } } @@ -115,19 +112,16 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: sal_Bool bIsHidden = sal_False; try { - //CHINA001 ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(::svxform::FM_PROP_HIDDEN); ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); bIsHidden = ::comphelper::getBOOL(aHidden); ::rtl::OUString sName; - //CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName; - xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; - sCurName = (const sal_Unicode*)sName; + sCurName = sName; } catch(...) { - DBG_ERROR("FmShowColsDialog::SetColumns Exception occured!"); + OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!"); } // if the col is hidden, put it into the list @@ -136,3 +130,4 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index 231c32effd7a..8cede7ee380b 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -72,33 +72,3 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS }; Text [ en-US ] = "Show columns"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 8d3f034068f5..8b408bf71203 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> @@ -51,8 +49,6 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long , mnMaxVertical( nMaxVertical ) , mnMaxHorizontal( nMaxHorizontal ) { - maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST); - maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST); FreeResource(); maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); @@ -109,3 +105,5 @@ short SvxSplitTableDlg::Execute() void SvxSplitTableDlg::Apply() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc index 143f4685abe4..7698c9687f12 100644 --- a/cui/source/dialogs/splitcelldlg.hrc +++ b/cui/source/dialogs/splitcelldlg.hrc @@ -33,10 +33,6 @@ #define RB_VERT 12 #define FL_DIR 12 -#define BMP_SPLIT_VERT 13 -#define BMP_SPLIT_HORZ 14 - #define BT_OK 100 #define BT_CANCEL 101 #define BT_HELP 102 - diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 9f07dc55ac38..6fb9a990aa38 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -106,14 +106,6 @@ ModalDialog RID_SVX_SPLITCELLDLG Size = MAP_APPFONT ( 91 , 12 ) ; Text [ en-US ] = "~Into equal proportions"; }; - Image BMP_SPLIT_VERT - { - ImageBitmap = Bitmap { File = "zetlver2_h.bmp" ; }; - }; - Image BMP_SPLIT_HORZ - { - ImageBitmap = Bitmap { File = "zetlhor2_h.bmp" ; }; - }; ImageRadioButton RB_VERT { HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT"; @@ -133,5 +125,3 @@ ModalDialog RID_SVX_SPLITCELLDLG Text [ en-US ] = "Direction" ; }; }; - - diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 7bae8669cfb2..4f8b83bc67f9 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "srchxtra.hxx" @@ -287,3 +285,4 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog aRelaxBox.Check( bRelax ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc index 5df6d9bd4767..995f0097586e 100644 --- a/cui/source/dialogs/srchxtra.hrc +++ b/cui/source/dialogs/srchxtra.hrc @@ -44,8 +44,4 @@ #define NF_LONGER 21 #define FL_SIMILARITY 22 - - - #endif - diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 3f737c10dcc8..7fe0fc886455 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -81,15 +81,6 @@ ModalDialog MD_PASTE_OBJECT Size = MAP_APPFONT ( 64 , 10 ) ; Text [ en-US ] = "~As icon" ; }; - /* - FixedIcon FI_DISPLAY - { - Border = TRUE ; - Hide = TRUE ; - Pos = MAP_APPFONT ( 167 , 75 ) ; - Size = MAP_APPFONT ( 30 , 30 ) ; - }; -*/ PushButton PB_CHANGE_ICON { HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON"; @@ -143,7 +134,6 @@ ModalDialog MD_UPDATE_BASELINKS { Pos = MAP_APPFONT ( 83 , 6 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Element: : Verknüpfungen */ Text [ en-US ] = "Element:" ; }; FixedText FT_TYPE @@ -233,7 +223,6 @@ ModalDialog MD_UPDATE_BASELINKS HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL"; Pos = MAP_APPFONT ( 133 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */ Text [ en-US ] = "Ma~nual" ; }; FixedText FT_FULL_FILE_NAME diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index fd8a6e56bf21..ddd77621f322 100755..100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,17 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove - -#include "precompiled_cui.hxx" - #include "thesdlg.hrc" #include "thesdlg.hxx" #include "thesdlg_impl.hxx" #include "cuires.hrc" #include "dialmgr.hxx" -#include <editeng/unolingu.hxx> #include <tools/shl.hxx> #include <svl/lngmisc.hxx> #include <svtools/filter.hxx> @@ -44,8 +40,6 @@ #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <com/sun/star/linguistic2/XMeaning.hpp> #include <thesdlg.hxx> #include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> @@ -59,7 +53,6 @@ #include <osl/file.hxx> #include <svl/lngmisc.hxx> - #include <stack> #include <algorithm> @@ -70,10 +63,8 @@ using namespace ::com::sun::star; using ::rtl::OUString; - #define A2S(x) String::CreateFromAscii( x ) - // class LookUpComboBox_Impl -------------------------------------------------- LookUpComboBox_Impl::LookUpComboBox_Impl( @@ -87,18 +78,15 @@ LookUpComboBox_Impl::LookUpComboBox_Impl( EnableAutocomplete( sal_False ); } - LookUpComboBox_Impl::~LookUpComboBox_Impl() { } - void LookUpComboBox_Impl::Modify() { m_aModifyTimer.Start(); } - IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) { m_rDialogImpl.LookUp( GetText() ); @@ -106,21 +94,18 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) return 0; } - // class ReplaceEdit_Impl -------------------------------------------------- -ReplaceEdit_Impl::ReplaceEdit_Impl( - Window *pParent, const ResId &rResId ) : - Edit (pParent, rResId) +ReplaceEdit_Impl::ReplaceEdit_Impl( Window *pParent, const ResId &rResId ) + : Edit(pParent, rResId) + , m_pBtn(NULL) { } - ReplaceEdit_Impl::~ReplaceEdit_Impl() { } - void ReplaceEdit_Impl::Modify() { if (m_pBtn) @@ -133,20 +118,18 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr ) Modify(); } - void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection ) { Edit::SetText( rStr, rNewSelection ); Modify(); } - // class ThesaurusAlternativesCtrl_Impl ---------------------------------- AlternativesString_Impl::AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : - // + SvLBoxString( pEntry, nFlags, rStr ), m_rControlImpl( rControl ) { @@ -173,7 +156,6 @@ void AlternativesString_Impl::Paint( rDev.SetFont( aOldFont ); } - ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( Window* pParent, SvxThesaurusDialog_Impl &rImpl ) : @@ -184,20 +166,17 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( SetHighlightRange(); } - ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl() { ClearExtraData(); } - void ThesaurusAlternativesCtrl_Impl::ClearExtraData() { UserDataMap_t aEmpty; m_aUserData.swap( aEmpty ); } - void ThesaurusAlternativesCtrl_Impl::SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ) @@ -212,7 +191,6 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData( m_aUserData[ pEntry ] = rData; } - AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( const SvLBoxEntry *pEntry ) { @@ -223,7 +201,6 @@ AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( return pRes; } - SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) { SvLBoxEntry* pEntry = new SvLBoxEntry; @@ -247,7 +224,6 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St return pEntry; } - void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) { const KeyCode& rKey = rKEvt.GetKeyCode(); @@ -260,32 +236,23 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) SvxCheckListBox::KeyInput( rKEvt ); } - void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) { if (!m_rDialogImpl.m_bWordFound) { -/* Push( PUSH_FONT ); - - Font aFont( GetFont() ); - aFont.SetHeight( 2 * aFont.GetHeight() ); - SetFont( aFont ); -*/ Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() ); aTextSize = LogicToPixel( aTextSize ); Point aPos; aPos.X() += GetSizePixel().Width() / 2 - aTextSize.Width() / 2; - aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/; + aPos.Y() += GetSizePixel().Height() / 2; aPos = PixelToLogic( aPos ); DrawText( aPos, m_rDialogImpl.aErrStr ); -// Pop(); } else SvxCheckListBox::Paint( rRect ); } - // struct SvxThesaurusDialog_Impl ---------------------------------------- SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) : @@ -305,7 +272,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) aCancelBtn ( pDialog, CUI_RES( BTN_THES_CANCEL ) ), aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ), aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), - aVendorDefaultImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ), xThesaurus ( NULL ), aLookUpText (), nLookUpLanguage ( LANGUAGE_NONE ), @@ -324,13 +290,11 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, VendorImageInitHdl ) ); } - SvxThesaurusDialog_Impl::~SvxThesaurusDialog_Impl() { delete aLangMBtn.GetPopupMenu(); } - uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDialog_Impl::queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, @@ -358,7 +322,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi return aMeanings; } - bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() { lang::Locale aLocale( SvxCreateLocale( nLookUpLanguage ) ); @@ -392,7 +355,6 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() return nMeanings > 0; } - void SvxThesaurusDialog_Impl::LookUp( const String &rText ) { if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same @@ -400,7 +362,6 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText ) LookUp_Impl(); } - IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) { if (pBtn && aLookUpHistory.size() >= 2) @@ -413,7 +374,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) { PopupMenu *pMenu = aLangMBtn.GetPopupMenu(); @@ -432,7 +392,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) return 0; } - void SvxThesaurusDialog_Impl::LookUp_Impl() { String aText( aWordCB.GetText() ); @@ -452,7 +411,6 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() aLeftBtn.Enable( aLookUpHistory.size() > 1 ); } - IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) { if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys @@ -467,7 +425,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; @@ -485,7 +442,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; @@ -510,7 +466,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis return 0; } - IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { (void) pThis; @@ -537,7 +492,6 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) return aRes; } - static String lcl_GetThesImplName( const lang::Locale &rLocale ) { String aRes; @@ -554,7 +508,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) if (xLngMgr.is()) { uno::Sequence< OUString > aServiceNames = xLngMgr->getConfiguredServices( - OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale ); // there should be at most one thesaurus configured for each language DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" ); if (aServiceNames.getLength() == 1) @@ -570,7 +524,6 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) return aRes; } - void SvxThesaurusDialog_Impl::UpdateVendorImage() { m_pDialog->SetUpdateMode( sal_False ); @@ -578,22 +531,19 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { - const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - Image aImage; String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) ); - OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName, bHC ) ); + OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) ); if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0) aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) ); else - aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage; + aImage = aVendorDefaultImage; aVendorImageFI.SetImage( aImage ); } m_pDialog->SetUpdateMode( sal_True ); } - IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG ) { pThis->m_pDialog->SetUpdateMode( sal_False ); @@ -601,8 +551,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { - const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - Image aImage( bHC ? pThis->aVendorDefaultImageHC : pThis->aVendorDefaultImage ); + Image aImage( pThis->aVendorDefaultImage ); pThis->aVendorImageFI.SetImage( aImage ); pThis->aVendorImageFI.Show(); @@ -653,7 +602,6 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo return 0; }; - // class SvxThesaurusDialog ---------------------------------------------- SvxThesaurusDialog::SvxThesaurusDialog( @@ -714,12 +662,10 @@ SvxThesaurusDialog::SvxThesaurusDialog( Enable( sal_False ); } - SvxThesaurusDialog::~SvxThesaurusDialog() { } - void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) { // Sprache anpassen @@ -731,21 +677,18 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) SetText( aStr ); // set window title } - String SvxThesaurusDialog::GetWord() { return m_pImpl->aReplaceEdit.GetText(); } - sal_uInt16 SvxThesaurusDialog::GetLanguage() const { return m_pImpl->nLookUpLanguage; } - void SvxThesaurusDialog::Apply() { } - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc index 994c933246de..aef4131db3e6 100644 --- a/cui/source/dialogs/thesdlg.hrc +++ b/cui/source/dialogs/thesdlg.hrc @@ -43,10 +43,7 @@ #define CT_THES_ALTERNATIVES 25 #define IMG_VENDOR 26 #define IMG_DEFAULT_VENDOR 27 -#define IMG_DEFAULT_VENDOR_HC 28 #define STR_ERR_TEXTNOTFOUND 101 - #endif - diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index 8592a9fb50cc..67fdced0f137 100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -142,9 +142,5 @@ ModalDialog RID_SVXDLG_THESAURUS { ImageBitmap = Bitmap { File = "vendor01.png"; }; }; - Image IMG_DEFAULT_VENDOR_HC - { - ImageBitmap = Bitmap { File = "vendor01h.png"; }; - }; }; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 59de4406bf0d..678b1257bf5f 100755..100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: $ - * $Revision: $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -190,7 +188,6 @@ struct SvxThesaurusDialog_Impl String aErrStr; Image aVendorDefaultImage; - Image aVendorDefaultImageHC; uno::Reference< linguistic2::XThesaurus > xThesaurus; OUString aLookUpText; @@ -225,3 +222,4 @@ struct SvxThesaurusDialog_Impl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp index d1bdf9eb2002..242607952c99 100644 --- a/cui/source/dialogs/winpluginlib.cpp +++ b/cui/source/dialogs/winpluginlib.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,6 @@ #include <Shlwapi.h> #include <stdio.h> - #define SO_PATH_SIZE 4096 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll" extern "C" { @@ -80,8 +80,7 @@ int lc_isInstalled(const char* realFilePath) sprintf(sSoPath,"%s", realFilePath); ret = 0; } - //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); - //ret = GetEnvironmentVariable("prog", sSoPath, SO_PATH_SIZE); + // GetCurrentDirectory return the char number of the string if(ret == 0){ DWORD dType = REG_SZ; @@ -155,7 +154,6 @@ int lc_installPlugin(const char* realFilePath) char sSoPath[SO_PATH_SIZE]; DWORD sState; - LONG ret; ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE", 0, KEY_READ|KEY_WRITE, &hKeySoftware); if(ret != ERROR_SUCCESS){ @@ -195,7 +193,6 @@ int lc_installPlugin(const char* realFilePath) RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) ret = -1; else{ @@ -203,7 +200,6 @@ int lc_installPlugin(const char* realFilePath) ret = 0; } - //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); // GetCurrentDirectory return the char number of the string if(ret == 0){ ret = RegSetValueEx( hStarOffice, "Path", 0, REG_SZ, (LPBYTE) sSoPath, strlen(sSoPath) + 1); @@ -224,3 +220,5 @@ int lc_installPlugin(const char* realFilePath) return ret; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 15640292d951..89d0fa9f7483 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -134,7 +132,7 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } @@ -390,7 +388,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } @@ -472,7 +470,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } pOutSet = new SfxItemSet( rSet ); @@ -496,3 +494,4 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc index 49412ad085f0..32c1cc2dc97a 100644 --- a/cui/source/dialogs/zoom.hrc +++ b/cui/source/dialogs/zoom.hrc @@ -50,4 +50,3 @@ #define BTN_ZOOM_HELP 30 #endif - diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 56b274ef75ff..f96323a36255 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -166,4 +166,3 @@ ModalDialog RID_SVXDLG_ZOOM }; // ********************************************************************** EOF - diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index d9fb854311e2..bfa1b40e81b1 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dlgfact.hxx" #include "sal/types.h" @@ -49,3 +47,5 @@ extern "C" return ::cui::GetFactory(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index dac995a0d193..c04206ccb63b 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> @@ -48,3 +46,5 @@ ResMgr* CuiResMgr::GetResMgr() return pResMgr; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 34e741ad983e..49163e6034fc 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "align.hxx" //add for SvxAlignmentTabPage #include "dlgfact.hxx" @@ -133,7 +131,6 @@ short AbstractSvxZoomDialog_Impl::Execute() return pDlg->Execute(); } -//IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl); IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl); IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl); @@ -1135,7 +1132,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p return new AbstractTabDialog_Impl( pDlg ); } -//TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog CHINA001 +// TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes ) @@ -1978,3 +1975,4 @@ AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordT } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index e38b9af1113e..79cdbe7dad0b 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,7 +80,6 @@ public: \ {} \ virtual ~Class(); \ virtual short Execute() ; -// virtual void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ) #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -135,11 +135,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog) virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001 - virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001 + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); //add by CHINA001 - virtual String GetText() const; //add by CHINA001 + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; //for SvxDistributeDialog begin @@ -234,7 +234,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual Window* GetWindow(); virtual SfxBindings& GetBindings(); }; - +//for SvxSpellDialog end //for SearchProgress begin class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress @@ -623,10 +623,10 @@ public: SdrModel* pModel=0 ); //add for SvxTextTabDialog virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent, const SfxItemSet& rSet, - sal_uInt32 nResId); //add by CHINA001 + sal_uInt32 nResId); virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001 + sal_uInt16 nAnchorTypes = 0 ); virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, @@ -639,7 +639,7 @@ public: virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 ); - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 + virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ); @@ -670,11 +670,6 @@ public: SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ); -//STRIP001 virtual AbstractSvxSpellCheckDialog * CreateSvxSpellCheckDialog( Window* pParent, //add for SvxSpellCheckDialog -//STRIP001 ::com::sun::star::uno::Reference< -//STRIP001 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, -//STRIP001 SvxSpellWrapper* pWrapper, -//STRIP001 sal_uInt32 nResId); virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ); virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, const INetURLObject& rStartURL); @@ -797,3 +792,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index 19df0ac00e7b..ac3753f57074 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/msgbox.hxx> #include "cuicharmap.hxx" @@ -51,3 +49,5 @@ SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const Font& return bRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index 4f18f60cd438..882a80318b8a 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: }; #endif // SVX_CONTROLL_FUCUS_HELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index bb12f284d53d..e9d39f679c0d 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,7 +70,7 @@ namespace svx{ class SpellDialog; struct SpellErrorDescription; // ------------------------------------------------------------------ -class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/ +class SentenceEditWindow_Impl : public MultiLineEdit { using MultiLineEdit::SetText; @@ -183,7 +184,6 @@ private: GroupBox aBackgroundGB; Image aVendorImage; - Image aVendorImageHC; String aResumeST; String aIgnoreOnceST; @@ -235,7 +235,7 @@ private: /** Retrieves the next sentence. */ - bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/); + bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the current sentence*/); /** Corrects all errors that have been selected to be changed always */ bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); @@ -261,3 +261,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index f44a60cc8040..8935d1e726e6 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,15 +29,11 @@ #ifndef _ACCCFG_HXX #define _ACCCFG_HXX -// #include ***************************************************************** - #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -234,3 +231,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 34fada956c86..3d39492b315b 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,6 +55,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); + virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -64,6 +66,8 @@ private: void InitVsRefEgde(); void UpdateEnableControls(); + bool HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const; + DECL_LINK( UpdateEnableHdl, void* ); private: @@ -99,3 +103,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 7fe4483e5256..91e97c25eac9 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,9 +62,7 @@ public: #ifdef _OFA_AUTOCDLG_CXX #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svtabbx.hxx> #include <svx/simptabl.hxx> @@ -116,6 +115,7 @@ private: String sDash; String sNonBrkSpace; String sFirst; + String sAccidentalCaps; public: OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -153,6 +153,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage String sByInputBullet; String sBoldUnder; String sNoDblSpaces; + String sCorrectCapsLock; String sDetectURL; String sDash; String sNonBrkSpace; @@ -239,7 +240,6 @@ private: SvStringsISortDtor* pFormatText; DoubleStringTable aDoubleStringTable; CollatorWrapper* pCompareClass; - CollatorWrapper* pCompareCaseClass; CharClass* pCharClass; LanguageType eLang; @@ -305,7 +305,7 @@ private: DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBoxes(sal_Bool bFromReset, //Box mit neuer Sprache fuellen + void RefillReplaceBoxes(sal_Bool bFromReset, //Box filled with new language LanguageType eOldLanguage, LanguageType eNewLanguage); public: @@ -417,7 +417,6 @@ class OfaAutoCompleteTabPage : public SfxTabPage CheckBox aCBCollect;//Collect words CheckBox aCBRemoveList;//...save the list for later use... - //--removed--CheckBox aCBEndless;// FixedText aFTExpandKey; ListBox aDCBExpandKey; @@ -516,3 +515,4 @@ public: #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 921e104110ec..d3cc4e589439 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svtools/valueset.hxx> #include <svx/dlgctrl.hxx> @@ -72,11 +69,11 @@ public: virtual void FillUserData(); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void ShowSelector(); // Umschalt-ListBox aktivieren - void ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle) - void ShowParaControl(sal_Bool bCharOnly = sal_False); // fuer den Writer (Absatz/Zeichen) + void ShowSelector(); // Shift-ListBox activation + void ShowTblControl(); // for the Writer (cells/rows/tables) + void ShowParaControl(sal_Bool bCharOnly = sal_False); // for the Writer (paragraph/characters) void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -91,7 +88,6 @@ private: FixedText aTblDesc; ListBox aTblLBox; ListBox aParaLBox; - // Hintergrundfarbe ------------------------------------ Control aBorderWin; ValueSet aBackgroundColorSet; FixedLine aBackgroundColorBox; @@ -100,7 +96,7 @@ private: FixedText aColTransFT; MetricField aColTransMF; CheckBox aBtnPreview; - // Hintergrund-Bitmap ---------------------------------- + // Background Bitmap ---------------------------------- FixedLine aGbFile; PushButton aBtnBrowse; CheckBox aBtnLink; @@ -116,7 +112,7 @@ private: BackgroundPreviewImpl* pPreviewWin2; - // DDListBox fuer Writer ------------------------------- + // DDListBox for Writer ------------------------------- //------------------------------------------------------ Color aBgdColor; sal_uInt16 nHtmlMode; @@ -133,9 +129,9 @@ private: SvxBackgroundPage_Impl* pPageImpl; SvxOpenGraphicDialog* pImportDlg; - // Items fuer Sw-Tabelle muessen gesammelt werden + // Items for Sw-Table must be corrected SvxBackgroundTable_Impl* pTableBck_Impl; - // auch fuer die Absatzvorlage + // also for the paragraph style SvxBackgroundPara_Impl* pParaBck_Impl; #ifdef _SVX_BACKGRND_CXX @@ -165,3 +161,4 @@ private: #endif // #ifndef _SVX_BACKGRND_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 575e744d8ddf..16274938ecaf 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,9 +49,10 @@ protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); private: - sal_Bool bEnableBackgroundSelector; // fuer Border/Background-Dlg + sal_Bool bEnableBackgroundSelector; // for Border/Background }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index d62083b37d77..19d97b6a8c32 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ public: virtual void Reset( const SfxItemSet& ); void HideShadowControls(); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -104,7 +105,7 @@ private: //properties - "Merge with next paragraph" in Writer FixedLine aPropertiesFL; CheckBox aMergeWithNextCB; - // --> collapsing table borders FME 2005-05-27 #i29550# + // --> collapsing table borders #i29550# CheckBox aMergeAdjacentBordersCB; // <-- @@ -144,7 +145,7 @@ private: // Filler void FillLineListBox_Impl(); - // Setzen von einzelnen Frame-/Core-Linien + // share for individual Frame-/Core-Line void ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCurLine, bool bValid ); @@ -154,3 +155,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 13c1289bda48..dfcbc59da534 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,6 @@ #define _SVXCFG_HXX #include <vcl/lstbox.hxx> -#include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/menubtn.hxx> @@ -423,7 +423,7 @@ protected: ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; - SvxConfigPage( Window*, /* const ResId&, */ const SfxItemSet& ); + SvxConfigPage( Window*, const SfxItemSet& ); virtual ~SvxConfigPage(); DECL_LINK( MoveHdl, Button * ); @@ -568,7 +568,6 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox Size m_aCheckBoxImageSizePixel; Link m_aChangedListener; SvLBoxButtonData* m_pButtonData; - sal_Bool m_bHiContrastMode; SvxConfigPage* pPage; void ChangeVisibility( SvLBoxEntry* pEntry ); @@ -768,7 +767,7 @@ private: void ImportGraphics( const com::sun::star::uno::Sequence< rtl::OUString >& aURLs ); - BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);// Added by shizhoubo + BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize); public: @@ -817,3 +816,5 @@ public: SvxIconChangeDialog(Window *pWindow, const rtl::OUString& aMessage); }; #endif // _SVXCFG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 8f80928c33ed..b8937689dee3 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,7 +150,6 @@ struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox_Impl : public SvTreeListBox { SvxConfigGroupBoxResource_Impl* pImp; - //SfxSlotPool* pSlotPool; SfxConfigFunctionListBox_Impl* pFunctionListBox; SfxGroupInfoArr_Impl aArr; sal_uLong nMode; @@ -161,9 +161,17 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo; css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription; - Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ); + Image GetImage( + ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, + bool bIsRootNode + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, + ::rtl::OUString& docName + ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); void InitModule(); void InitBasic(); @@ -202,3 +210,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 29fcdb13b63a..5f88aa64fd3b 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,7 +82,6 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ); -// virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; @@ -252,10 +252,8 @@ private: DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: -// using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; -// virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: @@ -394,3 +392,4 @@ public: #endif // #ifndef _SVX_CHARDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 75f6a11d2e52..00898a57c1f6 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,7 +96,7 @@ public: void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; /************************************************************************* @@ -113,6 +114,6 @@ public: ~SvxConnectionDialog(); }; - #endif // _SVX_CONNECT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index eb9a9c91c0eb..040c299b7c6a 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,12 +89,10 @@ friend class SvxCharacterMap; SvxShowCharSet aShowSet; SvxShowText aShowText; -// SvxShowText aShowShortcut; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; PushButton aDeleteBtn; -// PushButton aAssignBtn; FixedText aFontText; ListBox aFontLB; FixedText aSubsetText; @@ -101,7 +100,6 @@ friend class SvxCharacterMap; FixedText aSymbolText; SvxShowText aShowChar; FixedText aCharCodeText; -// FixedText aAssignText; Font aFont; sal_Bool bOne; const SubsetMap* pSubsetMap; @@ -141,3 +139,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 5f37371db4aa..68ebcc3b80c3 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,26 +31,18 @@ #include <com/sun/star/sdbc/XResultSet.hpp> -#include <svx/fmsearch.hxx> //CHINA001 +#include <svx/fmsearch.hxx> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> @@ -62,7 +55,7 @@ namespace svxform { } // =================================================================================================== -// = class FmSearchDialog - Dialog fuer Suchen in Formularen/Tabellen +// = class FmSearchDialog - Dialog for searching in Forms/Tables // =================================================================================================== struct FmSearchProgress; @@ -73,7 +66,7 @@ class FmSearchDialog : public ModalDialog { friend class FmSearchEngine; - // meine ganzen Controls + // my all Controls FixedLine m_flSearchFor; RadioButton m_rbSearchForText; RadioButton m_rbSearchForNull; @@ -111,19 +104,19 @@ class FmSearchDialog : public ModalDialog Window* m_pPreSearchFocus; - Link m_lnkFoundHandler; // Handler fuer "gefunden" - Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors + Link m_lnkFoundHandler; // Handler for "found" + Link m_lnkCanceledNotFoundHdl; // Handler for Positioning the Cursors - Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten + Link m_lnkContextSupplier; // for search in contexts - // ein Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke + // an Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke ::std::vector<String> m_arrContextFields; // fuer die eigentliche Arbeit ... FmSearchEngine* m_pSearchEngine; Timer m_aDelayedPaint; - // siehe EnableSearchUI + // see EnableSearchUI ::svxform::FmSearchConfigItem* m_pConfig; public: @@ -190,7 +183,7 @@ protected: void SaveParams() const; private: - // Handler fuer die Controls + // Handler for the Controls DECL_LINK( OnClickedFieldRadios, Button* ); DECL_LINK( OnClickedSearchAgain, Button* ); DECL_LINK( OnClickedSpecialSettings, Button* ); @@ -208,7 +201,7 @@ private: DECL_LINK( OnSearchProgress, FmSearchProgress* ); DECL_LINK( OnDelayedPaint, void* ); - // siehe EnableSearchUI + // see EnableSearchUI void implMoveControls(Control** _ppControls, sal_Int32 _nControls, sal_Int32 _nUp, Control* _pToResize); @@ -225,3 +218,5 @@ inline void FmSearchDialog::SetActiveField(const String& strField) } #endif // _CUI_FMSEARCH_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index b3d426df7173..79a9b58f9350 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,7 @@ #ifndef _CUI_GALDLG_HXX_ #define _CUI_GALDLG_HXX_ -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <vcl/dialog.hxx> #include <vcl/graph.hxx> #include <vcl/fixed.hxx> @@ -46,8 +47,7 @@ #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> #include <svtools/dialogclosedlistener.hxx> - -DECLARE_LIST( StringList, String* ) +#include <vector> // ------------ // - Forwards - @@ -59,6 +59,8 @@ class SearchProgress; class TakeProgress; class TPGalleryThemeProperties; +typedef ::std::vector< UniString* > StringList; + // --------------- // - FilterEntry - // --------------- @@ -72,7 +74,7 @@ struct FilterEntry // - SearchThread - // ---------------- -class SearchThread : public ::vos::OThread +class SearchThread : public ::osl::Thread { private: @@ -129,7 +131,7 @@ public: // - TakeThread - // -------------- -class TakeThread : public ::vos::OThread +class TakeThread : public ::osl::Thread { private: @@ -371,3 +373,5 @@ public: }; #endif // _CUI_GALDLG_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index ea34511cb298..0c6061068261 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> @@ -41,30 +40,7 @@ #include <svx/graphctl.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> -/* -// --------------- -// - Error codes - -// --------------- - -#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 -#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 -#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 - -// -------------------- -// - SvxGraphicFilter - -// -------------------- -class SfxRequest; -class SfxItemSet; - -class SvxGraphicFilter -{ -public: - - static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); - static void DisableGraphicFilterSlots( SfxItemSet& rSet ); -}; -*/ // ----------------------- // - GraphicFilterDialog - // ----------------------- @@ -251,3 +227,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 73aa971ef617..86d930620e3e 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,7 +95,6 @@ protected: virtual sal_Bool Close(); virtual void Move(); -// virtual long PreNotify( NotifyEvent& rNEvt ); public: SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); ~SvxHpLinkDlg (); @@ -112,3 +112,5 @@ public: #endif // _CUI_TAB_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 0e62fab44318..fa0bfeb1ad64 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _CUI_IMAPWND_HXX #define _CUI_IMAPWND_HXX @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 4e275d1583db..40466a3e6b0e 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ public: #endif // #ifndef _SVX_CUIOPTGENRL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 52549e934ecc..efde05284e3e 100755..100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -34,9 +34,6 @@ // Resource-Id's ------------------------------------------------------------ -// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings) -#define RID_SVX_FIRSTFREE 305 - // Gallery #define RID_CUI_GALLERY_START (RID_SVX_START + 360) #define RID_CUI_GALLERY_END (RID_SVX_START + 410) @@ -79,8 +76,6 @@ #define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) #define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) #define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509) -#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) -#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) #define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) #define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) @@ -136,7 +131,6 @@ #define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116) #define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115) #define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) -#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) #define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//? #define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//? #define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//? @@ -183,7 +177,6 @@ #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) #define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248) #define RID_SVXBMP_LOCK (RID_SVX_START + 118) -#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119) #define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) #define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //? #define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? @@ -222,10 +215,6 @@ // hyperlink dialog #define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) -#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272) -#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273) -#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274) -#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275) #define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) #define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) #define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) @@ -407,7 +396,7 @@ #define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094) #define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095) #define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096) -#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097) +#define RID_SVXSTR_EVENT_ERROROCCURRED (RID_SVX_START + 1097) #define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098) #define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) #define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 76243b6a6046..f1bf39764c55 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 1c109923b147..eee2bc172dfa 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,7 +42,6 @@ class SvxAreaTabDialog : public SfxTabDialog { private: SdrModel* mpDrawModel; -// const SdrView* mpView; XColorTable* mpColorTab; XColorTable* mpNewColorTab; @@ -119,10 +119,8 @@ class SvxTransparenceTabPage : public SvxTabPage const SfxItemSet& rOutAttrs; RECT_POINT eRP; - //CHINA001 sal_uInt16* pPageType; - //CHINA001 sal_uInt16* pDlgType; - sal_uInt16 nPageType; //add CHINA001 - sal_uInt16 nDlgType; //add CHINA001 + sal_uInt16 nPageType; + sal_uInt16 nDlgType; // main selection FixedLine aFlProp; @@ -187,11 +185,9 @@ public: virtual int DeactivatePage(SfxItemSet* pSet); virtual void PointChanged(Window* pWindow, RECT_POINT eRP); - //CHINA001 void SetPageType(sal_uInt16 *pInType) { pPageType = pInType; } - //CHINA001 void SetDlgType(sal_uInt16* pInType) { pDlgType = pInType; } - void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add CHINA001 - void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add CHINA001 - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } + void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; } + virtual void PageCreated (SfxAllItemSet aSet); }; /************************************************************************* @@ -257,12 +253,9 @@ private: ChangeType* pnGradientListState; ChangeType* pnHatchingListState; - //CHINA001 sal_uInt16* pPageType; - //CHINA001 sal_uInt16* pDlgType; - //CHINA001 sal_uInt16* pPos; - sal_uInt16 nPageType; //add CHINA001 - sal_uInt16 nDlgType;//add CHINA001 - sal_uInt16 nPos; //add CHINA001 + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPos; sal_Bool* pbAreaTP; @@ -286,7 +279,6 @@ private: DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ClickBitmapHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); -// DECL_LINK( ModifyTransparentHdl_Impl, void * ); DECL_LINK( ModifyStepCountHdl_Impl, void * ); DECL_LINK( ModifyTileHdl_Impl, void * ); DECL_LINK( ClickScaleHdl_Impl, void * ); @@ -313,14 +305,11 @@ public: { pHatchingList = pHtchLst; } void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; } - //CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } - void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001 - //CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; } - void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add CHINA001 - //CHINA001 void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; } - void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001 + void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } + void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } + void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; } void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } @@ -356,8 +345,8 @@ private: XColorTable* pColorTab; ChangeType* pnColorTableState; - sal_uInt16 nPageType; //add CHINA001 - sal_uInt16 nDlgType; //add CHINA001 + sal_uInt16 nPageType; + sal_uInt16 nDlgType; sal_uInt16* pPos; sal_Bool* pbAreaTP; @@ -387,13 +376,11 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } -//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } -//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; } - void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001 - void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } //add CHINA001 + void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } + void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); void DisablePage( sal_Bool bIn ) { bDisable = bIn; } }; @@ -760,11 +747,11 @@ private: DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'loeschen' DECL_LINK( ClickWorkOnHdl_Impl, void * ); // Button 'Bearbeiten' - DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox auswählen - DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus Farbpalette (links) auswählen + DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox ausw�hlen + DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus Farbpalette (links) ausw�hlen DECL_LINK( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox 'Farbmodell' long ChangeColorHdl_Impl( void* p ); - DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der Farbwerte-Felder wurde verändert + DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der Farbwerte-Felder wurde ver�ndert DECL_LINK( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle laden' DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle sichern' @@ -797,6 +784,6 @@ public: virtual void FillUserData(); }; - #endif // _CUI_TAB_AREA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index d80239da302c..fbdcf44a0862 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,8 +174,8 @@ private: ChangeType* pnLineEndListState; ChangeType* pnDashListState; ChangeType* pnColorTableState; - sal_uInt16 nPageType; //add CHINA001 - sal_uInt16 nDlgType; //add CHINA001 + sal_uInt16 nPageType; + sal_uInt16 nDlgType; sal_uInt16* pPosDashLb; sal_uInt16* pPosLineEndLb; @@ -183,13 +184,12 @@ private: // #63083# sal_Int32 nActLineWidth; - //Handler für Gallery-Popup-Menue-Button + Size + //Handler f�r Gallery-Popup-Menue-Button + Size DECL_LINK( GraphicHdl_Impl, MenuButton * ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK( RatioHdl_Impl, CheckBox * ); - // <- Symbole #ifdef _SVX_TPLINE_CXX DECL_LINK( ClickInvisibleHdl_Impl, void * ); @@ -214,7 +214,6 @@ public: void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); @@ -233,8 +232,8 @@ public: void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; } void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } - void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } - void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; } + void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } + void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; } void SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; } @@ -242,7 +241,7 @@ public: void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -425,6 +424,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; - #endif // _CUI_TAB_LINE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 1587dd7baaf5..e2b992dbfc72 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _CUI_TBXFORM_HXX #define _CUI_TBXFORM_HXX @@ -5,9 +6,7 @@ #include <vcl/field.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif //======================================================================== @@ -27,3 +26,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index d069933f13ef..65ebd9422e5f 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,4 @@ namespace svx #endif // SVX_DBREGISTER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx index 273aabcdb3ff..c3e2f198995e 100644 --- a/cui/source/inc/defdlgname.hxx +++ b/cui/source/inc/defdlgname.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ const short RET_BTN_1 = 100; const short RET_BTN_2 = 101; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index fb91a14a44ff..de8931edbce7 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,16 +34,17 @@ // forward --------------------------------------------------------------- +#define CUI_MGR() (*CuiResMgr::GetResMgr()) +#define CUI_RES(i) ResId(i,CUI_MGR()) +#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR())) +#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR())) + class ResMgr; struct CuiResMgr { static ResMgr* GetResMgr(); }; -#define CUI_MGR() (*CuiResMgr::GetResMgr()) -#define CUI_RES(i) ResId(i,CUI_MGR()) -#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR())) -#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR())) - #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index e0e0a05cc9d3..75b5d0d8a70d 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,9 @@ #define _SVX_DLG_NAME_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen -#include <vcl/fixed.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <vcl/fixed.hxx> // #i68101# @@ -202,3 +194,4 @@ public: #endif // _SVX_DLG_NAME_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 1100f76ccbe6..08514f807bb2 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,30 +31,7 @@ #include <svx/dlgctrl.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> -#include <svx/dstribut_enum.hxx> //CHINA001 -/************************************************************************* -|* -\************************************************************************/ - -/* -enum SvxDistributeHorizontal -{ - SvxDistributeHorizontalNone = 0, - SvxDistributeHorizontalLeft, - SvxDistributeHorizontalCenter, - SvxDistributeHorizontalDistance, - SvxDistributeHorizontalRight -}; - -enum SvxDistributeVertical -{ - SvxDistributeVerticalNone = 0, - SvxDistributeVerticalTop, - SvxDistributeVerticalCenter, - SvxDistributeVerticalDistance, - SvxDistributeVerticalBottom -}; -*/ +#include <svx/dstribut_enum.hxx> /************************************************************************* |* @@ -123,3 +101,4 @@ public: #endif // _SVX_DSTRIBUT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index ab3ff52318a6..9d53f2cc29db 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,15 +29,9 @@ #ifndef _SVX_GRFPAGE_HXX #define _SVX_GRFPAGE_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> @@ -138,3 +133,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index ca8a2142764d..94543a8c553a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -345,3 +346,5 @@ namespace svx //............................................................................. #endif // SVX_HANGUL_HANJA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 14eeb5c77933..2eba0a088073 100755 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ inline HeaderBar& _HeaderTabListBox::GetHeaderBar( void ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 81fbc89eee67..c32d432d8a9b 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,7 @@ private: sal_Bool ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New + DECL_LINK (ClickNewHdl_Impl , void * ); Image GetImage( sal_uInt16 nId ); @@ -74,3 +75,5 @@ public: #endif // _SVX_TABPAGE_DOCNEW_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 7eae2afd6b7f..1c7a7a155da8 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,15 +55,15 @@ private: sal_Bool mbMarkWndOpen; - DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen - DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target + DECL_LINK (ClickFileopenHdl_Impl , void * ); + DECL_LINK (ClickTargetHdl_Impl , void * ); - DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path" modified - DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified + DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path" modified + DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified - DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus + DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, @@ -91,3 +92,5 @@ public: #endif // _SVX_TABPAGE_DOC_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index c69e6021d215..b803f01aaf1c 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ public: #endif // _SVX_TABPAGE_INET_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index e2f9e787970d..a7bc2fe012f3 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: #endif // _SVX_TABPAGE_MAIL_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index d466d145b2ee..54fafdf2477d 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,10 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/svtreebx.hxx> -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" class SvxHyperlinkTabPageBase; //######################################################################## @@ -70,7 +69,6 @@ private: PushButton maBtApply; PushButton maBtClose; - //SvTreeListBox maLbTree; SvxHlmarkTreeLBox maLbTree; sal_Bool mbUserMoved; @@ -109,3 +107,5 @@ public: #endif // _SVX_BKWND_HYPERLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hlmarkwn_def.hxx b/cui/source/inc/hlmarkwn_def.hxx index cc1c341486ea..b6de42439f3b 100644 --- a/cui/source/inc/hlmarkwn_def.hxx +++ b/cui/source/inc/hlmarkwn_def.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 94ad06053cb4..0a3dbb237239 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,10 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper private: sal_Bool mbAccessAddress; -// String GetAllEmailNamesFromDragItem( sal_uInt16 nItem ); - protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); @@ -206,3 +204,4 @@ protected: #endif // _SVX_TABBASE_HYPERLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 502b212c8a91..2cdad5523d4f 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 6c2cb24c63fa..d0ed14387a0b 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,15 +31,13 @@ #include <vcl/tabpage.hxx> #include <vcl/msgbox.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <svtools/ivctrl.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <tools/list.hxx> #include <tools/string.hxx> +#include <vector> #define CTRLS_OFFSET 3 #define BUTTON_DISTANCE 8 @@ -54,9 +53,6 @@ class IconChoicePage; typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet); typedef sal_uInt16* (*GetPageRanges)(); // liefert internationale Which-Wert -// page-list -DECLARE_LIST( IconChoicePageList, IconChoicePageData * ) - // position of iconchoicectrl enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom }; @@ -162,7 +158,7 @@ private : friend class IconChoicePage; EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's - IconChoicePageList maPageList; // Liste von PageData-Pointer + ::std::vector< IconChoicePageData* > maPageList; // Liste von PageData-Pointer SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control @@ -220,7 +216,7 @@ protected : public : - // im Ctor könnte auch die Position des IconChoiceCtrl's gesetzt werden. + // im Ctor k�nnte auch die Position des IconChoiceCtrl's gesetzt werden. IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos = PosLeft, const SfxItemSet * pItemSet = 0 ); @@ -244,6 +240,7 @@ public : void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } void ShowPage( sal_uInt16 nId ); + void RemoveTabPage( sal_uInt16 nId ); // liefert ggf. per Map konvertierte lokale Slots const sal_uInt16* GetInputRanges( const SfxItemPool& ); @@ -268,3 +265,4 @@ public : #endif //_ICCDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index b6d8dbafd6d5..8cbc141b8b88 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <svtools/insdlg.hxx> @@ -211,3 +211,4 @@ public: #endif // _SVX_INSDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index f75ab2471923..33e8efabeb70 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,6 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/button.hxx> #include <vcl/group.hxx> #include <vcl/button.hxx> @@ -67,3 +67,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx index f5c6e919fdac..cd3205935dae 100644 --- a/cui/source/inc/internationaloptions.hxx +++ b/cui/source/inc/internationaloptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace offapp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index ac1269062721..14fbc1e82160 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,15 +31,9 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/tabdlg.hxx> class SdrView; @@ -66,7 +61,6 @@ private: CheckBox aCB_LAENGE; Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; - Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT]; String aStrHorzList; String aStrVertList; @@ -120,7 +114,6 @@ public: class SvxCaptionTabDialog : public SfxTabDialog { private: -// const SfxItemSet& rOutAttrs; const SdrView* pView; sal_uInt16 nAnchorCtrls; @@ -142,3 +135,4 @@ public: #endif //_SVX_LABDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 57cf02ec982d..e7d1d555c188 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,10 +29,6 @@ #ifndef _LINKDLG_HXX #define _LINKDLG_HXX -#ifndef _LSTBOX_HXX //autogen -#include <vcl/lstbox.hxx> -#endif - #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -132,3 +129,5 @@ public: }; #endif // _LINKDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 7ffd559680f3..51e61932cad1 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 99614fd81172..98d128310286 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,15 +36,13 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Reference.hxx> #include <svl/macitem.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; struct EventDisplayName { @@ -135,10 +134,6 @@ public: virtual ~SvxMacroAssignSingleTabDialog(); void SetTabPage( SfxTabPage* pTabPage ); - // SfxTabPage* GetTabPage() const { return pPage; } - - // OKButton* GetOKButton() const { return pOKBtn; } - // CancelButton* GetCancelButton() const { return pCancelBtn; } private: SfxViewFrame* pFrame; @@ -173,3 +168,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 87129f34c222..1d7a561301b7 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,7 +105,7 @@ public: void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; /************************************************************************* @@ -125,3 +126,4 @@ public: #endif // _SVX_MEASURE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx index 1bb4e8c85ef1..21ae9e53946e 100644 --- a/cui/source/inc/multifil.hxx +++ b/cui/source/inc/multifil.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 6e9df2f3ba04..ac4afbfceaf6 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include "radiobtnbox.hxx" @@ -87,3 +86,4 @@ public: #endif // #ifndef _SVX_MULTIPAT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index b997ddab1efc..82432585851e 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif // _SVX_NEWTABLEDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index bc9fe65eaf48..2e9d51d8d45f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,13 +42,6 @@ #include <svx/langbox.hxx> #include <svx/fontlb.hxx> -//CHINA001 #define SVX_NUMVAL_STANDARD -1234.12345678901234 -//CHINA001 #define SVX_NUMVAL_CURRENCY -1234 -//CHINA001 #define SVX_NUMVAL_PERCENT -0.1295 -//CHINA001 #define SVX_NUMVAL_TIME 36525.5678935185 -//CHINA001 #define SVX_NUMVAL_DATE 36525.5678935185 -//CHINA001 #define SVX_NUMVAL_BOOLEAN 1 - //------------------------------------------------------------------------ class SvxNumberFormatShell; @@ -76,7 +70,6 @@ public: }; // ----------------------------------------------------------------------- - #include <sfx2/layout.hxx> #include <layout/layout-pre.hxx> @@ -87,8 +80,11 @@ class SvxNumberFormatTabPage : public SfxTabPage public: ~SvxNumberFormatTabPage(); -#undef SfxTabPage -#define SfxTabPage ::SfxTabPage +#if ENABLE_LAYOUT +# undef SfxTabPage +# define SfxTabPage ::SfxTabPage +#endif + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); @@ -104,7 +100,7 @@ public: void SetOkHdl( const Link& rOkHandler ); void HideLanguage(sal_Bool nFlag=sal_True); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); private: SvxNumberFormatTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); @@ -185,3 +181,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index f2a551a247b6..9604f22d7dde 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> -#ifndef _SVX_NUMDEF_HXX #include <editeng/numdef.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svl/svarray.hxx> @@ -50,9 +49,8 @@ class ValueSet; class SvxNumberingPreview; class SvxBrushItem; -/*-----------------13.02.97 14.02------------------- ---------------------------------------------------*/ +//------------------------------------------------ struct SvxNumSettings_Impl { @@ -71,9 +69,8 @@ struct SvxNumSettings_Impl typedef SvxNumSettings_Impl* SvxNumSettings_ImplPtr; SV_DECL_PTRARR_DEL(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr,8,4) -/*-----------------07.02.97 11.36------------------- ---------------------------------------------------*/ +//------------------------------------------------ class SvxSingleNumPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -111,9 +108,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; -/*-----------------07.02.97 11.36------------------- ---------------------------------------------------*/ +//------------------------------------------------ class SvxBulletPickTabPage : public SfxTabPage { @@ -147,10 +143,10 @@ class SvxBulletPickTabPage : public SfxTabPage virtual void Reset( const SfxItemSet& rSet ); void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; -/*-----------------07.02.97 11.36------------------- +/*-------------------------------------------------- TabPage fuer vollstaendig Numerierung --------------------------------------------------*/ #define NUMTYPE_MEMBER 4 // Anzahl der Elemente des FormatStrings je Ebene @@ -195,12 +191,11 @@ class SvxNumPickTabPage : public SfxTabPage void SetCharFmtNames(const String& rCharName, const String& rBulName) { sNumCharFmtName = rCharName; sBulletCharFmtName = rBulName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; -/*-----------------12.02.97 07.42------------------- ---------------------------------------------------*/ +//------------------------------------------------ class SvxBitmapPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -243,9 +238,7 @@ class SvxBitmapPickTabPage : public SfxTabPage void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; -/*-----------------01.12.97 16:13------------------- - ---------------------------------------------------*/ +//------------------------------------------------ class SvxNumOptionsTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -351,7 +344,6 @@ class SvxNumOptionsTabPage : public SfxTabPage virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); -//??? void SetWrtShell(SwWrtShell* pSh); void SetCharFmts(const String& rNumName, const String& rBulletName ) { sNumCharFmtName = rNumName; @@ -361,12 +353,10 @@ class SvxNumOptionsTabPage : public SfxTabPage ListBox& GetCharFmtListBox() {return aCharFmtLB;} void SetModified(sal_Bool bRepaint = sal_True); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; -/*-----------------03.12.97 10:18------------------- - ---------------------------------------------------*/ +//------------------------------------------------ class SvxNumPositionTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -376,7 +366,6 @@ class SvxNumPositionTabPage : public SfxTabPage FixedText aLevelFT; MultiListBox aLevelLB; - // --> OD 2008-01-11 #newlistlevelattrs# // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION FixedText aDistBorderFT; @@ -388,9 +377,7 @@ class SvxNumPositionTabPage : public SfxTabPage MetricField aDistNumMF; FixedText aAlignFT; ListBox aAlignLB; - // <-- - // --> OD 2008-01-10 #newlistlevelattrs# // new set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT FixedText aLabelFollowedByFT; @@ -403,7 +390,6 @@ class SvxNumPositionTabPage : public SfxTabPage MetricField aAlignedAtMF; FixedText aIndentAtFT; MetricField aIndentAtMF; - // <-- PushButton aStandardPB; @@ -422,9 +408,7 @@ class SvxNumPositionTabPage : public SfxTabPage sal_Bool bModified : 1; sal_Bool bPreset : 1; sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein - // --> OD 2008-01-11 #newlistlevelattrs# bool bLabelAlignmentPosAndSpaceModeActive; - // <-- void InitControls(); @@ -434,7 +418,6 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( RelativeHdl_Impl, CheckBox * ); DECL_LINK( StandardHdl_Impl, PushButton * ); - // --> OD 2008-01-11 #newlistlevelattrs# void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); @@ -442,7 +425,6 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( ListtabPosHdl_Impl, MetricField* ); DECL_LINK( AlignAtHdl_Impl, MetricField* ); DECL_LINK( IndentAtHdl_Impl, MetricField* ); - // <-- public: SvxNumPositionTabPage(Window* pParent, @@ -459,7 +441,7 @@ public: void SetMetric(FieldUnit eSet); void SetModified(sal_Bool bRepaint = sal_True); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; #endif @@ -467,3 +449,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 6c18568b6292..c526d23420a1 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> @@ -79,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 295483f042e0..07d6308b534b 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/combobox.hxx> #include <vcl/timer.hxx> @@ -186,3 +185,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index c827417b669c..0666c78df0bd 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 26111e4bd0b0..3a13365397d0 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index e73f390ad2f3..2f9a428b9d37 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,8 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #ifdef _SVX_OPTPATH_CXX #include <svtools/headbar.hxx> @@ -44,9 +41,7 @@ class HeaderBar; #endif #include "ControlFocusHelper.hxx" -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif #include <svtools/dialogclosedlistener.hxx> // forward --------------------------------------------------------------- @@ -114,3 +109,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 87d02d36f860..289dac171671 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,15 +41,6 @@ #include <i18npool/paper.hxx> #include <svx/flagsdef.hxx> -// enum ------------------------------------------------------------------ - -//CHINA001 enum SvxModeType -//CHINA001 { -//CHINA001 SVX_PAGE_MODE_STANDARD, -//CHINA001 SVX_PAGE_MODE_CENTER, -//CHINA001 SVX_PAGE_MODE_PRESENTATION -//CHINA001 }; - // class SvxPageDescPage ------------------------------------------------- /* {k:\svx\prototyp\dialog\page.bmp} @@ -166,7 +158,7 @@ class SvxPageDescPage : public SfxTabPage Size aMaxSize; sal_Bool bLandscape; - FASTBOOL bBorderModified; + bool bBorderModified; SvxModeType eMode; Paper ePaperStart; Paper ePaperEnd; @@ -178,7 +170,7 @@ class SvxPageDescPage : public SfxTabPage DECL_LINK( LayoutHdl_Impl, ListBox* ); DECL_LINK( PaperBinHdl_Impl, ListBox* ); DECL_LINK( SwapOrientation_Impl, RadioButton* ); - void SwapFirstValues_Impl( FASTBOOL bSet ); + void SwapFirstValues_Impl( bool bSet ); DECL_LINK( BorderModify_Impl, MetricField* ); void InitHeadFoot_Impl( const SfxItemSet& rSet ); DECL_LINK( CenterHdl_Impl, CheckBox* ); @@ -231,8 +223,9 @@ public: { ePaperStart = eStart, ePaperEnd = eEnd; } void SetCollectionList(const List* pList); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; #endif // #ifndef _SVX_PAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 7f7eae0c2641..6332e2e41b7e 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,12 +39,6 @@ #include <vcl/lstbox.hxx> #include <svx/flagsdef.hxx> -// define ---------------------------------------------------------------- - -// 1/2 cm in TWIPS -// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt -//CHINA001 #define MM50 283 - // forward --------------------------------------------------------------- class SvxLineSpacingItem; @@ -140,7 +135,7 @@ public: void EnableAutoFirstLine(); void EnableAbsLineDist(long nMinTwip); void EnableNegativeMode(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; // class SvxParaAlignTabPage ------------------------------------------------ @@ -195,7 +190,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); void EnableJustifyExt(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; // class SvxExtParagraphTabPage ------------------------------------------ @@ -241,10 +236,8 @@ private: TriStateBox aHyphenBox; FixedText aBeforeText; NumericField aExtHyphenBeforeBox; -// FixedText aHyphenBeforeLabel; FixedText aAfterText; NumericField aExtHyphenAfterBox; -// FixedText aHyphenAfterLabel; FixedText aMaxHyphenLabel; NumericField aMaxHyphenEdit; @@ -289,11 +282,10 @@ private: DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; -/* -----------------------------29.11.00 11:33-------------------------------- - ---------------------------------------------------------------------------*/ +//-------------------------------------------------------------------------- class SvxAsianTabPage : public SfxTabPage { FixedLine aOptionsFL; @@ -324,3 +316,4 @@ public: #endif // #ifndef _SVX_PARAGRPH_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 337c9b84da11..27e964c5b28a 100755..100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 2568ab9b2b5e..1e27ce912e80 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _PASTEDLG_HXX #define _PASTEDLG_HXX -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <sot/formats.hxx> #include <tools/globname.hxx> #include <svtools/transfer.hxx> @@ -93,3 +92,5 @@ public: }; #endif // _PASTEDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 8dedd612d27e..651b5328e460 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,15 +30,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> #include <sfx2/basedlgs.hxx> #include <svtools/svmedit.hxx> @@ -124,3 +119,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 0aadf6817d18..0a67dcf9fd95 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ public: #endif // #ifndef _SVX_RADIOBTNBOX_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 579a3756c447..a4350685cba9 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,16 +44,10 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #define OBJTYPE_BASICMANAGER 1L -//#define OBJTYPE_LIB 2L -//#define OBJTYPE_MODULE 3L #define OBJTYPE_METHOD 2L -//#define OBJTYPE_METHODINOBJ 5L -//#define OBJTYPE_OBJECT 6L -//#define OBJTYPE_SUBOBJ 7L -//#define OBJTYPE_PROPERTY 8L #define OBJTYPE_SCRIPTCONTAINER 3L #define OBJTYPE_SFROOT 4L @@ -66,7 +61,7 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , +typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::OUString , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; class SFEntry; @@ -77,13 +72,9 @@ class SFTreeListBox : public SvTreeListBox private: sal_uInt16 nMode; Image m_hdImage; - Image m_hdImage_hc; Image m_libImage; - Image m_libImage_hc; Image m_macImage; - Image m_macImage_hc; Image m_docImage; - Image m_docImage_hc; ::rtl::OUString m_sMyMacros; ::rtl::OUString m_sProdMacros; @@ -194,6 +185,7 @@ protected: sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); + void createEntry( SvLBoxEntry* pEntry ); void renameEntry( SvLBoxEntry* pEntry ); void deleteEntry( SvLBoxEntry* pEntry ); @@ -203,7 +195,6 @@ protected: String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); - //String GetInfo( SbxVariable* pVar ); public: // prob need another arg in the ctor @@ -213,7 +204,6 @@ public: virtual short Execute(); - //DECL_LINK( ActivatePageHdl, TabControl * ); }; class SvxScriptErrorDialog : public VclAbstractDialog @@ -235,3 +225,5 @@ public: }; #endif // _SCRIPTDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 6fea545823b0..d830d92d2744 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ public: #endif // _SVX_FORMAT_CELLS_DLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index c59aa535c0d2..2959b0e7bfb6 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,17 +145,21 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox < ::com::sun::star::container::XNameAccess > m_xModuleCommands; Image m_hdImage; - Image m_hdImage_hc; Image m_libImage; - Image m_libImage_hc; Image m_macImage; - Image m_macImage_hc; Image m_docImage; - Image m_docImage_hc; ::rtl::OUString m_sMyMacros; ::rtl::OUString m_sProdMacros; - Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); + Image GetImage( + ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, + bool bIsRootNode + ); + + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, + ::rtl::OUString& docName + ); private: void fillScriptList( @@ -238,3 +243,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index cdb5a2f89eea..cb0dd228daba 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> @@ -64,3 +63,4 @@ protected: #endif // _SVX_SHOWCOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index b9aa0a030d20..497a0c3afed9 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 200a7272d387..72457dd9869f 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index f195ccdc9ea6..7fff39c09611 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,22 +43,6 @@ class TabWin_Impl; -// define ---------------------------------------------------------------- - -// Bitfelder f"ur DisableControls() -//CHINA001 #define TABTYPE_LEFT 0x0001 -//CHINA001 #define TABTYPE_RIGHT 0x0002 -//CHINA001 #define TABTYPE_CENTER 0x0004 -//CHINA001 #define TABTYPE_DEZIMAL 0x0008 -//CHINA001 #define TABTYPE_ALL 0x000F -//CHINA001 -//CHINA001 #define TABFILL_NONE 0x0010 -//CHINA001 #define TABFILL_POINT 0x0020 -//CHINA001 #define TABFILL_DASHLINE 0x0040 -//CHINA001 #define TABFILL_SOLIDLINE 0x0080 -//CHINA001 #define TABFILL_SPECIAL 0x0100 -//CHINA001 #define TABFILL_ALL 0x01F0 - // class SvxTabulatorTabPage --------------------------------------------- /* {k:\svx\prototyp\dialog\tabstop.bmp} @@ -150,9 +135,10 @@ private: DECL_LINK( GetFillCharHdl_Impl, Edit* ); DECL_LINK( GetDezCharHdl_Impl, Edit* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; #endif // #ifndef _SVX_TABSTPGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 3c028d0949d1..92bb1b32d749 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,6 @@ private: FixedLine aFlEffect; FixedText aFtEffects; ListBox aLbEffect; - //ValueSet aCtlEffect; FixedText aFtDirection; ImageButton aBtnUp; ImageButton aBtnLeft; @@ -126,3 +126,4 @@ public: #endif // _SVX_TEXTANIM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 2716abcfb043..acecce5c3ed5 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,9 @@ #include <svx/dlgctrl.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SdrView; @@ -98,7 +95,6 @@ private: bool IsTextDirectionLeftToRight (void) const; public: - SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxTextAttrPage(); @@ -112,24 +108,9 @@ public: void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); }; -/************************************************************************* -|* -|* Von SfxSingleTabDialog abgeleitet, um vom Control "uber virtuelle Methode -|* benachrichtigt werden zu k"onnen. -|* -\************************************************************************/ - -//CHINA001 class SvxTextAttrDialog : public SfxSingleTabDialog -//CHINA001 { -//CHINA001 public: -//CHINA001 SvxTextAttrDialog( Window* pParent, const SfxItemSet& rAttr, -//CHINA001 const SdrView* pView ); -//CHINA001 ~SvxTextAttrDialog(); -//CHINA001 }; - - #endif // _SVX_TEXTATTR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 99b292b560a5..8a3dc22d1715 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index b2298ddc5028..4563e013703a 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <svx/dlgctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif // #i75273# #include <basegfx/range/b2drange.hxx> @@ -150,8 +149,6 @@ private: DECL_LINK( ChangeSizeProtectHdl, void * ); DECL_LINK( ChangePosXHdl, void * ); DECL_LINK( ChangePosYHdl, void * ); -// DECL_LINK( SetAnchorHdl, ListBox * ); -// DECL_LINK( SetOrientHdl, ListBox * ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); @@ -184,7 +181,6 @@ public: void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } -// void ShowAnchorCtrls(sal_uInt16 nAnchorCtrls); // Writer-spezifische Controls anzeigen virtual void FillUserData(); void DisableResize(); @@ -264,11 +260,9 @@ private: FixedLine aFlRadius; FixedText aFtRadius; MetricField aMtrRadius; - //TriStateBox aTsbVertical; FixedLine aFlAngle; FixedText aFtAngle; MetricField aMtrAngle; - //SvxRectCtl aCtlAngle; const SfxItemSet& rOutAttrs; @@ -303,3 +297,4 @@ public: #endif // _SVX_TRANSFRM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 220968ac4534..fcf2e8b34944 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,6 @@ CreateTabPage GetSSOCreator( void ); // class OfaOptionsTreeListBox ------------------------------------------- -//!#define NUMBER_OF_OPTION_PAGES 12 class SfxModule; class SfxShell; class SfxItemSet; @@ -188,7 +188,6 @@ private: FixedImage aHelpImg; ImageList aPageImages; - ImageList aPageImagesHC; ResStringArray aHelpTextsArr; @@ -350,3 +349,4 @@ public: void SavePage(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 0d814d0e30ac..c25f888f78b1 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,32 +32,10 @@ #include <layout/layout.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> -// define ---------------------------------------------------------------- -/* CHINA001 -#define ZOOMBTN_OPTIMAL ((sal_uInt16)0x0001) -#define ZOOMBTN_PAGEWIDTH ((sal_uInt16)0x0002) -#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004) -*/ -#ifndef _SVX_ZOOM_HXX -#include "zoom_def.hxx" -#endif -// class SvxZoomDialog --------------------------------------------------- -/* - {k:\svx\prototyp\dialog\zoom.bmp} - - [Beschreibung] - Mit diesem Dialog wird ein Zoom-Faktor eingestellt. - - [Items] - SvxZoomItem <SID_ATTR_ZOOM> -*/ - #include <layout/layout-pre.hxx> class SvxZoomDialog : public SfxModalDialog @@ -112,3 +91,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 64c631266e3f..4b449a0a16e7 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/uno/Sequence.hxx> -// header for SvStream -#include <tools/stream.hxx> -// header for SAL_STATIC_CAST -#include <sal/types.h> +#include <tools/stream.hxx> // header for SvStream +#include <sal/types.h> // header for SAL_STATIC_CAST #include "cfgchart.hxx" #include <dialmgr.hxx> #include <cuires.hrc> @@ -95,13 +91,7 @@ void SvxChartColorTable::replace( size_t _nIndex, const XColorEntry & _rEntry ) DBG_ASSERT( _nIndex <= m_aColorEntries.size(), "SvxChartColorTable::replace invalid index" ); - Color aCol1 = m_aColorEntries[ _nIndex ].GetColor(), aCol2; m_aColorEntries[ _nIndex ] = _rEntry; - aCol2 = m_aColorEntries[ _nIndex ].GetColor(); - if ( aCol2 != const_cast< XColorEntry& >( _rEntry ).GetColor() ) - { - DBG_ERRORFILE( "wrong color" ); - } } void SvxChartColorTable::useDefault() @@ -170,11 +160,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Chart" )), + ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" ); + maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") ); } SvxChartOptions::~SvxChartOptions() @@ -283,12 +273,12 @@ SvxChartColorTableItem::SvxChartColorTableItem( const SvxChartColorTableItem& rO { } -SfxPoolItem* __EXPORT SvxChartColorTableItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const { return new SvxChartColorTableItem( *this ); } -int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const +int SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" ); @@ -301,7 +291,7 @@ int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) cons return 0; } -void __EXPORT SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const +void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const { if ( pOpts ) pOpts->SetDefaultColors( m_aColorTable ); @@ -322,3 +312,5 @@ void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const XColorEn { m_aColorTable.replace( _nIndex, _rEntry ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 2ca899035192..2f348c632e1d 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ private: #endif // _SVX_CFGCHART_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index c59795f33cc3..0e625d56dadd 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolconfig.hxx" #include "connpoolsettings.hxx" @@ -50,42 +48,42 @@ namespace offapp //-------------------------------------------------------------------- static const ::rtl::OUString& getConnectionPoolNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/ConnectionPool"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ConnectionPool") ); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getEnablePoolingNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("EnablePooling"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("EnablePooling")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getDriverSettingsNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverSettings"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverSettings")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getDriverNameNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverName"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverName")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getEnableNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Enable"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Enable")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getTimeoutNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Timeout")); return s_sNodeName; } @@ -221,3 +219,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx index fc7e47693202..f834f2e90f03 100644 --- a/cui/source/options/connpoolconfig.hxx +++ b/cui/source/options/connpoolconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLCONFIG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 451b28af785d..988d8574c75a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpooloptions.hxx" #include "connpooloptions.hrc" #include <svtools/editbrowsebox.hxx> @@ -106,7 +104,6 @@ namespace offapp //-------------------------------------------------------------------- DriverListControl::DriverListControl( Window* _pParent, const ResId& _rId) -// :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS) :DriverListControl_Base(_pParent, _rId, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(ResId(STR_YES,*_rId.GetResMgr())) @@ -505,3 +502,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index c2458cc08450..da749ca5df93 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLOPTIONS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index ae01a4f08f27..e8ed445374d1 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolsettings.hxx" //........................................................................ @@ -67,7 +65,7 @@ namespace offapp //==================================================================== TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) //-------------------------------------------------------------------- - DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ) + DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) :SfxPoolItem(_nId) ,m_aSettings(_rSettings) { @@ -111,3 +109,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 4a835d15a728..f39eca8cae24 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,7 +91,7 @@ namespace offapp public: TYPEINFO(); - DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ); + DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -105,3 +106,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLSETTINGS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 93b9247366c1..c1f73e4a9e5e 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> @@ -92,3 +90,6 @@ sal_Int32 SvxJSearchOptionsDialog::GetTransliterationFlags() const { return pPage->GetTransliterationFlags(); } + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index b8892ffcbd3f..8c8562527c51 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,11 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregister.hxx" #include "dbregister.hrc" #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #include <svl/filenotation.hxx> -#include <cuires.hrc> #include "helpid.hrc" #include <svtools/editbrowsebox.hxx> #include <cuires.hrc> @@ -412,8 +409,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co SvLBoxEntry* pEntry = NULL; if ( _bReadOnly ) { - sal_Bool bHighContrast = pPathBox->GetDisplayBackground().GetColor().IsDark(); - Image aLocked( CUI_RES( bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ) ); + Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) ); pEntry = pPathBox->InsertEntry( aStr, aLocked, aLocked ); } else @@ -468,3 +464,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 38b9897ad4e9..bb935779f273 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "connpooloptions.hxx" #include "dbregisterednamesconfig.hxx" #include "dbregistersettings.hxx" @@ -133,10 +132,12 @@ namespace svx } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + //DBG_UNHANDLED_EXCEPTION(); } } //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index ce248d681f4a..8bda35b4f0d1 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ namespace svx #endif // SVX_DBREGISTEREDNAMESCONFIG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index b125925afc3a..080cd5e9e987 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregistersettings.hxx" #include <rtl/ustring.hxx> @@ -74,3 +72,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 35d2acccdd6a..4b096ecf4543 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,4 @@ namespace svx //........................................................................ #endif // SVX_DBREGISTERSETTING_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 03341a7bfff0..d4f7c84c284d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "doclinkdialog.hxx" #include "doclinkdialog.hrc" #include <cuires.hrc> @@ -82,7 +80,6 @@ namespace svx validate(); - // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); m_aURL.SetDropDownLineCount( 5 ); } @@ -222,3 +219,4 @@ namespace svx } // namespace svx //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 7cdd536a901d..044fba2d37d4 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/inettbc.hxx> #include <svtools/urlcontrol.hxx> @@ -91,3 +90,4 @@ namespace svx #endif // _SVX_DOCLINKDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e252e5763cf8..87a150288035 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <tools/shl.hxx> #include <svtools/ctrltool.hxx> #include <vcl/svapp.hxx> @@ -136,7 +135,6 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, sHeader += sHeader3; sHeader += sTabSpace; sHeader += sHeader4; -// sHeader += sTabSpace; aCheckLB.InsertHeaderEntry(sHeader); HeaderBar* pBar = aCheckLB.GetTheHeaderBar(); @@ -376,9 +374,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) return 0; } -/* -----------------------------29.08.2002 11:47------------------------------ - ---------------------------------------------------------------------------*/ +//-------------------------------------------------------------------------- IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) { String sFontName = aFontNameLB.GetSelectEntry(); @@ -396,9 +393,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) aFontNameLB.SelectEntry(sFontName); return 0; } -/*********************************************************************/ -/* */ -/*********************************************************************/ void SvxFontSubstTabPage::CheckEnable() { @@ -414,14 +408,6 @@ void SvxFontSubstTabPage::CheckEnable() sEntry += '\t'; sEntry += aFont2CB.GetText(); -/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || - aFont1CB.GetText() == aFont2CB.GetText() || - aCheckLB.GetEntryPos(sEntry) != 0xffffffff || - (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0)) - bApply = sal_False; - else - bApply = sal_True;*/ - // Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher: if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len()) bApply = sal_False; @@ -467,10 +453,6 @@ void SvxFontSubstTabPage::CheckEnable() aFont2CB.Enable(bEnableAll); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::SetTabs() { SvxSimpleTable::SetTabs(); @@ -484,9 +466,7 @@ void SvxFontSubstCheckListBox::SetTabs() pTab->nFlags &= ~nAdjust; pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; } -/* -----------------------------22.05.2002 11:06------------------------------ - ---------------------------------------------------------------------------*/ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -514,10 +494,6 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput(rKEvt); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) { if ( nPos < GetEntryCount() ) @@ -528,10 +504,6 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) { if ( pEntry ) @@ -542,28 +514,16 @@ void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) { return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -/*********************************************************************/ -/* */ -/*********************************************************************/ - sal_Bool SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -589,10 +549,6 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uIn } } -/*********************************************************************/ -/* */ -/*********************************************************************/ - SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; @@ -609,3 +565,4 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc index e23bcf2365a3..bb6386c37223 100644 --- a/cui/source/options/fontsubs.hrc +++ b/cui/source/options/fontsubs.hrc @@ -39,7 +39,6 @@ #define TBX_SUBSTNEWDEL 6 #define BT_SUBSTAPPLY 7 #define BT_SUBSTDELETE 8 -//#define BT_SUBSTINFO 9 #define STR_HEADER1 10 #define STR_HEADER2 11 @@ -58,5 +57,3 @@ #define STR_AUTOMATIC 28 #endif - - diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 91c6f1a73801..bfd30c36d23e 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,14 +122,4 @@ public: #endif // _SVX_FONT_SUBSTITUTION_HXX - - - - - - - - - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 034874388369..c0fdfff13bab 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -36,10 +36,6 @@ /**************************************************************************/ -/* */ -/* */ -/* */ -/**************************************************************************/ TabPage RID_SVX_FONT_SUBSTITUTION { diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 57458759c9eb..bba058cdcd92 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "internationaloptions.hxx" #include "internationaloptions.hrc" #include <svl/eitem.hxx> @@ -98,11 +96,6 @@ namespace offapp m_aRB_TxtDirLeft2Right.IsChecked() ), SID_ATTR_PARA_LEFT_TO_RIGHT ); - // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// } - return sal_True; } @@ -116,13 +109,6 @@ namespace offapp sal_Bool bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : sal_True; m_aRB_TxtDirLeft2Right.Check( bLeft2Right ); - // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// m_aCB_ShtVwRight2Left.Check( sal_False ); -// -// m_aCB_ShtVwCurrentDocOnly.Check( sal_False ); -// } } InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) : @@ -141,7 +127,6 @@ namespace offapp SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ) { InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); -// p->m_pImpl->EnableOption_SheetView(); return p; } @@ -160,5 +145,6 @@ namespace offapp m_pImpl->Reset( _rSet ); } -} // /namespace offapp +} // namespace offapp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index b4caafc0feea..16509bf5d920 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -85,24 +85,3 @@ TabPage RID_OFA_TP_INTERNATIONAL Text [ en-US ] = "~Current document only"; }; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 5fd13b6bb623..64a7f49ca096 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,10 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "optHeaderTabListbox.hxx" #include <vcl/svapp.hxx> #include <svtools/headbar.hxx> - namespace svx { // class OptLBoxString_Impl ---------------------------------------------- @@ -85,3 +82,5 @@ void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, } } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index 06176ec1db9f..30c0fe9ddde8 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ namespace svx } // svx #endif // SVX_OPTHEADERTABLISTBOX_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 3be5e2a8d927..275306b93acc 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optaccessibility.hxx> #include <optaccessibility.hrc> #include <dialmgr.hxx> @@ -161,7 +159,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) m_aAnimatedGraphics.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() ); m_aAnimatedTexts.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() ); m_aAutomaticFontColor.Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() ); -// m_aSystemFont.Check( m_pImpl->m_aConfig.GetIsSystemFont() ); m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() ); m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() ); @@ -183,3 +180,5 @@ void SvxAccessibilityOptionsTabPage::EnableTipHelp(sal_Bool bCheck) m_aTipHelpCB.Check(bCheck); m_aTipHelpNF.Enable(bCheck); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc index 35c02cc3e756..6cc5e0a891d1 100644 --- a/cui/source/options/optaccessibility.hrc +++ b/cui/source/options/optaccessibility.hrc @@ -64,8 +64,6 @@ #define DIFF(v1,v2) (v2-v1) #define SUM(v1,v2) (v2+v1) -// - #define FL_MISCELLANEOUS 1 #define CB_PAGE_PREVIEWS 2 #define FL_HC_OPTIONS 3 diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index f816962f46b1..83a42cf7ed6f 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index a9a5ad16869d..33849798347e 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -134,28 +134,3 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG Text [ en-US ] = "~Use system colors for page previews"; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index fb4c6e2e1352..d345cf8a7a88 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optasian.hxx> #include <editeng/langitem.hxx> #include <editeng/unolingu.hxx> @@ -91,9 +89,7 @@ struct SvxAsianLayoutPage_Impl SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() { for( SvxForbiddenChars_Impl* pDel = First(); pDel; pDel = Next() ) @@ -102,16 +98,12 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() delete pDel; } } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return 0 != aChangedLanguagesTbl.Get(eLang); } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang) { SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang); @@ -120,9 +112,7 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language return pImp; return 0; } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( LanguageType eLang, ForbiddenCharacters* pForbidden) { @@ -142,9 +132,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( } } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : @@ -177,23 +165,17 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, sal_False, sal_False ); } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianLayoutPage::~SvxAsianLayoutPage() { delete pImpl; } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAsianLayoutPage(pParent, rAttrSet); } -/*-- 09.01.01 13:29:03--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) { if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue()) @@ -243,16 +225,14 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); return sal_False; } -/*-- 09.01.01 13:29:03--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); @@ -339,9 +319,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) aLanguageLB.SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters ); LanguageHdl(&aLanguageLB); } -/* -----------------------------17.01.01 11:02-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) { //set current value @@ -381,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } } @@ -407,9 +385,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) return 0; } -/* -----------------------------17.01.01 11:02-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) { sal_Bool bCheck = pBox->IsChecked(); @@ -421,9 +397,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) ModifyHdl(&aStartED); return 0; } -/* -----------------------------17.01.01 12:26-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) { Locale aLocale; @@ -441,27 +415,25 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) ForbiddenCharacters aSet; aSet.beginLine = sStart; aSet.endLine = sEnd; -// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); pImpl->addForbiddenCharacters(eSelectLanguage, &aSet); } else pImpl->addForbiddenCharacters(eSelectLanguage, 0); -// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); return 0; } -/*-- 07.09.2007 12:05:09--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxAsianLayoutPage::GetRanges() { //no items are used static sal_uInt16 pAsianLayoutRanges[] = { 0 }; return pAsianLayoutRanges; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index d9c81f5b9a6a..fee1826704b5 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -145,39 +145,3 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; Text [ en-US ] = "Proxy"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index cfec52f07a59..ec1aa4bc7960 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <unotools/pathoptions.hxx> #include <cuires.hrc> #include "optchart.hxx" @@ -118,12 +117,12 @@ void SvxDefaultColorOptPage::Construct() } -SfxTabPage* __EXPORT SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs ) +SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs ) { return new SvxDefaultColorOptPage( pParent, rAttrs ); } -sal_Bool __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) +sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( pColorConfig ) rOutAttrs.Put( *SAL_STATIC_CAST( SfxPoolItem*, pColorConfig )); @@ -131,7 +130,7 @@ sal_Bool __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) return sal_True; } -void __EXPORT SvxDefaultColorOptPage::Reset( const SfxItemSet& ) +void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) { aLbChartColors.SelectEntryPos( 0 ); ListClickedHdl( &aLbChartColors ); @@ -234,3 +233,4 @@ IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG ) return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 969736079347..d3f1b38a88f4 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ // header for ColorLB #include <svx/dlgctrl.hxx> // header for PushButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for XColorTable #include <svx/xtable.hxx> @@ -87,3 +86,4 @@ public: #endif // _SVX_OPTCHART_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 6105391a72fe..7180cd6b241c 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> @@ -148,10 +146,6 @@ const char* aColorCBHids[] = HID_COLORPAGE_BASICERROR_CB }; -/* -----------------------------2002/06/26 10:48------------------------------ - - ---------------------------------------------------------------------------*/ - class SvxExtFixedText_Impl : public FixedText { private: @@ -168,9 +162,6 @@ public: inline void SetGroupHeight( long _nHeight ) { m_nGroupHeight = _nHeight; } }; -/* -----------------------------25.03.2002 15:48------------------------------ - - ---------------------------------------------------------------------------*/ class ColorConfigCtrl_Impl; class ColorConfigWindow_Impl : public Window { @@ -207,6 +198,9 @@ class ColorConfigWindow_Impl : public Window FixedText aSmarttagsFT; ColorListBox aSmarttagsLB; Window aSmarttagsWN; + CheckBox aShadowColorCB; + ColorListBox aShadowColorLB; + Window aShadowColorWN; Window aWriterBackWN; SvxExtFixedText_Impl aWriterFT; FixedText aWrtTextGridFT; @@ -337,6 +331,9 @@ class ColorConfigWindow_Impl : public Window virtual void Command( const CommandEvent& rCEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); + // calculate position behind last chapter + sal_Int32 impl_getPosBehindLastChapter() const; + public: ColorConfigWindow_Impl(Window* pParent, const ResId& rResId); ~ColorConfigWindow_Impl(); @@ -399,6 +396,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) case ANCHOR : case SPELL : case SMARTTAGS : + case SHADOWCOLOR : { nRet = GROUP_GENERAL; break; @@ -472,9 +470,6 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) return nRet; } -/* -----------------------------25.03.2002 17:05------------------------------ - - ---------------------------------------------------------------------------*/ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) : Window(pParent, rResId), aGeneralBackWN(this), @@ -509,6 +504,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aSmarttagsFT(this, ResId( FT_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsLB(this, ResId( LB_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsWN(this, ResId( WN_SMARTTAGS, *rResId.GetResMgr() )), + aShadowColorCB(this, ResId( CB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorLB(this, ResId( LB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorWN(this, ResId( WN_SHADOWCOLOR, *rResId.GetResMgr())), aWriterBackWN(this), aWriterFT(this, ResId(FT_WRITER, *rResId.GetResMgr())), aWrtTextGridFT(this, ResId( FT_WRITERTEXTGRID, *rResId.GetResMgr())), @@ -646,6 +644,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aCheckBoxes[LINKSVISITED ] = &aLinksVisitedCB ; aFixedTexts[SPELL ]=& aSpellFT; aFixedTexts[SMARTTAGS ]=& aSmarttagsFT; + aCheckBoxes[SHADOWCOLOR ]=& aShadowColorCB; aFixedTexts[WRITERTEXTGRID ]=& aWrtTextGridFT; aCheckBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldCB ; aCheckBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackCB ; @@ -691,6 +690,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aColorBoxes[LINKSVISITED ] = &aLinksVisitedLB ; aColorBoxes[SPELL ] = &aSpellLB ; aColorBoxes[SMARTTAGS ] = &aSmarttagsLB ; + aColorBoxes[SHADOWCOLOR ] = &aShadowColorLB ; aColorBoxes[WRITERTEXTGRID ] = &aWrtTextGridLB ; aColorBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldLB ; aColorBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackLB ; @@ -736,6 +736,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aWindows[LINKSVISITED ] = &aLinksVisitedWN ; aWindows[SPELL ] = &aSpellWN ; aWindows[SMARTTAGS ] = &aSmarttagsWN ; + aWindows[SHADOWCOLOR ] = &aShadowColorWN ; aWindows[WRITERTEXTGRID ] = &aWrtTextGridWN ; aWindows[WRITERFIELDSHADINGS ] = &aWrtFieldWN ; aWindows[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackWN ; @@ -785,20 +786,18 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aChapters[GROUP_CALC ]->SetGroupHeight( aChapters[GROUP_DRAW]->GetPosPixel().Y() - aChapters[GROUP_CALC]->GetPosPixel().Y() ); aChapters[GROUP_DRAW ]->SetGroupHeight( aChapters[GROUP_BASIC]->GetPosPixel().Y() - aChapters[GROUP_DRAW]->GetPosPixel().Y() ); aChapters[GROUP_BASIC ]->SetGroupHeight( aChapters[GROUP_SQL]->GetPosPixel().Y() - aChapters[GROUP_BASIC]->GetPosPixel().Y() ); + aChapters[GROUP_SQL]->SetGroupHeight(impl_getPosBehindLastChapter() + - aChapters[GROUP_SQL]->GetPosPixel().Y()); ExtendedColorConfig aExtConfig; sal_Int32 nExtCount = aExtConfig.GetComponentCount(); if ( nExtCount ) { - // calculate position behind last chapter - sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height(); - nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + const sal_Int32 nLastY(impl_getPosBehindLastChapter()); // to calculate the number of lines sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height(); sal_Int32 nLineNum = nLastY / nHeight; - Point aFixedPos = LogicToPixel( Point( _FT_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); - Point aLBPos = LogicToPixel( Point( _LB_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); Size aFixedSize = LogicToPixel( Size( _FT_WIDTH , _FT_HEIGHT ), MAP_APPFONT ); Size aLBSize = LogicToPixel( Size( _LB_WIDTH , _LB_HEIGHT ), MAP_APPFONT ); Size aWinSize = LogicToPixel( Size( _WN_WIDTH , _WN_HEIGHT ), MAP_APPFONT ); @@ -956,9 +955,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe } } } -/* -----------------------------27.03.2002 11:04------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigWindow_Impl::~ColorConfigWindow_Impl() { aChapters.clear(); @@ -978,9 +975,15 @@ ColorConfigWindow_Impl::~ColorConfigWindow_Impl() aChapterWins.clear(); ::std::vector< Window*>().swap(aChapterWins); } -/* -----------------------------2002/06/20 12:48------------------------------ - ---------------------------------------------------------------------------*/ +sal_Int32 +ColorConfigWindow_Impl::impl_getPosBehindLastChapter() const +{ + sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height(); + nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + return nLastY; +} + void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -997,9 +1000,7 @@ void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) SetBackground(Wallpaper(rStyleSettings.GetWindowColor())); } } -/* -----------------------------2002/06/26 10:49------------------------------ - ---------------------------------------------------------------------------*/ void SvxExtFixedText_Impl::DataChanged(const DataChangedEvent& rDCEvt) { FixedText::DataChanged(rDCEvt); @@ -1038,16 +1039,11 @@ void ColorConfigWindow_Impl::SetNewPosition( sal_Int32 _nFeature, Window* _pWin } } -/* -----------------------------08.04.2002 17:10------------------------------ - - ---------------------------------------------------------------------------*/ void ColorConfigWindow_Impl::Command( const CommandEvent& rCEvt ) { GetParent()->Command(rCEvt); } -/* -----------------------------25.03.2002 10:44------------------------------ - ---------------------------------------------------------------------------*/ class ColorConfigCtrl_Impl : public Control { HeaderBar aHeaderHB; @@ -1086,9 +1082,7 @@ public: ScrollHdl(&aVScroll); } }; -/* -----------------------------25.03.2002 17:09------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( Window* pParent, const ResId& rResId) : Control(pParent, rResId), @@ -1179,15 +1173,11 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( } } } -/* -----------------------------27.03.2002 10:46------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() { } -/* -----------------------------25.03.2002 17:19------------------------------ - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::Update() { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1252,10 +1242,8 @@ void ColorConfigCtrl_Impl::Update() } } } -/* -----------------------------26.03.2002 12:55------------------------------ - ---------------------------------------------------------------------------*/ -sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, bool _bShow) +sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, sal_Bool _bShow) { sal_Bool bHide = sal_True; if(pWindow) @@ -1286,12 +1274,14 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) continue; Point aPos; //controls outside of the view need to be hidden to speed up accessibility tools - bool bShowCtrl = ( lcl_isGroupVisible( + sal_Bool bShowCtrl = ( lcl_isGroupVisible( lcl_getGroup(i), aScrollWindow.GetModuleOptions() ) != sal_False ); - lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl); - lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl); - lcl_MoveAndShow(aScrollWindow.aWindows[i] , nOffset, nWindowHeight, bShowCtrl); - sal_Bool bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl); + // if any of the items on the current line is visible, the + // whole line should be visible + sal_Bool bShow(lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl)); + bShow = lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl) || bShow; + bShow = lcl_MoveAndShow(aScrollWindow.aWindows[i] , nOffset, nWindowHeight, bShowCtrl) || bShow; + bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl) || bShow; if(bShow) { if(nFirstVisible == -1) @@ -1303,7 +1293,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) //show the one prior to the first visible and the first after the last visble control //to enable KEY_TAB travelling - if(nFirstVisible) + if(nFirstVisible > 0) { //skip gaps where no controls exist for the related ColorConfigEntry do @@ -1348,9 +1338,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) aScrollWindow.SetUpdateMode(sal_True); return 0; } -/* -----------------------------29.04.2002 17:02------------------------------ - ---------------------------------------------------------------------------*/ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType() == EVENT_COMMAND) @@ -1365,9 +1353,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) } return Control::PreNotify(rNEvt); } -/* -----------------------------08.04.2002 16:37------------------------------ - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt ) { switch ( rCEvt.GetCommand() ) @@ -1389,9 +1375,6 @@ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt ) } } -/* -----------------------------14.12.2005 12:37------------------------------ - - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1403,10 +1386,6 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } - -/* -----------------------------27.03.2002 11:43------------------------------ - - ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1422,12 +1401,10 @@ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) pColorConfig->SetColorValue(ColorConfigEntry(i), aBoundCol); break; } - } // for( sal_Int32 i = 0; i < ColorConfigEntryCount; i++ ) + } return 0; } -/* -----------------------------27.03.2002 11:43------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1518,9 +1495,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) } return 0; }; -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SvxColorOptionsTabPage::SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ), @@ -1541,9 +1516,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( aSaveSchemePB.SetClickHdl(aLk); aDeleteSchemePB.SetClickHdl(aLk); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() { //when the dialog is cancelled but the color scheme ListBox has been changed these @@ -1565,16 +1538,12 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() pExtColorConfig->EnableBroadcast(); delete pExtColorConfig; } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) ); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) { bFillItemSetCalled = sal_True; @@ -1589,9 +1558,7 @@ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) pExtColorConfig->Commit(); return sal_True; } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) { if(pColorConfig) @@ -1625,26 +1592,20 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) aDeleteSchemePB.Enable( aSchemes.getLength() > 1 ); UpdateColorConfig(); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( *_pSet ); return( LEAVE_PAGE ); } -/* -----------------------------25.03.2002 15:32------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::UpdateColorConfig() { //update the color config control pColorConfigCT->Update(); } -/* -----------------------------25.03.2002 15:30------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox) { pColorConfig->LoadScheme(pBox->GetSelectEntry()); @@ -1652,37 +1613,33 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox) UpdateColorConfig(); return 0; } -/* -----------------------------09.04.2002 15:21------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) { if(&aSaveSchemePB == pButton) { String sName; - //CHINA001 SvxNameDialog aNameDlg(pButton, - //CHINA001 sName, - //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2))); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton, sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) ); - DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1))); aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME); aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); - if(RET_OK == aNameDlg->Execute()) //CHINA001 if(RET_OK == aNameDlg.Execute()) + if(RET_OK == aNameDlg->Execute()) { - aNameDlg->GetName(sName); //CHINA001 aNameDlg.GetName(sName); + aNameDlg->GetName(sName); pColorConfig->AddScheme(sName); pExtColorConfig->AddScheme(sName); aColorSchemeLB.InsertEntry(sName); aColorSchemeLB.SelectEntry(sName); aColorSchemeLB.GetSelectHdl().Call(&aColorSchemeLB); } - delete aNameDlg; //add by CHINA001 + delete aNameDlg; } else { @@ -1703,20 +1660,17 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) aDeleteSchemePB.Enable( aColorSchemeLB.GetEntryCount() > 1 ); return 0; } -/* -----------------------------09.04.2002 15:47------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog ) { String sName; pDialog->GetName(sName); return sName.Len() && LISTBOX_ENTRY_NOTFOUND == aColorSchemeLB.GetEntryPos( sName ); } -/* -----------------------------25.04.2002 15:12------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::FillUserData() { SetUserData(String::CreateFromInt32(pColorConfigCT->GetScrollPosition())); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc index d8bb17b54e39..3b96231d71d6 100644 --- a/cui/source/options/optcolor.hrc +++ b/cui/source/options/optcolor.hrc @@ -186,6 +186,10 @@ #define LB_SQLCOMMENT 193 #define WN_SQLCOMMENT 194 +#define CB_SHADOWCOLOR 196 +#define LB_SHADOWCOLOR 197 +#define WN_SHADOWCOLOR 198 + #define ST_EXTENSION 166 diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 32d7799109e8..6e44569ce8cc 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,12 +35,9 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -/* -----------------------------25.03.2002 10:40------------------------------ - - ---------------------------------------------------------------------------*/ namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;} class ColorConfigCtrl_Impl; -class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog; +class AbstractSvxNameDialog; class SvxColorOptionsTabPage : public SfxTabPage { using SfxTabPage::DeactivatePage; @@ -79,3 +77,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 73cee3bfdc6f..201495f5c1fa 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -219,283 +219,290 @@ TabPage RID_SVXPAGE_COLORCONFIG }; LB_WN( SMARTTAGS, 10 ) + Checkbox CB_SHADOWCOLOR + { + CB_POS_SIZE( 11 ); + Text [ en-US ] = "Shadows"; + }; + LB_WN( SHADOWCOLOR, 11 ) + FixedText FT_WRITER { - FT_SEP_POS_SIZE( 11 ); + FT_SEP_POS_SIZE( 12 ); Text [ en-US ] = "Text Document"; }; FixedText FT_WRITERTEXTGRID { - FT_POS_SIZE( 12 ); + FT_POS_SIZE( 13 ); Text [ en-US ] = "Grid"; }; - LB_WN( WRITERTEXTGRID, 12 ) + LB_WN( WRITERTEXTGRID, 13 ) CheckBox CB_WRITERFIELDSHADINGS { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS"; - CB_POS_SIZE( 13 ); + CB_POS_SIZE( 14 ); Text [ en-US ] = "Field shadings"; }; - LB_WN( WRITERFIELDSHADINGS, 13 ) + LB_WN( WRITERFIELDSHADINGS, 14 ) CheckBox CB_WRITERIDXSHADINGS { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS"; - CB_POS_SIZE( 14 ); + CB_POS_SIZE( 15 ); Text [ en-US ] = "Index and table shadings"; }; - LB_WN( WRITERIDXSHADINGS, 14 ) + LB_WN( WRITERIDXSHADINGS, 15 ) FixedText FT_WRITERSCRIPTINDICATOR { - FT_POS_SIZE( 15 ); + FT_POS_SIZE( 16 ); Text [ en-US ] = "Script indicator"; }; - LB_WN( WRITERSCRIPTINDICATOR, 15 ) + LB_WN( WRITERSCRIPTINDICATOR, 16 ) CheckBox CB_WRITERSECTIONBOUNDARIES { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES"; - CB_POS_SIZE( 16 ); + CB_POS_SIZE( 17 ); Text [ en-US ] = "Section boundaries"; }; - LB_WN( WRITERSECTIONBOUNDARIES, 16 ) + LB_WN( WRITERSECTIONBOUNDARIES, 17 ) FixedText FT_WRITERPAGEBREAKS { - FT_POS_SIZE( 17 ); + FT_POS_SIZE( 18 ); Text [ en-US ] = "Page and column breaks"; }; - LB_WN( WRITERPAGEBREAKS, 17 ) + LB_WN( WRITERPAGEBREAKS, 18 ) FixedText FT_WRITERDIRECTCURSOR { - FT_POS_SIZE( 18 ); + FT_POS_SIZE( 19 ); Text [ en-US ] = "Direct cursor"; }; - LB_WN( WRITERDIRECTCURSOR, 18 ) + LB_WN( WRITERDIRECTCURSOR, 19 ) FixedText FT_HTML { - FT_SEP_POS_SIZE( 19 ); + FT_SEP_POS_SIZE( 20 ); Text [ en-US ] = "HTML Document"; }; FixedText FT_HTMLSGML { - FT_POS_SIZE( 20 ); + FT_POS_SIZE( 21 ); Text [ en-US ] = "SGML syntax highlighting"; }; - LB_WN( HTMLSGML, 20 ) + LB_WN( HTMLSGML, 21 ) FixedText FT_HTMLCOMMENT { - FT_POS_SIZE( 21 ); + FT_POS_SIZE( 22 ); Text [ en-US ] = "Comment highlighting"; }; - LB_WN( HTMLCOMMENT, 21 ) + LB_WN( HTMLCOMMENT, 22 ) FixedText FT_HTMLKEYWORD { - FT_POS_SIZE( 22 ); + FT_POS_SIZE( 23 ); Text [ en-US ] = "Keyword highlighting"; }; - LB_WN( HTMLKEYWORD, 22 ) + LB_WN( HTMLKEYWORD, 23 ) FixedText FT_HTMLUNKNOWN { - FT_POS_SIZE( 23 ); + FT_POS_SIZE( 24 ); Text [ en-US ] = "Text"; }; - LB_WN( HTMLUNKNOWN, 23 ) + LB_WN( HTMLUNKNOWN, 24 ) FixedText FT_CALC { - FT_SEP_POS_SIZE( 24 ); + FT_SEP_POS_SIZE( 25 ); Text [ en-US ] = "Spreadsheet"; }; FixedText FT_CALCGRID { - FT_POS_SIZE( 25 ); + FT_POS_SIZE( 26 ); Text [ en-US ] = "Grid lines"; }; - LB_WN( CALCGRID, 25 ) + LB_WN( CALCGRID, 26 ) FixedText FT_CALCPAGEBREAK { - FT_POS_SIZE( 26 ); + FT_POS_SIZE( 27 ); Text [ en-US ] = "Page breaks"; }; - LB_WN( CALCPAGEBREAK, 26 ) + LB_WN( CALCPAGEBREAK, 27 ) FixedText FT_CALCPAGEBREAKMANUAL { - FT_POS_SIZE( 27 ); + FT_POS_SIZE( 28 ); Text [ en-US ] = "Manual page breaks"; }; - LB_WN( CALCPAGEBREAKMANUAL, 27 ) + LB_WN( CALCPAGEBREAKMANUAL, 28 ) FixedText FT_CALCPAGEBREAKAUTO { - FT_POS_SIZE( 28 ); + FT_POS_SIZE( 29 ); Text [ en-US ] = "Automatic page breaks"; }; - LB_WN( CALCPAGEBREAKAUTO, 28) + LB_WN( CALCPAGEBREAKAUTO, 29) FixedText FT_CALCDETECTIVE { - FT_POS_SIZE( 29 ); + FT_POS_SIZE( 30 ); Text [ en-US ] = "Detective"; }; - LB_WN( CALCDETECTIVE, 29 ) + LB_WN( CALCDETECTIVE, 30 ) FixedText FT_CALCDETECTIVEERROR { - FT_POS_SIZE( 30 ); + FT_POS_SIZE( 31 ); Text [ en-US ] = "Detective error"; }; - LB_WN( CALCDETECTIVEERROR, 30 ) + LB_WN( CALCDETECTIVEERROR, 31 ) FixedText FT_CALCREFERENCE { - FT_POS_SIZE( 31 ); + FT_POS_SIZE( 32 ); Text [ en-US ] = "References"; }; - LB_WN( CALCREFERENCE, 31 ) + LB_WN( CALCREFERENCE, 32 ) FixedText FT_CALCNOTESBACKGROUND { - FT_POS_SIZE( 32 ); + FT_POS_SIZE( 33 ); Text [ en-US ] = "Notes background"; }; - LB_WN( CALCNOTESBACKGROUND, 32 ) + LB_WN( CALCNOTESBACKGROUND, 33 ) FixedText FT_DRAW { - FT_SEP_POS_SIZE( 33 ); + FT_SEP_POS_SIZE( 34 ); Text [ en-US ] = "Drawing / Presentation"; }; FixedText FT_DRAWGRID { - FT_POS_SIZE( 34 ); + FT_POS_SIZE( 35 ); Text [ en-US ] = "Grid"; }; - LB_WN( DRAWGRID, 34 ) + LB_WN( DRAWGRID, 35 ) FixedText FT_BASIC { - FT_SEP_POS_SIZE( 35 ); + FT_SEP_POS_SIZE( 36 ); Text [ en-US ] = "Basic Syntax Highlighting"; }; FixedText FT_BASICIDENTIFIER { - FT_POS_SIZE( 36 ); + FT_POS_SIZE( 37 ); Text [ en-US ] = "Identifier"; }; - LB_WN( BASICIDENTIFIER, 36 ) + LB_WN( BASICIDENTIFIER, 37 ) FixedText FT_BASICCOMMENT { - FT_POS_SIZE( 37 ); + FT_POS_SIZE( 38 ); Text [ en-US ] = "Comment"; }; - LB_WN( BASICCOMMENT, 37 ) + LB_WN( BASICCOMMENT, 38 ) FixedText FT_BASICNUMBER { - FT_POS_SIZE( 38 ); + FT_POS_SIZE( 39 ); Text [ en-US ] = "Number"; }; - LB_WN( BASICNUMBER, 38) + LB_WN( BASICNUMBER, 39) FixedText FT_BASICSTRING { - FT_POS_SIZE( 39 ); + FT_POS_SIZE( 40 ); Text [ en-US ] = "String"; }; - LB_WN( BASICSTRING, 39 ) + LB_WN( BASICSTRING, 40 ) FixedText FT_BASICOPERATOR { - FT_POS_SIZE( 40 ); + FT_POS_SIZE( 41 ); Text [ en-US ] = "Operator"; }; - LB_WN( BASICOPERATOR, 40 ) + LB_WN( BASICOPERATOR, 41 ) FixedText FT_BASICKEYWORD { - FT_POS_SIZE( 41 ); + FT_POS_SIZE( 42 ); Text [ en-US ] = "Reserved expression"; }; - LB_WN( BASICKEYWORD, 41 ) + LB_WN( BASICKEYWORD, 42 ) FixedText FT_BASICERROR { - FT_POS_SIZE( 42 ); + FT_POS_SIZE( 43 ); Text [ en-US ] = "Error"; }; - LB_WN( BASICERROR, 42 ) + LB_WN( BASICERROR, 43 ) FixedText FT_SQL_COMMAND { - FT_SEP_POS_SIZE( 43 ); + FT_SEP_POS_SIZE( 44 ); Text [ en-US ] = "SQL Syntax Highlighting"; }; FixedText FT_SQLIDENTIFIER { - FT_POS_SIZE( 44 ); + FT_POS_SIZE( 45 ); Text [ en-US ] = "Identifier"; }; - LB_WN( SQLIDENTIFIER, 44 ) + LB_WN( SQLIDENTIFIER, 45 ) FixedText FT_SQLNUMBER { - FT_POS_SIZE( 45 ); + FT_POS_SIZE( 46 ); Text [ en-US ] = "Number"; }; - LB_WN( SQLNUMBER, 45 ) + LB_WN( SQLNUMBER, 46 ) FixedText FT_SQLSTRING { - FT_POS_SIZE( 46 ); + FT_POS_SIZE( 47 ); Text [ en-US ] = "String"; }; - LB_WN( SQLSTRING, 46 ) + LB_WN( SQLSTRING, 47 ) FixedText FT_SQLOPERATOR { - FT_POS_SIZE( 47 ); + FT_POS_SIZE( 48 ); Text [ en-US ] = "Operator"; }; - LB_WN( SQLOPERATOR, 47 ) + LB_WN( SQLOPERATOR, 48 ) FixedText FT_SQLKEYWORD { - FT_POS_SIZE( 48 ); + FT_POS_SIZE( 49 ); Text [ en-US ] = "Keyword"; }; - LB_WN( SQLKEYWORD, 48 ) + LB_WN( SQLKEYWORD, 49 ) FixedText FT_SQLPARAMETER { - FT_POS_SIZE( 49 ); + FT_POS_SIZE( 50 ); Text [ en-US ] = "Parameter"; }; - LB_WN( SQLPARAMETER, 49 ) + LB_WN( SQLPARAMETER, 50 ) FixedText FT_SQLCOMMENT { - FT_POS_SIZE( 50 ); + FT_POS_SIZE( 51 ); Text [ en-US ] = "Comment"; }; - LB_WN( SQLCOMMENT, 50 ) + LB_WN( SQLCOMMENT, 51 ) String ST_EXTENSION { diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ef2e959af80c..2589874d1270 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "optctl.hxx" #include <dialmgr.hxx> #include "optctl.hrc" @@ -168,3 +167,4 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& ) m_aTypeReplaceCB.Enable( bIsSequenceChecking ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 6ac246b83c18..2645e0a85c82 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SVX_OPTCTL_HXX #define _SVX_OPTCTL_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> @@ -68,3 +67,4 @@ public: #endif // #ifndef _SVX_OPTCTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 06906bc38b49..8eb8916e169d 100755..100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <editeng/unolingu.hxx> @@ -552,8 +550,8 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if (aWordsLB.GetEntryCount()) { - aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); - aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) ); + aWordED .SetText( aWordsLB.GetEntryText((ULONG)0, 0) ); + aReplaceED.SetText( aWordsLB.GetEntryText((ULONG)0, 1) ); } LeaveWait(); @@ -807,3 +805,4 @@ void SvxDictEdit::KeyInput( const KeyEvent& rKEvt ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index ae63c20f4013..c31c95060a13 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -39,8 +39,6 @@ ModalDialog RID_SFXDLG_NEWDICT SVLook = TRUE ; Size = MAP_APPFONT ( 213 , 66 ) ; Moveable = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ Text [ en-US ] = "New Dictionary" ; FixedText FT_DICTNAME { @@ -83,8 +81,6 @@ ModalDialog RID_SFXDLG_NEWDICT { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 145 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ Text [ en-US ] = "Dictionary" ; }; OKButton BTN_NEWDICT_OK @@ -114,8 +110,6 @@ ModalDialog RID_SFXDLG_EDITDICT SVLook = TRUE ; Size = MAP_APPFONT( 270, 161 ); - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ Text [ en-US ] = "Edit Custom Dictionary" ; Moveable = TRUE ; @@ -227,8 +221,6 @@ ModalDialog RID_SFXDLG_EDITDICT Pos = MAP_APPFONT ( 209 , 143 ) ; Size = MAP_APPFONT ( 55 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ Text [ en-US ] = "~Close" ; }; }; @@ -243,10 +235,6 @@ QueryBox RID_SFXQB_SET_LANGUAGE { Buttons = WB_YES_NO ; DefButton = WB_DEF_NO ; - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ Message [ en-US ] = "Do you want to change the '%1' dictionary language?" ; }; // ********************************************************************** EOF diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index a41a4b82bf57..a18c791b20c4 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> @@ -54,6 +52,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ), aMSWordGB ( this, CUI_RES( GB_WORD ) ), aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ), + aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ), aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), @@ -65,6 +64,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) { FreeResource(); + aWBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) ); aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) ); } @@ -72,6 +72,12 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage() { } +IMPL_LINK( OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) +{ + aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() ); + return 0; +} + IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) { aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() ); @@ -91,6 +97,8 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) sal_Bool bFlag; if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked())) pOpt->SetLoadWordBasicCode( bFlag ); + if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked())) + pOpt->SetLoadWordBasicExecutable( bFlag ); if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked())) pOpt->SetLoadWordBasicStorage( bFlag ); @@ -109,18 +117,17 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) return sal_False; } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - void OfaMSFilterTabPage::Reset( const SfxItemSet& ) { SvtFilterOptions* pOpt = SvtFilterOptions::Get(); aWBasicCodeCB.Check( pOpt->IsLoadWordBasicCode() ); aWBasicCodeCB.SaveValue(); + aWBasicWbctblCB.Check( pOpt->IsLoadWordBasicExecutable() ); + aWBasicWbctblCB.SaveValue(); aWBasicStgCB.Check( pOpt->IsLoadWordBasicStorage() ); aWBasicStgCB.SaveValue(); + LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB ); aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() ); aEBasicCodeCB.SaveValue(); @@ -137,9 +144,6 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& ) } -/*-----------------29.06.00 13:22------------------- - * - * --------------------------------------------------*/ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), @@ -181,7 +185,6 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) { - sal_Bool bModified = sal_False; SvtFilterOptions* pOpt = SvtFilterOptions::Get(); static struct ChkCBoxEntries{ @@ -224,10 +227,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) pCheckButtonData->ConvertToButtonState( nButtonFlags ); if( bCheck != (pOpt->*pArr->FnIs)() ) - { - bModified = sal_True; (pOpt->*pArr->FnSet)( bCheck ); - } } } } @@ -344,9 +344,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick() { // Sortierung durch diese Ueberladung abgeklemmt } -/* -----------------------------2002/06/20 11:51------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { @@ -372,9 +370,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( InvalidateEntry( pEntry ); } } -/* -----------------------------2002/06/20 11:56------------------------------ - ---------------------------------------------------------------------------*/ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const { @@ -390,9 +386,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( return eState; } -/* -----------------------------2002/06/20 11:57------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) { if ( nPos < GetEntryCount() ) @@ -402,9 +396,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_u bChecked ? SvButtonState( SV_BUTTON_CHECKED ) : SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/* -----------------------------2002/06/20 11:51------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -434,3 +426,4 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput(rKEvt); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc index 948da2c47542..a9411b576674 100644 --- a/cui/source/options/optfltr.hrc +++ b/cui/source/options/optfltr.hrc @@ -40,6 +40,7 @@ #define CB_EBAS_STG 5 #define CB_PBAS_CODE 6 #define CB_PBAS_STG 7 +#define CB_WBAS_WBCTBL 8 #define CLB_SETTINGS 1 #define ST_CHG_MATH 1 diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 608139fab42d..f62f92d062b1 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,12 +28,8 @@ #ifndef _OFA_OPTFLTR_HXX #define _OFA_OPTFLTR_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/simptabl.hxx> @@ -43,6 +40,7 @@ class OfaMSFilterTabPage : public SfxTabPage { FixedLine aMSWordGB; CheckBox aWBasicCodeCB; + CheckBox aWBasicWbctblCB; CheckBox aWBasicStgCB; FixedLine aMSExcelGB; CheckBox aEBasicCodeCB; @@ -55,6 +53,7 @@ class OfaMSFilterTabPage : public SfxTabPage OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); + DECL_LINK( LoadWordBasicCheckHdl_Impl, CheckBox* ); DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* ); public: @@ -113,3 +112,4 @@ public: #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index cff77bad88b6..b43d034174e2 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -52,10 +52,17 @@ TabPage RID_OFAPAGE_MSFILTEROPT TabStop = TRUE ; Text [ en-US ] = "Load Basic ~code"; }; + CheckBox CB_WBAS_WBCTBL + { + Pos = MAP_APPFONT ( 22 , 28 ) ; + Size = MAP_APPFONT ( 236 , 10 ) ; + TabStop = TRUE ; + Text [ en-US ] = "E~xecutable code"; + }; CheckBox CB_WBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG"; - Pos = MAP_APPFONT ( 12 , 28 ) ; + Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Save ~original Basic code"; @@ -63,14 +70,14 @@ TabPage RID_OFAPAGE_MSFILTEROPT FixedLine GB_EXCEL { - Pos = MAP_APPFONT ( 6 , 44 ) ; + Pos = MAP_APPFONT ( 6 , 58 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Microsoft Excel 97/2000/XP"; }; CheckBox CB_EBAS_CODE { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE"; - Pos = MAP_APPFONT ( 12 , 55 ) ; + Pos = MAP_APPFONT ( 12 , 69 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Lo~ad Basic code"; @@ -78,7 +85,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_EBAS_EXECTBL { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL"; - Pos = MAP_APPFONT ( 22 , 69 ) ; + Pos = MAP_APPFONT ( 22 , 83 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "E~xecutable code"; @@ -86,7 +93,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_EBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG"; - Pos = MAP_APPFONT ( 12 , 83 ) ; + Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Sa~ve original Basic code"; @@ -94,14 +101,14 @@ TabPage RID_OFAPAGE_MSFILTEROPT FixedLine GB_PPOINT { - Pos = MAP_APPFONT ( 6 , 99 ) ; + Pos = MAP_APPFONT ( 6 , 113 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Microsoft PowerPoint 97/2000/XP"; }; CheckBox CB_PBAS_CODE { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE"; - Pos = MAP_APPFONT ( 12 , 110 ) ; + Pos = MAP_APPFONT ( 12 , 124 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Load Ba~sic code"; @@ -109,7 +116,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_PBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG"; - Pos = MAP_APPFONT ( 12 , 124 ) ; + Pos = MAP_APPFONT ( 12 , 138 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Sav~e original Basic code"; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 8b6c0beda7ae..19bd04500a76 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> #include <svl/flagitem.hxx> @@ -40,6 +39,7 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <i18npool/mslangid.hxx> +#include <unotools/compatibility.hxx> #include <unotools/useroptions.hxx> #include <unotools/cacheoptions.hxx> #include <unotools/fontoptions.hxx> @@ -49,7 +49,6 @@ #include <svtools/miscopt.hxx> #include <unotools/printwarningoptions.hxx> #include <unotools/syslocaleoptions.hxx> -#include <svtools/helpopt.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> @@ -76,8 +75,8 @@ #include <dialmgr.hxx> #include <svtools/helpopt.hxx> #include <unotools/saveopt.hxx> +#include <sal/macros.h> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> @@ -133,7 +132,7 @@ namespace if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ) { #ifdef ENABLE_GTK - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.GtkFilePicker") ); #else return rtl::OUString(); #endif @@ -141,7 +140,7 @@ namespace else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) ) { #ifdef ENABLE_KDE4 - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDE4FilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") ); #else return rtl::OUString(); #endif @@ -149,15 +148,15 @@ namespace else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) { #ifdef ENABLE_KDE - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDEFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") ); #else return rtl::OUString(); #endif } #if defined WNT - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") ); #elif (defined MACOSX && defined QUARTZ) - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") ); #else return rtl::OUString(); #endif @@ -204,42 +203,76 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ), aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), + aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ), aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ), + aSaveAlwaysCB ( this, CUI_RES( CB_SAVE_ALWAYS ) ), aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), - aToYearFT ( this, CUI_RES( FT_TOYEAR ) ) - + aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), + aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ) { FreeResource(); +#if !defined(ENABLE_HELP_FORMATTING) + aHelpFormatFT.Hide(); + aHelpFormatLB.Hide(); +#endif + if (!lcl_HasSystemFilePicker()) { aFileDlgFL.Hide(); aFileDlgCB.Hide(); } - #if ! defined(QUARTZ) +#if !defined(QUARTZ) aPrintDlgFL.Hide(); aPrintDlgCB.Hide(); - #endif +#endif + +#ifdef WNT + aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) ); +#else + aODMADlgCB.Hide(); +#endif + + if (!aODMADlgCB.IsVisible()) + { + // rearrange the following controls + Point aNewPos = aPrintDlgFL.GetPosPixel(); + long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y(); + + Window* pWins[] = + { + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB + }; + Window** pCurrent = pWins; + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); + for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) + { + aNewPos = (*pCurrent)->GetPosPixel(); + aNewPos.Y() -= nDelta; + (*pCurrent)->SetPosPixel( aNewPos ); + } + } if ( !aFileDlgCB.IsVisible() ) { // rearrange the following controls - Point aNewPos = aDocStatusFL.GetPosPixel(); + Point aNewPos = aPrintDlgFL.GetPosPixel(); long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y(); Window* pWins[] = { - &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB }; Window** pCurrent = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) { aNewPos = (*pCurrent)->GetPosPixel(); @@ -253,23 +286,23 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aFileDlgCB.Disable(); } - if ( aPrintDlgCB.IsVisible() ) + if ( !aPrintDlgCB.IsVisible() ) { // rearrange the following controls Point aNewPos = aDocStatusFL.GetPosPixel(); - long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y(); + long nDelta = aNewPos.Y() - aPrintDlgFL.GetPosPixel().Y(); Window* pWins[] = { - &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT + &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, + &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB }; Window** pCurrent = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) { aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() += nDelta; + aNewPos.Y() -= nDelta; (*pCurrent)->SetPosPixel( aNewPos ); } } @@ -316,6 +349,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : } } +#ifdef WNT +IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG ) +{ + aODMADlgCB.Enable( !aFileDlgCB.IsChecked() ); + return 0; +} +#endif + // ----------------------------------------------------------------------- OfaMiscTabPage::~OfaMiscTabPage() @@ -370,6 +411,13 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = sal_True; } + if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() ); + bModified = TRUE; + } + if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; @@ -377,6 +425,20 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = sal_True; } + if ( aSaveAlwaysCB.IsChecked() != aSaveAlwaysCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetSaveAlwaysAllowed( aSaveAlwaysCB.IsChecked() ); + bModified = TRUE; + } + + if ( aExperimentalCB.IsChecked() != aExperimentalCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetExperimentalMode( aExperimentalCB.IsChecked() ); + bModified = TRUE; + } + const SfxUInt16Item* pUInt16Item = PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32(); @@ -418,6 +480,13 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) aFileDlgCB.SaveValue(); aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() ); aPrintDlgCB.SaveValue(); + aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() ); + aSaveAlwaysCB.SaveValue(); + aExperimentalCB.Check( aMiscOpt.IsExperimentalMode() ); + aExperimentalCB.SaveValue(); + + aODMADlgCB.Check( aMiscOpt.TryODMADialog() ); + aODMADlgCB.SaveValue(); SvtPrintWarningOptions aPrintOptions; aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); @@ -523,30 +592,30 @@ CanvasSettings::CanvasSettings() : Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); Reference<XMultiServiceFactory> xConfigProvider( xFactory->createInstance( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), UNO_QUERY_THROW ); Any propValue( makeAny( PropertyValue( - OUString::createFromAscii("nodepath"), -1, - makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas")) ), PropertyState_DIRECT_VALUE ) ) ); mxForceFlagNameAccess.set( xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")), Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); propValue = makeAny( PropertyValue( - OUString::createFromAscii("nodepath"), -1, - makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas/CanvasServiceList") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas/CanvasServiceList")) ), PropertyState_DIRECT_VALUE ) ); Reference<XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); Reference<XHierarchicalNameAccess> xHierarchicalNameAccess( xNameAccess, UNO_QUERY_THROW); @@ -563,7 +632,7 @@ CanvasSettings::CanvasSettings() : if( xEntryNameAccess.is() ) { Sequence<OUString> preferredImplementations; - if( (xEntryNameAccess->getByName( OUString::createFromAscii("PreferredImplementations") ) >>= preferredImplementations) ) + if( (xEntryNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredImplementations")) ) >>= preferredImplementations) ) maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) ); } @@ -601,7 +670,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const pCurrImpl->trim() ), UNO_QUERY_THROW ); bool bHasAccel(false); - if( (xPropSet->getPropertyValue(OUString::createFromAscii("HardwareAcceleration")) >>= bHasAccel) ) + if( (xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("HardwareAcceleration"))) >>= bHasAccel) ) if( bHasAccel ) { mbHWAccelAvailable = true; @@ -628,7 +697,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const if( !mxForceFlagNameAccess.is() ) return true; - if( !(mxForceFlagNameAccess->getByName( OUString::createFromAscii("ForceSafeServiceImpl") ) >>= bForceLastEntry) ) + if( !(mxForceFlagNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")) ) >>= bForceLastEntry) ) return true; return !bForceLastEntry; @@ -643,7 +712,7 @@ void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const if( !xNameReplace.is() ) return; - xNameReplace->replaceByName( OUString::createFromAscii("ForceSafeServiceImpl"), + xNameReplace->replaceByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")), makeAny(!_bEnabled) ); Reference< XChangesBatch > xChangesBatch( @@ -747,7 +816,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : DELETEZ( pFontAntiAliasing ); Point aPos; - for ( sal_Int32 i = 0; i < sizeof( pMiscOptions ) / sizeof( pMiscOptions[0] ); ++i ) + for ( sal_Int32 i = 0; i < SAL_N_ELEMENTS( pMiscOptions ); ++i ) { aPos = pMiscOptions[i]->GetPosPixel( ); aPos.Y() -= nMoveUp; @@ -796,14 +865,18 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : { ::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) ); - aAutoStr += ::rtl::OUString::createFromAscii( " (" ); + aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") ); - sal_uLong nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); + // prefer the icon style set by the desktop native widgets modules + sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle(); + // fallback to the statically defined values + if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) + nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); if ( aIconStyleItemId[nAutoStyle] ) aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] ); aIconStyleLB.RemoveEntry( 0 ); - aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 ); + aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); // separate auto and other icon themes aIconStyleLB.SetSeparatorPos( 0 ); } @@ -817,7 +890,6 @@ OfaViewTabPage::~OfaViewTabPage() } #if defined( UNX ) -//--- 20.08.01 10:16:12 --------------------------------------------------- IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; @@ -841,19 +913,11 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaViewTabPage(pParent, rAttrSet); } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ - sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) { SvtFontOptions aFontOpt; @@ -876,7 +940,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break; case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break; default: - DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); } aMiscOptions.SetSymbolsSize( eSet ); } @@ -1052,9 +1116,6 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) return bModified; } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ void OfaViewTabPage::Reset( const SfxItemSet& ) { SvtMiscOptions aMiscOptions; @@ -1159,32 +1220,28 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); #endif } -/* -----------------22.07.2003 10:33----------------- - --------------------------------------------------*/ struct LanguageConfig_Impl { SvtLanguageOptions aLanguageOptions; SvtSysLocaleOptions aSysLocaleOptions; SvtLinguConfig aLinguConfig; }; -/* -----------------------------23.11.00 13:06-------------------------------- - ---------------------------------------------------------------------------*/ static sal_Bool bLanguageCurrentDoc_Impl = sal_False; // some things we'll need... -static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); -static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); -static const OUString sAccessUpdSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); -static const OUString sInstalledLocalesPath = OUString::createFromAscii("org.openoffice.Setup/Office/InstalledLocales"); -static OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office.Linguistic/General"); -//static const OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office/Linguistic"); -static const OUString sUserLocaleKey = OUString::createFromAscii("UILocale"); -static const OUString sSystemLocalePath = OUString::createFromAscii("org.openoffice.System/L10N"); -static const OUString sSystemLocaleKey = OUString::createFromAscii("UILocale"); -static const OUString sOfficeLocalePath = OUString::createFromAscii("org.openoffice.Office/L10N"); -static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale"); +static const OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")); +static const OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")); +static const OUString sAccessUpdSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")); +static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/InstalledLocales")); +static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General")); +//static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic")); +static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); +static const OUString sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N")); +static const OUString sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); +static const OUString sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N")); +static const OUString sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : @@ -1244,13 +1301,13 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe Reference< XNameAccess > theNameAccess; // find out which locales are currently installed and add them to the listbox - theArgs[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sInstalledLocalesPath))); - theArgs[1] = makeAny(NamedValue(OUString::createFromAscii("reload"), makeAny(sal_True))); + theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sInstalledLocalesPath))); + theArgs[1] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("reload")), makeAny(sal_True))); theNameAccess = Reference< XNameAccess > ( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW ); seqInstalledLanguages = theNameAccess->getElementNames(); LanguageType aLang = LANGUAGE_DONTKNOW; - for (sal_Int32 i=0; i<seqInstalledLanguages.getLength(); i++) + for (sal_IntPtr i=0; i<seqInstalledLanguages.getLength(); i++) { aLang = MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]); if (aLang != LANGUAGE_DONTKNOW) @@ -1264,7 +1321,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe // find out whether the user has a specific locale specified Sequence< Any > theArgs2(1); - theArgs2[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sUserLocalePath))); + theArgs2[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sUserLocalePath))); theNameAccess = Reference< XNameAccess > ( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW ); if (theNameAccess->hasByName(sUserLocaleKey)) @@ -1344,23 +1401,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe aCTLSupportFI.Show(bReadonly); SupportHdl( &aCTLSupportCB ); } -/*-- 23.11.00 13:06:40--------------------------------------------------- - -----------------------------------------------------------------------*/ OfaLanguagesTabPage::~OfaLanguagesTabPage() { delete pLangConfig; } -/*-- 23.11.00 13:06:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaLanguagesTabPage(pParent, rAttrSet); } -/*-- 23.11.00 13:06:41--------------------------------------------------- - -----------------------------------------------------------------------*/ LanguageType lcl_LangStringToLangType(const OUString& rLang) { Locale aLocale; @@ -1377,9 +1428,6 @@ LanguageType lcl_LangStringToLangType(const OUString& rLang) return eLangType; } -/*-- 23.11.00 13:06:40--------------------------------------------------- - - -----------------------------------------------------------------------*/ void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) { SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); @@ -1410,9 +1458,18 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) pLangConfig->aLanguageOptions.BlockBroadcasts( sal_True ); pLangConfig->aLinguConfig.BlockBroadcasts( sal_True ); - if(aCTLSupportCB.IsChecked() && - (aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) || - (aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos())) + /* + * Sequence checking only matters when CTL support is enabled. + * + * So we only need to check for sequence checking if + * a) previously it was unchecked and is now checked or + * b) it was already checked but the CTL language has changed + */ + if ( + aCTLSupportCB.IsChecked() && + (aCTLSupportCB.GetSavedValue() != STATE_CHECK || + aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos()) + ) { //sequence checking has to be switched on depending on the selected CTL language LanguageType eCTLLang = aComplexLanguageLB.GetSelectLanguage(); @@ -1454,7 +1511,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // tell quickstarter to stop being a veto listener Reference< XInitialization > xInit(theMSF->createInstance( - OUString::createFromAscii("com.sun.star.office.Quickstart")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))), UNO_QUERY); if (xInit.is()) { Sequence< Any > args(3); @@ -1498,6 +1555,11 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // the end of this method pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, sal_True ) ); + + sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); + bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; + SvtCompatibilityOptions aCompatOpts; + aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK ); } if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked()) @@ -1515,7 +1577,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) if ( sOldCurr != sNewCurr ) pLangConfig->aSysLocaleOptions.SetCurrencyConfigString( sNewCurr ); - sal_Bool bRet = sal_False; SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY ); sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked(); @@ -1541,7 +1602,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN), SID_ATTR_LANGUAGE)); - bRet = sal_True; } } bValChanged = aAsianLanguageLB.GetSavedValue() != aAsianLanguageLB.GetSelectEntryPos(); @@ -1562,7 +1622,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN), SID_ATTR_CHAR_CJK_LANGUAGE)); - bRet = sal_True; } } bValChanged = aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos(); @@ -1583,7 +1642,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX), SID_ATTR_CHAR_CTL_LANGUAGE)); - bRet = sal_True; } } @@ -1766,10 +1824,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aComplexLanguageFT.Enable( bEnable ); aComplexLanguageLB.Enable( bEnable ); #endif - /*---------------------07-05-07-------------------------- - check the box "For the current document only" - set the focus to the Western Language box - --------------------------------------------------------*/ + // check the box "For the current document only" + // set the focus to the Western Language box const SfxPoolItem* pLang = 0; if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == sal_True ) { @@ -1778,9 +1834,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aCurrentDocCB.Check(sal_True); } } -/* -----------------------------20.04.01 15:09-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) { DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); @@ -1827,9 +1881,7 @@ namespace _rCB.Enable( !_bNewValue ); } } -/* -----------------08.06.01 17:56------------------- - --------------------------------------------------*/ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) { LanguageType eLang = pBox->GetSelectLanguage(); @@ -1872,3 +1924,4 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 04aad5909d9d..5e54e0bfafe7 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -30,6 +30,8 @@ // defines for positions and sizes --------------------------------------- +#define ENABLE_HELP_FORMATTING 0 + #define WHOLE_WIDTH 248 #define EDIT_WIDTH 30 #define UNIT_WIDTH 40 @@ -45,17 +47,25 @@ #define ROWSPACE RSC_SP_CTRL_DESC_Y #define ROW0 3 -#define ROW1 (ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW2 (ROW1+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW3 (ROW2+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW4 (ROW3+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW5 (ROW4+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) -#define ROW6 (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW7 (ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW8 (ROW7+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW9 (ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW10 (ROW9+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW11 (ROW10+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#if ENABLE_HELP_FORMATTING +#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#else +#define ROW2 (ROW1) +#endif +#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) +#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) +#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW9 (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW10 (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) @@ -101,6 +111,8 @@ #define PB_HELPAGENT_RESET 14 #define FT_HELPFORMAT 15 #define LB_HELPFORMAT 16 +#define FT_EXPERIMENTAL 17 +#define CB_EXPERIMENTAL 18 //#define FL_FILEDLG 20 //#define CB_FILEDLG 21 @@ -199,6 +211,8 @@ #define FT_HELPAGENT_TIME_UNIT 59 #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 +#define CB_ODMADLG 62 +#define CB_SAVE_ALWAYS 74 #endif // #ifndef _SVX_OPTGDLG_HRC // ******************************************************************* EOF diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 3268cd43c51c..d875100a7236 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,12 +57,14 @@ private: FixedLine aFileDlgFL; ReadOnlyImage aFileDlgROImage; CheckBox aFileDlgCB; + CheckBox aODMADlgCB; FixedLine aPrintDlgFL; CheckBox aPrintDlgCB; FixedLine aDocStatusFL; CheckBox aDocStatusCB; + CheckBox aSaveAlwaysCB; FixedLine aTwoFigureFL; FixedText aInterpretFT; @@ -70,10 +73,15 @@ private: String aStrDateInfo; + CheckBox aExperimentalCB; + DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); DECL_LINK( HelpCheckHdl_Impl, CheckBox* ); DECL_LINK( HelpAgentResetHdl_Impl, PushButton* ); +#ifdef WNT + DECL_LINK( OnFileDlgToggled, CheckBox* ); +#endif protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ); @@ -157,9 +165,7 @@ public: virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; -/* -----------------------------23.11.00 13:04-------------------------------- - ---------------------------------------------------------------------------*/ struct LanguageConfig_Impl; class OfaLanguagesTabPage : public SfxTabPage { @@ -215,3 +221,4 @@ public: #endif // #ifndef _OFA_OPTGDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index ed7443ae04b4..1f26e3e982d6 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -52,40 +52,27 @@ TabPage OFA_TP_MISC { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP"; Pos = MAP_APPFONT( COL1, ROW1 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Tips"; }; CheckBox CB_EXTHELP { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP"; - Pos = MAP_APPFONT( COL2, ROW2 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ); + Pos = MAP_APPFONT( COL3, ROW1 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Extended tips"; }; - CheckBox CB_HELPAGENT - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; - Pos = MAP_APPFONT( COL1, ROW3 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Help Agent"; - }; - PushButton PB_HELPAGENT_RESET - { - HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; - Pos = MAP_APPFONT( COL2, ROW4 ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "~Reset Help Agent"; - }; +#if ENABLE_HELP_FORMATTING FixedText FT_HELPFORMAT { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) ); Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Help ~formatting"; }; ListBox LB_HELPFORMAT { HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT"; - Pos = MAP_APPFONT( COL4, ROW5 ); + Pos = MAP_APPFONT( COL3, ROW2 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 ); DropDown = TRUE ; Border = TRUE ; @@ -99,47 +86,87 @@ TabPage OFA_TP_MISC < "High Contrast White" ; > ; }; }; +#endif + CheckBox CB_HELPAGENT + { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; + Pos = MAP_APPFONT( COL1, ROW3 ); + Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "~Help Agent"; + }; + PushButton PB_HELPAGENT_RESET + { + HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; + Pos = MAP_APPFONT( COL3, ROW3 ); + Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH + 20, RSC_CD_PUSHBUTTON_HEIGHT ); + Text [ en-US ] = "~Reset Help Agent"; + }; FixedLine FL_FILEDLG { - Pos = MAP_APPFONT( COL0, ROW6 ); + Pos = MAP_APPFONT( COL0, ROW4 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Open/Save dialogs"; }; FixedImage FI_FILEDLG_RO { - Pos = MAP_APPFONT( COL1 - 7, ROW7 + 2 ); + Pos = MAP_APPFONT( COL1 - 7, ROW5 + 2 ); Size = MAP_APPFONT( 6, 6 ); Hide = TRUE; }; CheckBox CB_FILEDLG { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG"; - Pos = MAP_APPFONT( COL1, ROW7 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Pos = MAP_APPFONT( COL1, ROW5 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; }; + CheckBox CB_ODMADLG + { + Pos = MAP_APPFONT( COL1, ROW6 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Show ODMA DMS dialogs first"; + Text [ en-GB ] = "Show ODMA DMS dialogues first"; + }; + FixedLine FL_PRINTDLG + { + Pos = MAP_APPFONT( COL0, ROW7 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Print dialogs"; + }; + CheckBox CB_PRINTDLG + { + Pos = MAP_APPFONT( COL1, ROW8 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; + }; FixedLine FL_DOCSTATUS { - Pos = MAP_APPFONT( COL0, ROW8 ); + Pos = MAP_APPFONT( COL0, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Document status"; }; CheckBox CB_DOCSTATUS { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS"; - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW10 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; }; + CheckBox CB_SAVE_ALWAYS + { + Pos = MAP_APPFONT( COL1, ROW11 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Allow to save document even when the document is not modified"; + }; FixedLine FL_TWOFIGURE { - Pos = MAP_APPFONT( COL0, ROW10 ); + Pos = MAP_APPFONT( COL0, ROW12 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Year (two digits)" ; }; FixedText FT_INTERPRET { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Interpret as years between"; }; @@ -147,7 +174,7 @@ TabPage OFA_TP_MISC { HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE"; Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW11 ); + Pos = MAP_APPFONT( COL4, ROW13 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Minimum = 1583 ; Maximum = 9857 ; @@ -156,22 +183,15 @@ TabPage OFA_TP_MISC }; FixedText FT_TOYEAR { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; - FixedLine FL_PRINTDLG + CheckBox CB_EXPERIMENTAL { - Pos = MAP_APPFONT( COL0, ROW8 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Print dialogs"; - }; - CheckBox CB_PRINTDLG - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG"; - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW15 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; + Text [ en-US ] = "Enable experimental (unstable) features"; }; }; @@ -256,11 +276,12 @@ TabPage OFA_TP_VIEW < "Automatic" ; > ; < "Galaxy (default)" ; > ; < "High Contrast" ; > ; - < "Industrial" ; > ; + < "Industrial" ; > ; // industrial is dead, but we have to keep the entry < "Crystal" ; > ; < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index bba3b10fc846..75fbb3933b3d 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/svapp.hxx> @@ -166,6 +164,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe } else if ( LANGUAGE_JAPANESE == eLang || LANGUAGE_KOREAN == eLang || + LANGUAGE_HUNGARIAN == eLang || LANGUAGE_CHINESE_TRADITIONAL == eLang || LANGUAGE_CHINESE_SIMPLIFIED == eLang) { @@ -335,7 +334,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) switch ( aShortStr.Len() ) { case 0: - aShortStr = String( RTL_CONSTASCII_STRINGPARAM(" ") ); + aShortStr = String( RTL_CONSTASCII_USTRINGPARAM(" ") ); break; case 1: @@ -559,3 +558,4 @@ int SvxGeneralTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index aa32ce136386..8dcdb124e088 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/langtab.hxx> @@ -37,6 +35,7 @@ #include <cuires.hrc> #include "helpid.hrc" #include <dialmgr.hxx> +#include <sal/macros.h> // Umwandlung der Modi zu den Positionen in der Listbox const sal_uInt16 aPosToExportArr[] = @@ -113,28 +112,16 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : aCharSetLB.FillWithMimeAndSelectBest(); } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - OfaHtmlTabPage::~OfaHtmlTabPage() { } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaHtmlTabPage(pParent, rAttrSet); } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) { SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); @@ -183,10 +170,6 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) return sal_False; } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - void OfaHtmlTabPage::Reset( const SfxItemSet& ) { SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); @@ -201,7 +184,7 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aUnknownTagCB.Check(pHtmlOpt->IsImportUnknown()); aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily()); sal_uInt16 nExport = pHtmlOpt->GetExportMode(); - if( nExport >= ( sizeof( aExportToPosArr ) / sizeof( sal_uInt16 ) ) ) + if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) ) nExport = 4; // default for bad config entry is NS 4.0 sal_uInt16 nPosArr = aExportToPosArr[ nExport ]; // if( nPosArr == DEPRECATED_ENTRY ) @@ -237,9 +220,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aCharSetLB.SelectTextEncoding( pHtmlOpt->GetTextEncoding() ); } -/*-----------------16.04.98 16:03------------------- - ---------------------------------------------------*/ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) { sal_uInt16 nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ]; @@ -255,9 +235,7 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) return 0; } -/* -----------------05.02.99 09:17------------------- - * - * --------------------------------------------------*/ + IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) { aStarBasicWarningCB.Enable(!pBox->IsChecked()); @@ -265,3 +243,4 @@ IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index dafe91c42fea..52d67ce873ea 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index b1eb055e9b1a..b5f550f5475c 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX @@ -172,22 +170,22 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) { uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c( - xSMGR->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), + xSMGR->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController") ) ), uno::UNO_QUERY); if(core_c.is()) { ::comphelper::ConfigurationHelper::writeDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - ::rtl::OUString::createFromAscii("Participation"), - ::rtl::OUString::createFromAscii("ShowedInvitation"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation") ), uno::makeAny( true ), ::comphelper::ConfigurationHelper::E_STANDARD ); ::comphelper::ConfigurationHelper::writeDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - ::rtl::OUString::createFromAscii("Participation"), - ::rtl::OUString::createFromAscii("InvitationAccepted"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted") ), uno::makeAny( m_pPage->IsYesChecked() ), ::comphelper::ConfigurationHelper::E_STANDARD ); // TODO: refactor @@ -197,3 +195,5 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) EndDialog( RET_OK ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index 1c08ec79f1de..132247d6f81d 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX @@ -146,11 +144,11 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG ) ::rtl::OUString sLogFile( m_sLogPath ); sLogFile += C2S("/Current.csv"); uno::Sequence< beans::PropertyValue > aArgs(3); - aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName"); - aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)")); - aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions"); - aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,")); - aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly"); + aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + aArgs[0].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ) ); + aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions") ); + aArgs[1].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("44,34,12,1,") ) ); + aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ); aArgs[2].Value = uno::makeAny(true); uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch( @@ -270,3 +268,4 @@ void SvxImprovementOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b14312e4b997..87979ed9b402 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/config.hxx> @@ -58,10 +56,11 @@ #include <unotools/localfilehelper.hxx> #include <unotools/extendedsecurityoptions.hxx> #include <com/sun/star/uno/Sequence.hxx> + #define _SVX_OPTINET2_CXX #include <dialmgr.hxx> #include "optinet2.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <cuires.hrc> #include "optinet2.hrc" #include "helpid.hrc" @@ -70,11 +69,9 @@ #include <svx/svxids.hrc> // slot ids, mostly for changetracking // for security TP -#include <comphelper/processfactory.hxx> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #ifdef UNX -#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> @@ -86,6 +83,7 @@ #include <osl/nlsupport.h> #endif #include <sal/types.h> +#include <sal/macros.h> #include <rtl/ustring.hxx> #include <osl/file.hxx> #include <osl/process.h> @@ -108,7 +106,7 @@ using namespace ::com::sun::star::uno; using namespace ::sfx2; using ::rtl::OUString; -//CHINA001 copy from multipat.hxx begin + // define ---------------------------------------------------------------- // different delimiter for Unix (:) and Windows (;) @@ -118,7 +116,7 @@ using ::rtl::OUString; #else #define CLASSPATH_DELIMITER ';' #endif -//CHINA001 copy from multipat.hxx end + // static ---------------------------------------------------------------- #define C2U(cChar) OUString::createFromAscii(cChar) @@ -174,12 +172,9 @@ void SvxNoSpaceEdit::Modify() } /********************************************************************/ -/********************************************************************/ /* */ /* SvxProxyTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -262,27 +257,15 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : ArrangeControls_Impl(); } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - SvxProxyTabPage::~SvxProxyTabPage() { } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxProxyTabPage(pParent, rAttrSet); } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::ReadConfigData_Impl() { try { @@ -332,24 +315,20 @@ void SvxProxyTabPage::ReadConfigData_Impl() } } - catch(container::NoSuchElementException e) { + catch(container::NoSuchElementException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" ); } } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::ReadConfigDefaults_Impl() { try @@ -394,25 +373,21 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl() aNoProxyForED.SetText( aStringValue ); } } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::RestoreConfigDefaults_Impl() { try @@ -432,25 +407,21 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() xChangesBatch->commitChanges(); } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::Reset(const SfxItemSet&) { ReadConfigData_Impl(); @@ -467,10 +438,6 @@ void SvxProxyTabPage::Reset(const SfxItemSet&) EnableControls_Impl( aProxyModeLB.GetSelectEntryPos() == 2 ); } -/*-----------------12.08.96 16.34------------------- - ---------------------------------------------------*/ - sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) { sal_Bool bModified=sal_False; @@ -545,23 +512,23 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) xChangesBatch->commitChanges(); } - catch(com::sun::star::lang::IllegalArgumentException e) { + catch(com::sun::star::lang::IllegalArgumentException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); } - catch(beans::UnknownPropertyException e) { + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" ); } - catch(beans::PropertyVetoException e) { + catch(beans::PropertyVetoException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: RuntimeException caught" ); } @@ -570,7 +537,7 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) void SvxProxyTabPage::ArrangeControls_Impl() { - //-->Calculate dynamical width of controls, add buy wuy for i71445 Time: 2007.02.27 + // calculate dynamic width of controls, to not cut-off translated strings #i71445# long nWidth = aProxyModeFT.GetCtrlTextWidth( aProxyModeFT.GetText() ); long nTemp = aHttpProxyFT.GetCtrlTextWidth( aHttpProxyFT.GetText() ); if ( nTemp > nWidth ) @@ -616,12 +583,8 @@ void SvxProxyTabPage::ArrangeControls_Impl() aNewPos.Y() = aNoProxyForED.GetPosPixel().Y(); aNoProxyForED.SetPosSizePixel( aNewPos, aNewSize ); } - //<--End buy wuy for i71445 Time: 2007.02.27 } -/*-----------------12.08.96 13.38------------------- - ---------------------------------------------------*/ void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) { aHttpProxyFT.Enable(bEnable); @@ -673,12 +636,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ -/********************************************************************/ /* */ /* SvxSearchTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -752,12 +712,12 @@ SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet void SvxSearchTabPage::Reset( const SfxItemSet& ) { - //The two lines below are moved here from the last part of this method by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + //The two lines below are moved here from the last part of this method aChangePB.Disable(); aAddPB.Disable(); sal_uInt16 nCount = aSearchConfig.Count(); - aSearchLB.Clear(); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aSearchLB.Clear(); for(sal_uInt16 i = 0; i < nCount; i++) { const SvxSearchEngineData& rData = aSearchConfig.GetData(i); @@ -791,7 +751,6 @@ void SvxSearchTabPage::ActivatePage( const SfxItemSet& ) int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) { - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(String())) return KEEP_PAGE; @@ -802,7 +761,6 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -//add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) sal_Bool SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) { if(aChangePB.IsEnabled()) @@ -869,7 +827,7 @@ void SvxSearchTabPage::InitControls_Impl() long nLabelTextWidth = 0; Window* pLabels[] = { &aSearchNameFT, &aSearchFT, &aURLFT, &aPostFixFT, &aSeparatorFT, &aCaseFT }; Window** pLabel = pLabels; - const sal_Int32 nLabelCount = sizeof( pLabels ) / sizeof( pLabels[0] ); + const sal_Int32 nLabelCount = SAL_N_ELEMENTS( pLabels ); for ( ; i < nLabelCount; ++i, ++pLabel ) { long nTemp = (*pLabel)->GetCtrlTextWidth( (*pLabel)->GetText() ); @@ -893,7 +851,7 @@ void SvxSearchTabPage::InitControls_Impl() Window* pEdits[] = { &aSearchNameED, &aAndRB, &aOrRB, &aExactRB, &aURLED, &aPostFixED, &aSeparatorED, &aCaseED }; Window** pEdit = pEdits; - const sal_Int32 nCCount = sizeof( pEdits ) / sizeof( pEdits[ 0 ] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pEdits ); for ( i = 0; i < nCCount; ++i, ++pEdit ) { Point aNewPos = (*pEdit)->GetPosPixel(); @@ -909,7 +867,6 @@ void SvxSearchTabPage::InitControls_Impl() IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The 3 lines below is modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) SearchEntryHdl_Impl(&aSearchLB); if(aChangePB.IsEnabled() || aAddPB.IsEnabled()) return 0; @@ -926,7 +883,6 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aAddPB.Enable(sal_False); aChangePB.Enable(sal_False); aCurrentSrchData.sEngineName = aSearchNameED.GetText(); @@ -941,7 +897,6 @@ IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aChangePB.Enable(sal_False); aAddPB.Enable(sal_False); sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); @@ -973,7 +928,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { - aChangePB.Enable(sal_False); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aChangePB.Enable(sal_False); sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); @@ -991,7 +946,6 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ) { String sSelection(pBox->GetSelectEntry()); - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(sSelection)) return 0; @@ -1358,7 +1312,7 @@ void SvxSecurityTabPage::InitControls() Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB, &maShowConnectionsPB, &maMacroSecPB }; Window** pButton = pButtons; - const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] ); + const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons ); for ( ; i < nBCount; ++i, ++pButton ) { long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() ); @@ -1398,7 +1352,7 @@ void SvxSecurityTabPage::InitControls() Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB, &maMasterPasswordFI, &maMacroSecFI }; Window** pControl = pControls; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[ 0 ] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls ); for ( i = 0; i < nCCount; ++i, ++pControl ) { Size aNewSize = (*pControl)->GetSizePixel(); @@ -1509,7 +1463,6 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& ) } } -//added by jmeng begin MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ), aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), @@ -1567,7 +1520,6 @@ inline bool getDllURL(rtl::OString * path) return false; } dirPath = dirPath.copy(0, dirPath.lastIndexOf('/')); -// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath); ::rtl::OUString sysDirPath; osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath); *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US); @@ -1700,7 +1652,6 @@ sal_Bool MozPluginTabPage::uninstallPlugin() return false; #endif } -//added by jmeng end /* -------------------------------------------------------------------------*/ @@ -1922,3 +1873,5 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index b0d47efe6141..a7f7816d2e0e 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,7 +200,7 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - sal_Bool ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + sal_Bool ConfirmLeave( const String& rStringSelection ); SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); @@ -277,7 +278,6 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; @@ -299,12 +299,9 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng end -#endif -/* -----------------------------20.06.01 16:32-------------------------------- +#endif - ---------------------------------------------------------------------------*/ #ifdef WNT #else #define HELPER_PAGE_COMPLETE @@ -338,3 +335,4 @@ public: #endif // #ifndef _SVX_OPTINET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index f4837b514483..ad77c8d33bd9 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -37,8 +37,6 @@ /* */ /************************************************************************/ -// added by jmeng begin - TabPage RID_SVXPAGE_INET_MOZPLUGIN { HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN"; @@ -63,8 +61,6 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN }; }; -//added by jmeng end - TabPage RID_SVXPAGE_INET_PROXY { HelpId = HID_OPTIONS_PROXY ; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 5c725bf14faf..14f122cfe78f 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "optjava.hxx" @@ -130,8 +128,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); m_aResetTimer.SetTimeout( RESET_TIMEOUT ); -//! m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) ); - static long aStaticTabs[]= { 5, 0, 15, 90, 130, 300 @@ -192,13 +188,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() JavaInfo* pInfo = *pIter; jfw_freeJavaInfo( pInfo ); } -/* - rtl_uString** pParamArr = m_parParameters; - for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) - rtl_uString_release( *pParamArr++ ); - rtl_freeMemory( m_parParameters ); - rtl_uString_release( m_pClassPath ); -*/ + jfw_unlock(); } @@ -253,7 +243,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG ) { Reference < XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); xFolderPicker = Reference< XFolderPicker >( - xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" ) ), UNO_QUERY ); + xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FolderPicker") ) ), UNO_QUERY ); String sWorkFolder = SvtPathOptions().GetWorkPath(); xFolderPicker->setDisplayDirectory( sWorkFolder ); @@ -531,11 +521,11 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) { bool bStartAgain = true; - sal_Int32 nPos = 0; JavaInfo* pInfo = NULL; javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo ); if ( JFW_E_NONE == eErr && pInfo ) { + sal_Int32 nPos = 0; bool bFound = false; JavaInfo** parInfo = m_parJavaInfo; for ( sal_Int32 i = 0; i < m_nInfoSize; ++i ) @@ -942,7 +932,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) String sFile = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); if ( !IsPathDuplicate( sURL ) ) { - sal_uInt16 nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL ) ); + sal_uInt16 nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL, false ) ); m_aPathList.SelectEntryPos( nPos ); } else @@ -980,7 +970,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG ) String sNewFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); if ( !IsPathDuplicate( sFolderURL ) ) { - sal_uInt16 nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL ) ); + sal_uInt16 nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL, false ) ); m_aPathList.SelectEntryPos( nPos ); } else @@ -1076,10 +1066,11 @@ void SvxJavaClassPathDlg::SetClassPath( const String& _rPath ) String sToken = _rPath.GetToken( 0, CLASSPATH_DELIMITER, nIdx ); INetURLObject aURL( sToken, INetURLObject::FSYS_DETECT ); String sPath = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); - m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL ) ); + m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL, false ) ); } // select first entry m_aPathList.SelectEntryPos(0); SelectHdl_Impl( NULL ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index c804b32c1c69..2c9681a29ce8 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,4 @@ public: #endif // #ifndef _SVX_OPTJAVA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 71d902719e55..900d7445fae3 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <unotools/searchopt.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> @@ -380,3 +378,4 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) ////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 85976b0d76dc..e8d5a7845aa7 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define _SVX_OPTJSEARCH_HXX_ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> class Window; @@ -91,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c20db45248c9..49899f3c62ae 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/msgbox.hxx> @@ -62,6 +60,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <unotools/extendedsecurityoptions.hxx> #include <svtools/svlbox.hxx> +#include <svtools/langhelp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/viewfrm.hxx> @@ -146,10 +145,11 @@ static sal_Int32 lcl_SeqGetEntryPos( return i < nLen ? i : -1; } -static void lcl_OpenURL( const ::rtl::OUString& rURL ) +static void lcl_OpenURL( ::rtl::OUString sURL ) { - if ( rURL.getLength() > 0 ) + if ( sURL.getLength() > 0 ) { + localizeWebserviceURI(sURL); try { uno::Reference< lang::XMultiServiceFactory > xSMGR = @@ -159,7 +159,7 @@ static void lcl_OpenURL( const ::rtl::OUString& rURL ) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), uno::UNO_QUERY_THROW ); if ( xSystemShell.is() ) - xSystemShell->execute( rURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); + xSystemShell->execute( sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); } catch( const uno::Exception& e ) { @@ -169,9 +169,6 @@ static void lcl_OpenURL( const ::rtl::OUString& rURL ) } } -/*-------------------------------------------------- ---------------------------------------------------*/ - static const sal_uInt16 nNameLen = 8; static sal_uInt16 pRanges[] = @@ -187,7 +184,7 @@ sal_Bool KillFile_Impl( const String& rURL ) try { Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { @@ -202,9 +199,7 @@ sal_Bool KillFile_Impl( const String& rURL ) return bRet; } -/* -----------------------------27.11.00 14:07-------------------------------- - ---------------------------------------------------------------------------*/ // 0x 0p 0t 0c nn // p: 1 -> parent // t: 1 -> spell, 2 -> hyph, 3 -> thes, 4 -> grammar @@ -242,8 +237,6 @@ public: }; -/*-------------------------------------------------- ---------------------------------------------------*/ // // User for user-dictionaries (XDictionary interface) // @@ -298,7 +291,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) pItem->SetStateChecked(); else pItem->SetStateUnchecked(); - //InvalidateEntry( pEntry ); } } @@ -333,10 +325,6 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, rDev.SetFont( aOldFont ); } - -/*-------------------------------------------------- ---------------------------------------------------*/ - class OptionsBreakSet : public ModalDialog { OKButton aOKPB; @@ -404,7 +392,7 @@ static const char * aEidToPropName[] = static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId ) { - DBG_ASSERT( (unsigned int) eEntryId < sizeof(aEidToPropName) / sizeof(aEidToPropName[0]), "index out of range" ); + DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" ); return String::CreateFromAscii( aEidToPropName[ (int) eEntryId ] ); } @@ -459,7 +447,6 @@ void OptionsUserData::SetChecked( sal_Bool bVal ) void OptionsUserData::SetNumericValue( sal_uInt8 nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -500,8 +487,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// sal_Bool bFett = sal_True; -// sal_uInt16 nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (sal_uLong) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -512,9 +497,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); - rDev.SetFont( aOldFont ); } } @@ -573,7 +555,7 @@ public: void SetChecked( const Sequence< OUString > &rConfiguredServices ); void Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ); - const Sequence<Locale> & GetAllSupportedLocales() { return aAllServiceLocales; } + const Sequence<Locale> & GetAllSupportedLocales() const { return aAllServiceLocales; } const LangImplNameTable & GetSpellTable() const { return aCfgSpellTable; } LangImplNameTable & GetSpellTable() { return aCfgSpellTable; } @@ -708,9 +690,7 @@ void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& for(i = 0; i < nFound; i++) pAllLocales2[nLength++] = pLocToAdd[i]; } -/* -----------------------------27.11.00 16:48-------------------------------- - ---------------------------------------------------------------------------*/ void lcl_MergeDisplayArray( SvxLinguData_Impl &rData, const ServiceInfo_Impl &rToAdd ) @@ -765,9 +745,7 @@ void lcl_MergeDisplayArray( rData.GetDisplayServiceArray().push_back( rToAdd ); rData.SetDisplayServiceCount( nCnt + 1 ); } -/* -----------------------------26.11.00 18:07-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl::SvxLinguData_Impl() : nDisplayServices (0) { @@ -910,9 +888,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : } } } -/* -----------------------------22.05.01 10:43-------------------------------- ----------------------------------------------------------------------------*/ SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) : aDisplayServiceArr (rData.aDisplayServiceArr), nDisplayServices (rData.nDisplayServices), @@ -925,9 +901,7 @@ SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) : xLinguSrvcMgr (rData.xLinguSrvcMgr) { } -/* -----------------------------22.05.01 10:43-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rData) { xMSF = rData.xMSF; @@ -941,15 +915,11 @@ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rDat nDisplayServices = rData.nDisplayServices; return *this; } -/* -----------------------------26.11.00 18:08-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl::~SvxLinguData_Impl() { } -/* -----------------------------26.11.00 19:42-------------------------------- - ---------------------------------------------------------------------------*/ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices) { const OUString* pConfiguredServices = rConfiguredServices.getConstArray(); @@ -975,9 +945,6 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices } } } -/* -----------------------------26.11.00 20:43-------------------------------- - - ---------------------------------------------------------------------------*/ sal_Bool SvxLinguData_Impl::AddRemove( Sequence< OUString > &rConfigured, @@ -1170,7 +1137,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); } else @@ -1358,7 +1325,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) for (sal_uLong i = 0; i < nEntries; ++i) { sal_Int32 nDics = aDics.getLength(); -// const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); @@ -1386,7 +1352,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } } - // + aActiveDics.realloc( nActiveDics ); Any aTmp; aTmp <<= aActiveDics; @@ -1460,11 +1426,9 @@ sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > & { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); -// sal_uLong nUserData = 0; sal_Bool bChecked = rxDic->isActive(); sal_Bool bEditable = !xStor.is() || !xStor->isReadonly(); sal_Bool bDeletable = bEditable; -// sal_Bool bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1578,9 +1542,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal; -// const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); -// if (pItem) -// bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_GRAMMAR_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1782,7 +1743,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) AddDicBoxEntry( xNewDic, (sal_uInt16) nLen ); } - delete aDlg; //add by CHINA001 + delete aDlg; } } else if (&aLinguDicsEditPB == pBtn) @@ -1881,7 +1842,6 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) DBG_ASSERT( pEntry, "no entry selected" ); if (pEntry) { - long nVal = -1; OptionsUserData aData( (sal_uLong)pEntry->GetUserData() ); if(aData.HasNumericValue()) { @@ -1892,14 +1852,14 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break; default: - DBG_ERROR( "unexpected case" ); + OSL_FAIL( "unexpected case" ); } OptionsBreakSet aDlg( this, nRID ); aDlg.GetNumericFld().SetValue( aData.GetNumericValue() ); if (RET_OK == aDlg.Execute() ) { - nVal = static_cast<long>(aDlg.GetNumericFld().GetValue()); + long nVal = static_cast<long>(aDlg.GetNumericFld().GetValue()); if (-1 != nVal && aData.GetNumericValue() != nVal) { aData.SetNumericValue( (sal_uInt8)nVal ); //! sets IsModified ! @@ -1912,7 +1872,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; @@ -1948,7 +1908,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -1989,7 +1949,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aLinguModulesFT.GetPosPixel().Y(); DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" ); Point aPos; - // + aPos = aLinguDicsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsFT.SetPosPixel( aPos ); @@ -2005,7 +1965,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguDicsDelPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsDelPB.SetPosPixel( aPos ); - // + aPos = aLinguOptionsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsFT.SetPosPixel( aPos ); @@ -2015,7 +1975,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguOptionsEditPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsEditPB.SetPosPixel( aPos ); - // + Size aSize( aLinguOptionsCLB.GetSizePixel() ); aSize.Height() += nDeltaY; aLinguOptionsCLB.SetSizePixel( aSize ); @@ -2030,8 +1990,6 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) } } } -/*-------------------------------------------------- ---------------------------------------------------*/ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) : ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ), @@ -2075,7 +2033,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); } else @@ -2141,9 +2099,6 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) return pEntry; } -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { if (&aModulesCLB == pBox) @@ -2174,18 +2129,14 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; } -/* -----------------------------28.05.01 11:00-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { -// if (pBox == (SvTreeListBox *) &aModulesCLB) -// { pBox = &aModulesCLB; SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) @@ -2211,12 +2162,9 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } -// } return 0; } -/* -----------------------------27.11.00 14:00-------------------------------- - ---------------------------------------------------------------------------*/ OUString lcl_GetServiceName(sal_uInt8 nType) { switch(nType) @@ -2237,7 +2185,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2303,8 +2250,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; - sal_uLong n; ServiceInfo_Impl* pInfo; @@ -2316,7 +2261,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) String(), sal_True, sal_False, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); sal_uLong nNames = (sal_uLong) aNames.getLength(); @@ -2360,7 +2305,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2404,7 +2349,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2448,7 +2393,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2489,9 +2434,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aLastLocale.Country = aCurLocale.Country; return 0; } -/* -----------------------------27.11.00 19:50-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; @@ -2520,9 +2463,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) } return 0; } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) { if (&aClosePB == pBtn) @@ -2533,14 +2474,12 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; } -/* -----------------------------27.11.00 20:31-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG ) { rLinguData = *pDefaultLinguData; @@ -2557,3 +2496,4 @@ IMPL_LINK( SvxEditModulesDlg, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 65e340b1fda6..beb0d062d60e 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svtools/langtab.hxx> #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> @@ -61,7 +60,6 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <cuires.hrc> #include "optmemory.hrc" #include "optmemory.hxx" #include <svx/ofaitem.hxx> @@ -269,3 +267,4 @@ IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index d93c2fa98042..6b9c11000b1a 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index bc2bd9ef55b4..a3a30c1e13db 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svx/svxdlg.hxx> @@ -121,7 +119,7 @@ struct Handle2CfgNameMapping_Impl const char* m_pCfgName; }; -static Handle2CfgNameMapping_Impl __READONLY_DATA Hdl2CfgMap_Impl[] = +static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] = { { SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" }, { SvtPathOptions::PATH_AUTOTEXT, "AutoText" }, @@ -352,8 +350,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr ); if ( bReadOnly ) { - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage, BMP_COLOR_NORMAL ); - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImageHC, BMP_COLOR_HIGHCONTRAST ); + pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); } PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); pPathImpl->sUserPath = sUser; @@ -404,11 +401,6 @@ void SvxPathTabPage::FillUserData() // ----------------------------------------------------------------------- IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) - -/* [Beschreibung] - -*/ - { sal_uInt16 nSelCount = 0; SvLBoxEntry* pEntry = pPathBox->FirstSelected(); @@ -506,7 +498,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // old path is an URL? INetURLObject aObj( sWritable ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); rtl::OUString aPathStr( _rFolder ); INetURLObject aNewObj( aPathStr ); aNewObj.removeFinalSlash(); @@ -514,7 +506,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // then the new path also an URL else system path String sNewPathStr = bURL ? aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - FASTBOOL bChanged = + bool bChanged = #ifdef UNX // Unix is case sensitive ( sNewPathStr != sWritable ); @@ -856,3 +848,4 @@ void SvxPathTabPage::SetPathList( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 6adf8fa875ce..c6400a2246ba 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -88,11 +88,6 @@ TabPage RID_SFXPAGE_PATH ImageBitmap = Bitmap { File = "lock.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image IMG_LOCK_HC - { - ImageBitmap = Bitmap { File = "lock_hc.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; String STR_MULTIPATHDLG { Text [ en-US ] = "Edit Paths: %1" ; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index c8282edf0157..c0747362a64d 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svl/eitem.hxx> @@ -40,14 +38,10 @@ #include "optsave.hxx" #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequenceasvector.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/saveopt.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <com/sun/star/container/XContainerQuery.hpp> -#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainerQuery.hpp> @@ -57,7 +51,6 @@ #include <sfx2/docfilt.hxx> #include <svtools/stdctrl.hxx> #include <vcl/fixed.hxx> -#include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> #include <unotools/optionsdlg.hxx> @@ -72,69 +65,13 @@ using namespace comphelper; using rtl::OUString; #define C2U(cChar) OUString::createFromAscii(cChar) -#define C2S(cChar) String( RTL_CONSTASCII_STRINGPARAM(cChar) ) +#define C2S(cChar) String( RTL_CONSTASCII_USTRINGPARAM(cChar) ) #define CFG_PAGE_AND_GROUP C2S("General"), C2S("LoadSave") // !! you have to update these index, if you changed the list of the child windows !! #define WININDEX_AUTOSAVE ((sal_uInt16)6) #define WININDEX_SAVEURL_RELFSYS ((sal_uInt16)9) // ---------------------------------------------------------------------- -#ifdef FILTER_WARNING_ENABLED -class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem -{ - sal_Bool bWarning; - com::sun::star::uno::Sequence< OUString > aPropNames; - - public: - SvxAlienFilterWarningConfig_Impl(); - ~SvxAlienFilterWarningConfig_Impl(); - - virtual void Commit(); - - void ResetWarning() - { - if(bWarning) - { - bWarning = sal_False; - ConfigItem::SetModified(); - } - - } - sal_Bool IsWarning()const{return bWarning;} -}; -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::SvxAlienFilterWarningConfig_Impl() : - ConfigItem(C2U("TypeDetection.Misc/Defaults"), - CONFIG_MODE_IMMEDIATE_UPDATE), - aPropNames(1), - bWarning(sal_True) -{ - aPropNames.getArray()[0] = C2U("ShowAlienFilterWarning"); - Sequence<Any> aValues = GetProperties(aPropNames); - const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed"); - if(aValues.getLength() == aPropNames.getLength() && - pValues[0].hasValue() && - pValues[0].getValueType() == ::getBooleanCppuType()) - bWarning = *(sal_Bool*)pValues[0].getValue(); -} -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::~SvxAlienFilterWarningConfig_Impl() -{ - if(IsModified()) - Commit(); -} -// ---------------------------------------------------------------------- -void SvxAlienFilterWarningConfig_Impl::Commit() -{ - Sequence<Any> aValues(aPropNames.getLength()); - Any* pValues = aValues.getArray(); - pValues[0].setValue(&bWarning, ::getBooleanCppuType()); - PutProperties(aPropNames, aValues); -} -#endif // FILTER_WARNING_ENABLED -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- struct SvxSaveTabPage_Impl { @@ -195,9 +132,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : pImpl ( new SvxSaveTabPage_Impl ) { - sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - aODFWarningFI.SetImage( - Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) ); + aODFWarningFI.SetImage( Image( CUI_RES( IMG_ODF_WARNING ))); FreeResource(); @@ -294,26 +229,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent, } // ----------------------------------------------------------------------- -bool SfxSaveTabPage::AcceptFilter( sal_uInt16 nPos ) -{ - const OUString* pFilters = pImpl->aFilterArr[nPos].getConstArray(); - sal_Bool bAlien = sal_False, bODF = sal_False; - OUString* pUIFilters = pImpl->aUIFilterArr[nPos].getArray(); - OUString sUIName; - for(int nFilter = 0; nFilter < pImpl->aFilterArr[nPos].getLength(); nFilter++) - { - if( pImpl->aDefaultArr[nPos] == pFilters[nFilter] ) - { - bAlien = pImpl->aAlienArr[nPos][nFilter]; - bODF = pImpl->aODFArr[nPos][nFilter]; - sUIName = pUIFilters[nFilter];; - break; - } - } - bool bSet = true; - return bSet; -} -// ----------------------------------------------------------------------- void SfxSaveTabPage::DetectHiddenControls() { long nDelta = 0; @@ -430,38 +345,31 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) SvtModuleOptions aModuleOpt; if(pImpl->aDefaultArr[APP_MATH].getLength() && - pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH) && - AcceptFilter( APP_MATH )) + pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_MATH, pImpl->aDefaultArr[APP_MATH]); if( pImpl->aDefaultArr[APP_DRAW].getLength() && - pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW) && - AcceptFilter( APP_DRAW )) + pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_DRAW, pImpl->aDefaultArr[APP_DRAW]); if(pImpl->aDefaultArr[APP_IMPRESS].getLength() && - pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)&& - AcceptFilter( APP_IMPRESS )) + pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS, pImpl->aDefaultArr[APP_IMPRESS]); if(pImpl->aDefaultArr[APP_CALC].getLength() && - pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)&& - AcceptFilter( APP_CALC )) + pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_CALC, pImpl->aDefaultArr[APP_CALC]); if(pImpl->aDefaultArr[APP_WRITER].getLength() && - pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)&& - AcceptFilter( APP_WRITER)) + pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITER, pImpl->aDefaultArr[APP_WRITER]); if(pImpl->aDefaultArr[APP_WRITER_WEB].getLength() && - pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)&& - AcceptFilter( APP_WRITER_WEB )) + pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB, pImpl->aDefaultArr[APP_WRITER_WEB]); if(pImpl->aDefaultArr[APP_WRITER_GLOBAL].getLength() && - pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)&& - AcceptFilter( APP_WRITER_GLOBAL )) + pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); return bModified; @@ -542,7 +450,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; - default: DBG_ERROR("illegal user data"); + default: OSL_FAIL("illegal user data"); } String sTmp(sCommand); sTmp.SearchAndReplaceAscii("%1", sReplace); @@ -554,10 +462,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) while(xList->hasMoreElements()) { SequenceAsHashMap aFilter(xList->nextElement()); - OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Name"),OUString()); + OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); if (sFilter.getLength()) { - sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Flags"),sal_Int32()); + sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); lList.push_back(sFilter); lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN)); lODFList.push_back( isODFFormat( sFilter ) ); @@ -588,7 +496,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } aDocInfoCB.Check(aSaveOpt.IsDocInfoSave()); -// aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aBackupCB.Check(aSaveOpt.IsBackup()); sal_Bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); @@ -598,22 +505,16 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aAutoSaveCB.Check(aSaveOpt.IsAutoSave()); aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat()); aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)); -// aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)); // the pretty printing aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting()); -// aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING )); - aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() ); -// aAutoSaveEdit.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)); // relativ speichern aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() ); -// aRelativeFsysCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)); aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() ); -// aRelativeInetCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET)); void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() ); aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) ); @@ -627,7 +528,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -644,21 +544,17 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); } } return 0; } -/* -----------------------------05.04.01 13:10-------------------------------- - ---------------------------------------------------------------------------*/ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) { OUString sRet; @@ -669,7 +565,6 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) if(!pProperties[nProp].Name.compareToAscii("UIName")) { pProperties[nProp].Value >>= sRet; -//! break; } else if(!pProperties[nProp].Name.compareToAscii("Flags")) { @@ -685,9 +580,7 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) } return sRet; } -/* -----------------------------05.04.01 13:37-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) { sal_uInt16 nCurPos = aDocTypeLB.GetSelectEntryPos(); @@ -777,3 +670,4 @@ IMPL_LINK( SfxSaveTabPage, ODFVersionHdl_Impl, ListBox *, EMPTYARG ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc index 4cbdc0e2db4b..f0fcbe982822 100644 --- a/cui/source/options/optsave.hrc +++ b/cui/source/options/optsave.hrc @@ -59,7 +59,6 @@ #define FI_ODF_WARNING 50 #define IMG_ODF_WARNING 1 -#define IMG_ODF_WARNING_HC 2 #define APP_WRITER 0 #define APP_WRITER_WEB 1 diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 94f246ac0102..509221cd66f5 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,7 +88,6 @@ private: DECL_LINK( FilterHdl_Impl, ListBox * ); DECL_LINK( ODFVersionHdl_Impl, ListBox * ); - bool AcceptFilter( sal_uInt16 nPos ); void DetectHiddenControls(); #endif @@ -103,3 +103,4 @@ public: #endif // #ifndef _SVX_OPTSAVE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index 35ca394e2e57..91c301c27375 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -94,14 +94,14 @@ TabPage RID_SFXPAGE_SAVE { HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE"; Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + Size = MAP_APPFONT ( 193 , 10 ) ; Text [ en-US ] = "Save ~AutoRecovery information every" ; }; NumericField ED_AUTOSAVE { HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE"; Border = TRUE ; - Pos = MAP_APPFONT ( 180 , 62 ) ; + Pos = MAP_APPFONT ( 210 , 61 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE }; FixedText FT_MINUTE { - Pos = MAP_APPFONT ( 204 , 63 ) ; + Pos = MAP_APPFONT ( 234 , 63 ) ; Size = MAP_APPFONT ( 35 , 8 ) ; Text [ en-US ] = "Minutes" ; }; @@ -241,14 +241,6 @@ TabPage RID_SFXPAGE_SAVE }; MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; }; - Image IMG_ODF_WARNING_HC - { - ImageBitmap = Bitmap - { - File = "odfwarning_h.png"; - }; - MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; - }; }; ModalDialog RID_SVXDLG_FILTER_WARNING diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index 8072c8ff6e23..80a9e974017d 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -58,8 +58,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 115 , 66 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ Text [ en-US ] = "Dictionaries" ; }; CheckBox BTN_CAPS @@ -67,8 +65,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS"; Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ Text [ en-US ] = "~Capital words" ; TabStop = TRUE ; }; @@ -77,8 +73,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ Text [ en-US ] = "~Words with numbers " ; TabStop = TRUE ; }; @@ -87,8 +81,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ Text [ en-US ] = "~Case sensitive " ; TabStop = TRUE ; }; @@ -96,8 +88,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 71 ) ; Size = MAP_APPFONT ( 115 , 53 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ Text [ en-US ] = "Check" ; }; }; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 064199a5d929..adcca4524532 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> @@ -410,3 +408,4 @@ void SvxOnlineUpdateTabPage::CalcButtonWidth() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index ca75c921890f..c9846d5931b7 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <com/sun/star/container/XNameReplace.hpp> // class SvxPathTabPage -------------------------------------------------- @@ -79,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index b7ec9164c3d8..06c0352864c0 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "radiobtnbox.hxx" @@ -113,3 +111,4 @@ const Point& SvxRadioButtonListBox::GetCurMousePoint() const } // end of namespace ::svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index e7cc2836a8a8..b481c631b165 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,33 +26,21 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <readonlyimage.hxx> #include <vcl/help.hxx> #include <dialmgr.hxx> #include <cuires.hrc> -/*-- 26.02.2004 13:31:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) : FixedImage(pParent, rResId) { - sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); - SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ))); + SetImage( Image(CUI_RES( RID_SVXBMP_LOCK ))); } -/*-- 26.02.2004 13:31:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ ReadOnlyImage::~ReadOnlyImage() { } -/*-- 26.02.2004 13:31:04--------------------------------------------------- - -----------------------------------------------------------------------*/ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) { if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() ) @@ -71,11 +60,10 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -/*-- 26.02.2004 14:20:21--------------------------------------------------- - - -----------------------------------------------------------------------*/ const String& ReadOnlyImage::GetHelpTip() { static String aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP)); return aStr; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx index 357813534c69..460d744433d0 100644 --- a/cui/source/options/readonlyimage.hxx +++ b/cui/source/options/readonlyimage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ public: }; #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index bd63c32771e7..6adcd4986ecd 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -25,8 +25,6 @@ * ************************************************************************/ - // include --------------------------------------------------------------- - #include <cuires.hrc> String RID_SVXSTR_READONLY_CONFIG_TIP @@ -41,12 +39,3 @@ Image RID_SVXBMP_LOCK }; MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; }; -Image RID_SVXBMP_LOCK_HC -{ - ImageBitmap = Bitmap - { - File = "lock_hc.bmp"; - }; - MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; -}; - diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 0408c5ecabe3..86e4ec494426 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "sdbcdriverenum.hxx" #include <comphelper/stl_types.hxx> #include <comphelper/processfactory.hxx> @@ -63,7 +62,7 @@ namespace offapp try { Reference< XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory(); - Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager")); + Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager") ) ); OSL_ENSURE(xDM.is(), "ODriverEnumerationImpl::ODriverEnumerationImpl: no access to the SDBC driver manager!"); Reference< XEnumerationAccess > xEnumAccess(xDM, UNO_QUERY); @@ -120,3 +119,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index 4c5471f2280d..d590c8217ed1 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ namespace offapp #endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index af21c9e8e5ee..ee1c482e091f 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/securityoptions.hxx> @@ -102,3 +100,4 @@ SecurityOptionsDialog::~SecurityOptionsDialog() } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index ac3bfe69e913..5c91d3f375c5 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace svx #endif // #ifndef _SVX_SECURITYOPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index de26a157e21b..0953fe83b921 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> @@ -287,9 +286,6 @@ static sal_uInt16 getGroupNodeId( const rtl::OUString& rModule ) return nNodeId; } -/*-- 29.10.2004 13:57:25--------------------------------------------------- - - -----------------------------------------------------------------------*/ class MailMergeCfg_Impl : public utl::ConfigItem { friend class SvxEMailTabPage; @@ -306,9 +302,7 @@ public: sal_Bool IsEmailSupported() const {return bIsEmailSupported;} }; -/*-- 29.10.2004 13:57:25--------------------------------------------------- - -----------------------------------------------------------------------*/ MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem(C2U("Office.Writer/MailMergeWizard")), bIsEmailSupported(sal_False) @@ -320,9 +314,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() : if(aValues.getLength() && pValues[0].hasValue()) pValues[0] >>= bIsEmailSupported; } -/*-- 29.10.2004 13:57:25--------------------------------------------------- - -----------------------------------------------------------------------*/ MailMergeCfg_Impl::~MailMergeCfg_Impl() { } @@ -367,9 +359,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break; case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; - //added by jmeng begin case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break; - //added by jmeng end case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; @@ -388,7 +378,7 @@ struct OptionsMapping_Impl sal_uInt16 m_nPageId; }; -static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] = +static OptionsMapping_Impl const OptionsMap_Impl[] = { // GROUP PAGE PAGE-ID { "ProductName", NULL, SID_GENERAL_OPTIONS }, @@ -451,8 +441,10 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] = { "Calc", "View", SID_SC_TP_CONTENT }, { "Calc", "International", RID_OFA_TP_INTERNATIONAL }, { "Calc", "Calculate", SID_SC_TP_CALC }, + { "Calc", "Formula", SID_SC_TP_FORMULA }, { "Calc", "SortLists", SID_SC_TP_USERLISTS }, { "Calc", "Changes", SID_SC_TP_CHANGES }, + { "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY }, { "Calc", "Grid", SID_SC_TP_GRID }, { "Calc", "Print", RID_SC_TP_PRINT }, { "Impress", NULL, SID_SD_EDITOPTIONS }, @@ -508,9 +500,6 @@ static sal_Bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogO return bIsHidden; } -/* -----------------11.02.99 09:56------------------- - * - * --------------------------------------------------*/ struct OptionsPageInfo { SfxTabPage* m_pPage; @@ -540,9 +529,6 @@ struct OptionsGroupInfo ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; -/* -----------------04.05.99 15:51------------------- - * - * --------------------------------------------------*/ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) { bInCollapse = sal_True; @@ -620,10 +606,6 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString ActivateLastSelection(); } -/* -----------------11.02.99 07:58------------------- - * - * --------------------------------------------------*/ - OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { SvLBoxEntry* pEntry = aTreeLB.First(); @@ -681,9 +663,6 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog() deleteGroupNames(); } -/* -----------------11.02.99 08:21------------------- - * - * --------------------------------------------------*/ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ) { @@ -695,9 +674,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( return pPageInfo; } -/* -----------------11.02.99 10:02------------------- - * der ItemSet* geht in den Besitz des Dialogs - * --------------------------------------------------*/ +// der ItemSet* geht in den Besitz des Dialogs sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, SfxShell* pCreateShell, SfxModule* pCreateModule, @@ -718,9 +695,6 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, return nRet - 1; } -/* -----------------11.02.99 10:31------------------- - * - * --------------------------------------------------*/ IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) { if ( aSelectTimer.GetTimeout() == SELECT_FIRST_TIMEOUT ) @@ -733,9 +707,7 @@ IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) return 0; } -/* -----------------11.02.99 10:49------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) { if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) ) @@ -755,9 +727,7 @@ IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) } return 0; } -/* -----------------11.02.99 16:45------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG ) { aTreeLB.EndSelection(); @@ -808,9 +778,7 @@ IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG ) return 0; } -/* -----------------17.02.99 09:15------------------- - * Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein - * --------------------------------------------------*/ +// Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); @@ -845,9 +813,6 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) return 0; } -/* -----------------11.02.99 10:49------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ApplyItemSets() { SvLBoxEntry* pEntry = aTreeLB.First(); @@ -872,7 +837,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() { aTreeLB.SetNodeDefaultImages(); aPageImages = ImageList( CUI_RES( RID_IMGLIST_TREEOPT ) ); - aPageImagesHC = ImageList( CUI_RES( RID_IMGLIST_TREEOPT_HC ) ); + aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT | @@ -891,9 +856,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aSelectTimer.SetTimeoutHdl( LINK( this, OfaTreeOptionsDialog, SelectHdl_Impl ) ); } -/* -----------------17.02.99 09:51------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId ) { bIsForSetDocumentLanguage = false; @@ -924,15 +886,12 @@ void OfaTreeOptionsDialog::ActivatePage( const String& rPageURL ) ActivateLastSelection(); } -/* -----------------16.02.99 13:17------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ActivateLastSelection() { SvLBoxEntry* pEntry = NULL; if ( pLastPageSaver ) { - String sExpand( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL ) ); + String sExpand( RTL_CONSTASCII_USTRINGPARAM( EXPAND_PROTOCOL ) ); String sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr : pLastPageSaver->m_sLastPageURL_Tools; if ( sLastURL.Len() == 0 ) @@ -1001,9 +960,6 @@ void OfaTreeOptionsDialog::ActivateLastSelection() aTreeLB.GrabFocus(); } -/* -----------------22.02.99 08:52------------------- - * - * --------------------------------------------------*/ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -1056,8 +1012,7 @@ void OfaTreeOptionsDialog::DataChanged( const DataChangedEvent& rDCEvt ) !aTreeLB.GetParent(pEntry)) { OptionsGroupInfo* pInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages; + ImageList* pImgLst = &aPageImages; for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) { if ( aHelpTextsArr.GetValue(i) == pInfo->m_nDialogId ) @@ -1314,8 +1269,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pEntry->GetUserData(); if ( pTGInfo->m_sPageURL.getLength() == 0 ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages; + ImageList* pImgLst = &aPageImages; //hier den Hilfetext anzeigen for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) { @@ -1423,10 +1377,6 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) return 0; } -/* -----------------11.02.99 15:51------------------- - * - * --------------------------------------------------*/ - OfaPageResource::OfaPageResource() : Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)), aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)), @@ -1457,30 +1407,30 @@ sal_Bool EnableSSO( void ) rtl::OUString theIniFile; osl_getExecutableFile( &theIniFile.pData ); theIniFile = theIniFile.copy( 0, theIniFile.lastIndexOf( '/' ) + 1 ) + - rtl::OUString::createFromAscii( SAL_CONFIGFILE( "configmgr" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "configmgr" )) ); ::rtl::Bootstrap theBootstrap( theIniFile ); rtl::OUString theOfflineValue; - rtl::OUString theDefaultOfflineValue = rtl::OUString::createFromAscii( "false" ); - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_Offline" ), + rtl::OUString theDefaultOfflineValue (RTL_CONSTASCII_USTRINGPARAM("false") ); + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_Offline") ), theOfflineValue, theDefaultOfflineValue ); rtl::OUString theServerTypeValue; - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_ServerType" ), + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_ServerType") ), theServerTypeValue ); rtl::OUString theBackendServiceTypeValue; - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_BackendService" ), + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_BackendService") ), theBackendServiceTypeValue ); sal_Bool bSSOEnabled = ( theOfflineValue == theDefaultOfflineValue && ( theServerTypeValue.getLength() == 0 || - theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) && + theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) && theBackendServiceTypeValue == - rtl::OUString::createFromAscii( - "com.sun.star.comp.configuration.backend.LdapSingleBackend" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.configuration.backend.LdapSingleBackend") ) ); if ( bSSOEnabled && GetSSOCreator() == 0 ) { bSSOEnabled = sal_False; @@ -1500,7 +1450,7 @@ CreateTabPage GetSSOCreator( void ) if( aModule.loadRelative( &thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) ) { - rtl::OUString theSymbolName( rtl::OUString::createFromAscii( "CreateSSOTabPage" ) ); + rtl::OUString theSymbolName( RTL_CONSTASCII_USTRINGPARAM("CreateSSOTabPage" ) ); theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName )); } } @@ -1730,7 +1680,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet default: { - DBG_ERROR( "Unhandled option in ApplyItemSet" ); + OSL_FAIL( "Unhandled option in ApplyItemSet" ); } break; } @@ -1747,8 +1697,8 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XPropertySet > xProp( - xMgr->createInstance( ::rtl::OUString::createFromAscii( - "com.sun.star.linguistic2.LinguProperties") ), + xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.linguistic2.LinguProperties") ) ), UNO_QUERY ); if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) ) { @@ -1983,21 +1933,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) DBG_ASSERT( sTemp == aFactory, "S H I T!!!" ); // Writer and Writer/Web options - sal_Bool bHasAnyFilter = sal_False; SvtModuleOptions aModuleOpt; if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) { // Textdokument - bHasAnyFilter = sal_True; ResStringArray& rTextArray = aDlgResource.GetTextArray(); - if ( aFactory.equalsAscii( "com.sun.star.text.TextDocument" ) - || aFactory.equalsAscii( "com.sun.star.text.WebDocument" ) - || aFactory.equalsAscii( "com.sun.star.text.GlobalDocument" ) ) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) + || aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) + || aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ) { SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER)); if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { - if ( aFactory.equalsAscii( "com.sun.star.text.WebDocument" ) ) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) setGroupName( C2U("WriterWeb"), rTextArray.GetString(0) ); else setGroupName( C2U("Writer"), rTextArray.GetString(0) ); @@ -2038,8 +1986,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Calc options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) { - bHasAnyFilter = sal_True; - if ( aFactory.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) )) { if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2066,8 +2013,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) ); if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) { - bHasAnyFilter = sal_True; - if ( aFactory.equalsAscii( "com.sun.star.presentation.PresentationDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) )) { if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2091,7 +2037,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Draw options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) { - if ( aFactory.equalsAscii( "com.sun.star.drawing.DrawingDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) )) { if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { @@ -2115,7 +2061,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Math options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) { - if ( aFactory.equalsAscii( "com.sun.star.formula.FormulaProperties" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) )) { if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2685,7 +2631,7 @@ short OfaTreeOptionsDialog::Execute() } } - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + utl::ConfigManager::GetConfigManager().StoreConfigItems(); } return nRet; @@ -2831,3 +2777,5 @@ void ExtensionsTabPage::SavePage() { DispatchAction( C2U("ok") ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index a01237ee9844..a2be7386d1e9 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -240,8 +240,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "View" ; SID_SC_TP_CONTENT ;> ; < "International" ; RID_OFA_TP_INTERNATIONAL ;> ; < "Calculate" ; SID_SC_TP_CALC ;> ; + < "Formula" ; SID_SC_TP_FORMULA ;> ; < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ; < "Changes" ; SID_SC_TP_CHANGES ;> ; + < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ; < "Grid" ; SID_SC_TP_GRID ;> ; < "Print" ; RID_SC_TP_PRINT ;> ; }; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 892332a49b26..dcd2afa7140b 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,10 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> #include <cuires.hrc> +#include <sal/macros.h> #include <com/sun/star/task/UrlRecord.hpp> #include <com/sun/star/task/XPasswordContainer.hpp> #include <com/sun/star/task/XMasterPasswordHandling.hpp> @@ -127,7 +126,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) : long nBtnTextWidth = 0; Window* pButtons[] = { &m_aRemoveBtn, &m_aRemoveAllBtn, &m_aChangeBtn }; Window** pButton = pButtons; - const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] ); + const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons ); for ( ; i < nBCount; ++i, ++pButton ) { long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() ); @@ -207,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName; SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -226,7 +225,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } } @@ -370,3 +369,4 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index bf84cfd91835..b5ad4a3777ba 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ namespace svx #endif // #ifndef _SVX_WEBCONNINFO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index d50ee7b5752d..be1deaafa3f6 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "align.hxx" @@ -40,6 +38,7 @@ #include <svx/algitem.hxx> #include <editeng/frmdiritem.hxx> +#include <editeng/justifyitem.hxx> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <tools/shl.hxx> @@ -49,9 +48,9 @@ #include <svl/cjkoptions.hxx> #include <svl/languageoptions.hxx> #include <svtools/localresaccess.hxx> -#include <svx/flagsdef.hxx> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svx/flagsdef.hxx> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> namespace svx { @@ -70,6 +69,7 @@ static const HorJustConnection::MapEntryType s_pHorJustMap[] = { ALIGNDLG_HORALIGN_RIGHT, SVX_HOR_JUSTIFY_RIGHT }, { ALIGNDLG_HORALIGN_BLOCK, SVX_HOR_JUSTIFY_BLOCK }, { ALIGNDLG_HORALIGN_FILL, SVX_HOR_JUSTIFY_REPEAT }, + { ALIGNDLG_HORALIGN_DISTRIBUTED, SVX_HOR_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_HOR_JUSTIFY_STANDARD } }; @@ -84,6 +84,8 @@ static const VerJustConnection::MapEntryType s_pVerJustMap[] = { ALIGNDLG_VERALIGN_TOP, SVX_VER_JUSTIFY_TOP }, { ALIGNDLG_VERALIGN_MID, SVX_VER_JUSTIFY_CENTER }, { ALIGNDLG_VERALIGN_BOTTOM, SVX_VER_JUSTIFY_BOTTOM }, + { ALIGNDLG_VERALIGN_BLOCK, SVX_VER_JUSTIFY_BLOCK }, + { ALIGNDLG_VERALIGN_DISTRIBUTED, SVX_VER_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_VER_JUSTIFY_STANDARD } }; @@ -118,6 +120,48 @@ static sal_uInt16 s_pRanges[] = // ============================================================================ +namespace { + +template<typename _JustContainerType, typename _JustEnumType> +void lcl_MaybeResetAlignToDistro( + ListBox& rLB, USHORT nListPos, const SfxItemSet& rCoreAttrs, USHORT nWhichAlign, USHORT nWhichJM, _JustEnumType eBlock) +{ + const SfxPoolItem* pItem; + if (rCoreAttrs.GetItemState(nWhichAlign, TRUE, &pItem) != SFX_ITEM_SET) + // alignment not set. + return; + + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + _JustContainerType eVal = static_cast<_JustContainerType>(p->GetEnumValue()); + if (eVal != eBlock) + // alignment is not 'justify'. No need to go further. + return; + + if (rCoreAttrs.GetItemState(nWhichJM, TRUE, &pItem) != SFX_ITEM_SET) + // justification method is not set. + return; + + p = static_cast<const SfxEnumItem*>(pItem); + SvxCellJustifyMethod eMethod = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + if (eMethod == SVX_JUSTIFY_METHOD_DISTRIBUTE) + // Select the 'distribute' entry in the specified list box. + rLB.SelectEntryPos(nListPos); +} + +void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, USHORT nWhichJM, const ListBox& rLB, USHORT nListPos) +{ + SvxCellJustifyMethod eJM = SVX_JUSTIFY_METHOD_AUTO; + if (rLB.GetSelectEntryPos() == nListPos) + eJM = SVX_JUSTIFY_METHOD_DISTRIBUTE; + + SvxJustifyMethodItem aItem(eJM, nWhichJM); + rSet.Put(aItem); +} + +} + +// ============================================================================ + AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ), @@ -174,7 +218,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr maLbFrameDir.Hide(); } - // diese Page braucht ExchangeSupport + // This page needs ExchangeSupport. SetExchangeSupport(); FreeResource(); @@ -217,9 +261,43 @@ sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } +BOOL AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +{ + bool bChanged = SfxTabPage::FillItemSet(rSet); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + USHORT nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichHorJM); + + USHORT nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichVerJM); + + return bChanged; +} + void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) { SfxTabPage::Reset( rCoreAttrs ); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>( + maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD), + SVX_HOR_JUSTIFY_BLOCK); + + lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>( + maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD), + SVX_VER_JUSTIFY_BLOCK); + UpdateEnableControls(); } @@ -245,7 +323,7 @@ void AlignmentTabPage::InitVsRefEgde() // remember selection - is deleted in call to ValueSet::Clear() sal_uInt16 nSel = maVsRefEdge.GetSelectItemId(); - ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() ); + ResId aResId( IL_LOCK_BMPS, CUI_MGR() ); ImageList aImageList( aResId ); Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() ); @@ -268,6 +346,7 @@ void AlignmentTabPage::UpdateEnableControls() bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT); bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK); bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL); + bool bHorDist = (nHorAlign == ALIGNDLG_HORALIGN_DISTRIBUTED); // indent edit field only for left alignment maFtIndent.Enable( bHorLeft ); @@ -279,8 +358,8 @@ void AlignmentTabPage::UpdateEnableControls() // hyphenation only for automatic line breaks or for block alignment maBtnHyphen.Enable( maBtnWrap.IsChecked() || bHorBlock ); - // shrink only without automatic line break, and not for block and fill - maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill ); + // shrink only without automatic line break, and not for block, fill or distribute. + maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill && !bHorDist ); // visibility of fixed lines maFlAlignment.Show( maLbHorAlign.IsVisible() || maEdIndent.IsVisible() || maLbVerAlign.IsVisible() ); @@ -288,6 +367,27 @@ void AlignmentTabPage::UpdateEnableControls() maFlProperties.Show( maBtnWrap.IsVisible() || maBtnHyphen.IsVisible() || maBtnShrink.IsVisible() || maLbFrameDir.IsVisible() ); } +bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const +{ + const SfxItemSet& rOld = GetItemSet(); + const SfxPoolItem* pItem; + SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO; + SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO; + if (rOld.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + if (rNew.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + return eMethodOld != eMethodNew; +} + IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) { UpdateEnableControls(); @@ -298,3 +398,4 @@ IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index f67d3f666bae..133064889e9e 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -63,15 +63,17 @@ #define ALIGNDLG_HORALIGN_RIGHT 3 #define ALIGNDLG_HORALIGN_BLOCK 4 #define ALIGNDLG_HORALIGN_FILL 5 +#define ALIGNDLG_HORALIGN_DISTRIBUTED 6 -#define ALIGNDLG_VERALIGN_STD 0 -#define ALIGNDLG_VERALIGN_TOP 1 -#define ALIGNDLG_VERALIGN_MID 2 -#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_STD 0 +#define ALIGNDLG_VERALIGN_TOP 1 +#define ALIGNDLG_VERALIGN_MID 2 +#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_BLOCK 4 +#define ALIGNDLG_VERALIGN_DISTRIBUTED 5 // image list for ValueSets: #define IL_LOCK_BMPS 1100 -#define IL_LOCK_BMPS_HC 1101 #define IID_BOTTOMLOCK 1 #define IID_TOPLOCK 2 #define IID_CELLLOCK 3 diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index acaa9234b87d..05d4b39d6767 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -71,6 +71,7 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Right" ; ALIGNDLG_HORALIGN_RIGHT ; > ; < "Justified" ; ALIGNDLG_HORALIGN_BLOCK ; > ; < "Filled" ; ALIGNDLG_HORALIGN_FILL ; > ; + < "Distributed" ; ALIGNDLG_HORALIGN_DISTRIBUTED ; > ; }; }; FixedText FT_INDENT @@ -112,6 +113,8 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Top" ; ALIGNDLG_VERALIGN_TOP ; > ; < "Middle" ; ALIGNDLG_VERALIGN_MID ; > ; < "Bottom" ; ALIGNDLG_VERALIGN_BOTTOM ; > ; + < "Justified" ; ALIGNDLG_VERALIGN_BLOCK ; > ; + < "Distributed" ; ALIGNDLG_VERALIGN_DISTRIBUTED ; > ; }; }; FixedLine FL_ORIENTATION @@ -229,18 +232,6 @@ TabPage RID_SVXPAGE_ALIGNMENT }; IdCount = { 3 ; }; }; - ImageList IL_LOCK_BMPS_HC - { - Prefix = "loh"; - MaskColor = IL_LOCK_MCOL ; - IdList = - { - IID_BOTTOMLOCK ; - IID_TOPLOCK ; - IID_CELLLOCK ; - }; - IdCount = { 3 ; }; - }; String STR_BOTTOMLOCK { Text [ en-US ] = "Text Extension From Lower Cell Border" ; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index afc38b00adb4..4eb25d799bc1 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR + #include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/field.hxx> @@ -80,10 +79,6 @@ static ::com::sun::star::uno::Reference< return xMSF; } -/*-----------------14.10.96 15.47------------------- - ---------------------------------------------------*/ - OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet), aLanguageFT( this, CUI_RES(FT_LANG )), @@ -167,9 +162,6 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : if ( bOpenSmartTagOptions ) SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS ); } -/*-----------------16.10.96 14.06------------------- - ---------------------------------------------------*/ sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, CollatorWrapper& rCmpClass ) @@ -190,9 +182,6 @@ sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, return sal_False; } -/* -----------------23.11.98 10:46------------------- - * - * --------------------------------------------------*/ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) { sal_uInt16 nPos = pBox->GetSelectEntryPos(); @@ -209,9 +198,6 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) } return 0; } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ) : @@ -224,36 +210,23 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, sBoldUnderline (CUI_RES(ST_BOLD_UNDER )), sURL (CUI_RES(ST_DETECT_URL )), sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )), - sDash (CUI_RES(ST_DASH )) + sDash (CUI_RES(ST_DASH )), + sAccidentalCaps (CUI_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK)) { FreeResource(); aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() { } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrOptionsPage(pParent, rSet); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) { @@ -268,6 +241,7 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, aCheckLB.IsChecked(nPos++)); sal_Bool bReturn = nFlags != pAutoCorrect->GetFlags(); if(bReturn ) @@ -279,19 +253,11 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) return bReturn; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -307,6 +273,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry(sURL); aCheckLB.InsertEntry(sDash); aCheckLB.InsertEntry(sNoDblSpaces); + aCheckLB.InsertEntry(sAccidentalCaps); sal_uInt16 nPos = 0; aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) ); @@ -316,6 +283,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & SetINetAttr) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IgnoreDoubleSpace) ); + aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) ); aCheckLB.SetUpdateMode(sal_True); } @@ -385,7 +353,7 @@ public: /*********************************************************************/ -void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, +void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry ) { rDev.DrawText( rPos, GetText() ); @@ -446,6 +414,7 @@ enum OfaAutoFmtOptions DEL_SPACES_AT_STT_END, DEL_SPACES_BETWEEN_LINES, IGNORE_DBLSPACE, + CORRECT_CAPS_LOCK, APPLY_NUMBERING, INSERT_BORDER, CREATE_TABLE, @@ -473,6 +442,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, sBullet (CUI_RES( ST_BULLET )), sBoldUnder (CUI_RES( ST_BOLD_UNDER )), sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), + sCorrectCapsLock (CUI_RES( ST_CORRECT_ACCIDENTAL_CAPS_LOCK)), sDetectURL (CUI_RES( ST_DETECT_URL )), sDash (CUI_RES( ST_DASH )), sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), @@ -550,7 +520,7 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol) /*********************************************************************/ -__EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() +OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() { delete (ImpUserData*) aCheckLB.GetUserData( REPLACE_BULLETS ); delete (ImpUserData*) aCheckLB.GetUserData( APPLY_NUMBERING ); @@ -562,7 +532,7 @@ __EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() /* */ /*********************************************************************/ -SfxTabPage* __EXPORT OfaSwAutoFmtOptionsPage::Create( Window* pParent, +SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet); @@ -606,6 +576,9 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND)); + pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, + aCheckLB.IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND)); + bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST); bModified |= pOpt->bSetINetAttr != bCheck; pOpt->bSetINetAttr = bCheck; @@ -685,9 +658,6 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) return sal_True; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); @@ -719,6 +689,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock, CBCOL_SECOND)); aCheckLB.GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND)); aCheckLB.GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND)); aCheckLB.GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND)); @@ -737,6 +708,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl ); aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) ); aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) ); + aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK, CBCOL_SECOND, 0 != (nFlags & CorrectCapsLock) ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); @@ -926,9 +898,7 @@ void OfaACorrCheckListBox::HBarClick() { // Sortierung durch diese Ueberladung abgeklemmt } -/* -----------------------------22.05.2002 11:06------------------------------ - ---------------------------------------------------------------------------*/ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -955,9 +925,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) else SvxSimpleTable::KeyInput(rKEvt); } -/* -----------------19.11.98 15:57------------------- - * - * --------------------------------------------------*/ + struct DoubleString { String sShort; @@ -968,9 +936,6 @@ typedef DoubleString* DoubleStringPtr; SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4) SV_IMPL_PTRARR(DoubleStringArray, DoubleStringPtr); -/* -----------------19.11.98 16:07------------------- - * - * --------------------------------------------------*/ void lcl_ClearTable(DoubleStringTable& rTable) { DoubleStringArrayPtr pArray = rTable.Last(); @@ -983,10 +948,6 @@ void lcl_ClearTable(DoubleStringTable& rTable) rTable.Clear(); } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ - OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet), @@ -1013,10 +974,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); static long nTabs[] = { 2 /* Tab-Count */, 1, 61 }; @@ -1036,47 +994,31 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, aShortED.SetMaxTextLen(30); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - OfaAutocorrReplacePage::~OfaAutocorrReplacePage() { delete pFormatText; lcl_ClearTable(aDoubleStringTable); delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrReplacePage(pParent, rSet); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) { @@ -1111,7 +1053,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) nLastPos = nPos - 1; bFound = sal_True; if( !(pWordPtr->IsTextOnly() == (0 == pDouble->pUserData) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), pDouble->sLong ) ) ) { pAutoCorrect->PutText(sEntry, pDouble->sLong, eCurLang); @@ -1174,7 +1116,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) bFound = sal_True; String sLong = aReplaceTLB.GetEntryText(pEntry, 1); if( !(pWordPtr->IsTextOnly() == (0 == pEntry->GetUserData()) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), sLong ))) { pAutoCorrect->PutText(sEntry, sLong, eLang); @@ -1210,9 +1152,6 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) return sal_False; } -/* -----------------19.11.98 13:16------------------- - * - * --------------------------------------------------*/ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) @@ -1322,9 +1261,6 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, else aTextOnlyCB.Enable( sal_False ); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) { @@ -1332,9 +1268,6 @@ void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) aShortED.GrabFocus(); } -/* -----------------23.11.98 10:33------------------- - * - * --------------------------------------------------*/ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) { //save old settings an refill @@ -1343,23 +1276,15 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) RefillReplaceBox(sal_False, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); ModifyHdl(&aShortED); } } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) { @@ -1391,11 +1316,6 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) return 0; }; -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) { SvLBoxEntry* _pEntry = aReplaceTLB.FirstSelected(); @@ -1462,9 +1382,6 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) return 1; } -/*-----------------17.10.96 07.49------------------- - ---------------------------------------------------*/ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { SvLBoxEntry* pFirstSel = aReplaceTLB.FirstSelected(); @@ -1550,10 +1467,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) return 0; } -/* -----------------20.11.98 13:48------------------- - * - * --------------------------------------------------*/ - struct StringsArrays { @@ -1564,9 +1477,7 @@ struct StringsArrays aAbbrevStrings(5,5), aDoubleCapsStrings(5,5) {} }; typedef StringsArrays* StringsArraysPtr; -/* -----------------19.11.98 16:07------------------- - * - * --------------------------------------------------*/ + sal_Bool lcl_FindInArray(SvStringsDtor& rStrings, const String& rString) { for(sal_uInt16 i = 0; i < rStrings.Count(); i++) @@ -1586,10 +1497,6 @@ void lcl_ClearTable(StringsTable& rTable) rTable.Clear(); } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ - OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet), @@ -1638,44 +1545,29 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, aDelDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - OfaAutocorrExceptPage::~OfaAutocorrExceptPage() { lcl_ClearTable(aStringsTable); delete pCompareClass; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrExceptPage(pParent, rSet); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) { @@ -1785,9 +1677,6 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) return sal_False; } -/* -----------------23.11.98 10:33------------------- - * - * --------------------------------------------------*/ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) { if(eLang != eSet) @@ -1804,9 +1693,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) ModifyHdl(&aDoubleCapsED); } } -/* -----------------20.11.98 14:06------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) @@ -1880,10 +1767,6 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, } } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -1894,11 +1777,6 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) aAutoCapsCB.SaveValue(); } -/*-----------------16.10.96 12.27------------------- - ---------------------------------------------------*/ - - IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) { if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED ) @@ -1926,10 +1804,6 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) return 0; } -/*-----------------16.10.96 12.57------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) { if(pBox == &aAbbrevLB) @@ -1947,10 +1821,6 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) return 0; } -/*-----------------16.10.96 13.02------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); @@ -1975,10 +1845,6 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) return 0; } -/*-----------------16.10.96 15.03------------------- - ---------------------------------------------------*/ - void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) { const KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -1994,10 +1860,6 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); } -/*-----------------03.07.97 13:17------------------- - ---------------------------------------------------*/ - enum OfaQuoteOptions { ADD_NONBRK_SPACE, @@ -2126,24 +1988,18 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aSglStandardPB.SetAccessibleRelationMemberOf(&aSingleFL); aDblStandardPB.SetAccessibleRelationMemberOf(&aDoubleFL); } -/*-----------------03.07.97 13:17------------------- ---------------------------------------------------*/ OfaQuoteTabPage::~OfaQuoteTabPage() { delete( pCheckButtonData ); } -/*-----------------03.07.97 13:17------------------- ---------------------------------------------------*/ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaQuoteTabPage(pParent, rAttrSet); } -/*-----------------03.07.97 13:18------------------- ---------------------------------------------------*/ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -2211,16 +2067,12 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) } return bReturn; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ + void OfaQuoteTabPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); } -/*-----------------03.07.97 13:18------------------- ---------------------------------------------------*/ void OfaQuoteTabPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -2278,10 +2130,6 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aDblEndExFT .SetText(ChangeStringExt_Impl(cEndQuote)); } - -/*-----------------15.10.96 16.42------------------- - ---------------------------------------------------*/ #define SGL_START 0 #define DBL_START 1 #define SGL_END 2 @@ -2303,7 +2151,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg ); sal_UCS4 cDlg; - //The two lines below are added by BerryJia for Bug95846 Time:2002-8-13 15:50 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguage(); switch( nMode ) @@ -2311,25 +2158,25 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) case SGL_START: cDlg = cSglStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',sal_True,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'', sal_True, eLang); break; case SGL_END: cDlg = cSglEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',sal_False,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'', sal_False, eLang); break; case DBL_START: cDlg = cStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',sal_True,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"', sal_True, eLang); break; case DBL_END: cDlg = cEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',sal_False,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"', sal_False, eLang); break; default: - DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); + OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); cDlg = 0; break; @@ -2364,9 +2211,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) return 0; } -/*-----------------27.06.97 09.55------------------- - ---------------------------------------------------*/ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn ) { if(pBtn == &aDblStandardPB) @@ -2753,9 +2597,9 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) aSmartTagCaption = aSmartTagType; const rtl::OUString aLBEntry = aSmartTagCaption + - OUString::createFromAscii(" (") + + OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) + aName + - OUString::createFromAscii(")"); + OUString(RTL_CONSTASCII_USTRINGPARAM(")")); SvLBoxEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry ); if ( pEntry ) @@ -2892,3 +2736,4 @@ void OfaSmartTagOptionsTabPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( sal_False ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 8920dadd35a0..61ea73eb03de 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -149,6 +149,7 @@ #define ST_DASH 208 #define FT_LANG 209 #define LB_LANG 210 +#define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211 #define CB_SMARTTAGS 220 #define FT_SMARTTAGS 221 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 8a906cf54e45..e9b4769b8caf 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -129,6 +129,10 @@ TabDialog RID_OFA_AUTOCORR_DLG String ST_DASH \ { \ Text [ en-US ] = "Replace dashes" ; \ + }; \ + String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \ + { \ + Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \ }; /**************************************************************************/ @@ -202,7 +206,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY COMMON_CLB_ENTRIES String ST_DEL_EMPTY_PARA { - /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absõtze entfernen */ Text [ en-US ] = "Remove blank paragraphs" ; }; String ST_USER_STYLE @@ -215,7 +218,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY }; String ST_RIGHT_MARGIN { - /* ### ACHTUNG: Neuer Text in Resource? Zusammenfassen von einzeiligen Absätzen ab : Zusammenfassen von einzeiligen Absõtzen ab */ // Text [ norwegian_wrong ] = "+++Combine single line paragraphs at" ; // Text [ swedish_wrong ] = ~Kombinera enradiga stycken B738vid " ; Text [ en-US ] = "Combine single line paragraphs if length greater than" ; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2c7dcd315f3f..409d53016e5d 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,8 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/pathoptions.hxx> -#include <svl/intitem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> @@ -64,9 +61,9 @@ #include <dialmgr.hxx> #include <svx/htmlmode.hxx> #include <svtools/controldims.hrc> -#include <svx/flagsdef.hxx> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svx/flagsdef.hxx> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> using namespace ::com::sun::star; // static ---------------------------------------------------------------- @@ -112,9 +109,7 @@ struct SvxBackgroundPage_Impl SvxBackgroundPage_Impl() : pLoadTimer(NULL), bIsImportDlgInExecute(sal_False) {} }; -/* -----------------------------15.08.2002 12:21------------------------------ - ---------------------------------------------------------------------------*/ inline sal_uInt8 lcl_PercentToTransparency(long nPercent) { //0xff must not be returned! @@ -132,10 +127,6 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) } //------------------------------------------------------------------------- -/* [Beschreibung] - -*/ - sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { sal_Bool bFound = sal_False; @@ -195,10 +186,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl sal_Bool bIsBmpPreview ) : -/* [Beschreibung] - -*/ - Window( pParent, rResId ), bIsBmp ( bIsBmpPreview ), @@ -214,11 +201,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl //----------------------------------------------------------------------- BackgroundPreviewImpl::~BackgroundPreviewImpl() - -/* [Beschreibung] - -*/ - { delete pBitmap; } @@ -240,10 +222,6 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) //----------------------------------------------------------------------- void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap ) -/* [Beschreibung] - -*/ - { if ( bIsBmp && (pNewBitmap || pBitmap) ) { @@ -317,9 +295,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& ) } } } -/* -----------------------------27.02.2002 11:07------------------------------ - ---------------------------------------------------------------------------*/ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -337,10 +313,6 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : -/* [Beschreibung] - -*/ - SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ), aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), @@ -414,11 +386,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, //------------------------------------------------------------------------ SvxBackgroundTabPage::~SvxBackgroundTabPage() - -/* [Beschreibung] - -*/ - { delete pPreviewWin1; delete pPreviewWin2; @@ -472,11 +439,6 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, //------------------------------------------------------------------------ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) - -/* [Beschreibung] - -*/ - { // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, // es muss aber im rSet vorhanden sein! @@ -636,8 +598,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - SfxItemState eState = rSet.GetItemState( nWhich, sal_True ); - eState = rSet.GetItemState( nWhich, sal_False ); + rSet.GetItemState( nWhich, sal_True ); + rSet.GetItemState( nWhich, sal_False ); if ( rSet.GetItemState( nWhich, sal_True ) > SFX_ITEM_AVAILABLE ) { pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); @@ -746,11 +708,6 @@ void SvxBackgroundTabPage::FillUserData() //------------------------------------------------------------------------ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) - -/* [Beschreibung] - -*/ - { if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() ) { @@ -1099,11 +1056,6 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) - -/* [Beschreibung] - -*/ - { // muss implementiert werden, damit Position-Control funktioniert } @@ -1111,11 +1063,6 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::ShowSelector() - -/* [Beschreibung] - -*/ - { if( bAllowShowSelector) { @@ -1150,11 +1097,6 @@ void SvxBackgroundTabPage::ShowSelector() void SvxBackgroundTabPage::RaiseLoadError_Impl() - -/* [Beschreibung] - -*/ - { SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND, String(), @@ -1170,11 +1112,6 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() //------------------------------------------------------------------------ sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() - -/* [Beschreibung] - -*/ - { sal_Bool bResult = ( aBgdGraphicPath.Len() > 0 ) && ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath, @@ -1198,7 +1135,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const SfxPoolItem* pItem = NULL; XColorTable* pColorTable = NULL; const Size aSize15x15 = Size( 15, 15 ); - FASTBOOL bOwn = sal_False; + bool bOwn = FALSE; if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable(); @@ -1438,11 +1375,6 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) - -/* [Beschreibung] - -*/ - { if ( 0 == aLbSelect.GetSelectEntryPos() ) { @@ -1460,11 +1392,6 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) - -/* [Beschreibung] - -*/ - { if ( &aBtnLink == pBox ) { @@ -1509,11 +1436,6 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) - -/* [Beschreibung] - -*/ - { if ( pBtn == &aBtnPosition ) { @@ -1636,11 +1558,6 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::ShowTblControl() - -/* [Beschreibung] - -*/ - { aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); aTblLBox .SelectEntryPos(0); @@ -1664,11 +1581,6 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) //----------------------------------------------------------------------- IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) - -/* [Beschreibung] - -*/ - { sal_uInt16 nSelPos = pBox->GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) @@ -1810,11 +1722,6 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, const String& rUserData ) - -/* [Beschreibung] - -*/ - { SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); const Color& rColor = rBgdAttr.GetColor(); @@ -1943,9 +1850,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, SetGraphicPosition_Impl( ePos ); } } -/* -----------------------------09.08.2002 14:04------------------------------ - ---------------------------------------------------------------------------*/ void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic) { bColTransparency = bColor; @@ -1968,7 +1873,7 @@ void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic } } -void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -1984,3 +1889,5 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 EnableTransparency(sal_True, sal_True); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 6d7c74e9b330..bbf7970fbb65 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -72,7 +72,6 @@ TabPage RID_SVXPAGE_BACKGROUND Size = MAP_APPFONT ( 24 , 10 ) ; Hide = TRUE ; LeftLabel = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Fü~r : F³~r */ Text [ en-US ] = "F~or" ; }; ListBox LB_TBL_BOX @@ -211,7 +210,6 @@ TabPage RID_SVXPAGE_BACKGROUND Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Fläche : ~Flõche */ Text [ en-US ] = "Ar~ea" ; }; RadioButton BTN_TILE diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index 79bf90a5606c..3133b2fb7638 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svx/dialogs.hrc> @@ -70,3 +68,4 @@ void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPa } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 9140a2f0e4c2..cc239df13481 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -51,10 +49,11 @@ #include <dialmgr.hxx> #include "svx/htmlmode.hxx" #include <vcl/msgbox.hxx> -#include "svx/flagsdef.hxx" //CHINA001 +#include "svx/flagsdef.hxx" #include <sfx2/request.hxx> -#include <svl/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> #include <sfx2/itemconnect.hxx> +#include <sal/macros.h> #include "borderconn.hxx" // ----------------------------------------------------------------------- @@ -203,9 +202,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aPropertiesFL ( this, CUI_RES( FL_PROPERTIES ) ), aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ), aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ), - aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)), aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)), - aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)), aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)), nMinValue(0), nSWMode(0), @@ -385,7 +382,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_TLBR, aFrameSel, svx::FRAMEBORDER_TLBR ) ); if( aFrameSel.IsBorderEnabled( svx::FRAMEBORDER_BLTR ) ) AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_BLTR, aFrameSel, svx::FRAMEBORDER_BLTR ) ); - // --> OD 2005-03-01 #i43593# - item connection doesn't work for Writer, + // #i43593# - item connection doesn't work for Writer, // because the Writer item sets contain these items // checkbox "Merge with next paragraph" only visible for Writer dialog format.paragraph AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_BORDER_CONNECT, aMergeWithNextCB, sfx::ITEMCONN_DEFAULT ) ); @@ -393,7 +390,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, // checkbox "Merge adjacent line styles" only visible for Writer dialog format.table AddItemConnection( new sfx::CheckBoxConnection( SID_SW_COLLAPSING_BORDERS, aMergeAdjacentBordersCB, sfx::ITEMCONN_DEFAULT ) ); aMergeAdjacentBordersCB.Hide(); - // <-- } // ----------------------------------------------------------------------- @@ -440,7 +436,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SvxBoxInfoItem* pBoxInfoItem; sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); SfxMapUnit eCoreUnit; - const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); @@ -554,9 +549,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) { // Do all visible lines show the same line widths? sal_uInt16 nPrim, nDist, nSecn; - bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn ); + SvxBorderStyle nStyle; + bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn, nStyle ); if( bWidthEq ) - aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100 ); + aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100, nStyle ); else aLbLineStyle.SelectEntryPos( 1 ); @@ -681,7 +677,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) TBorderPair(svx::FRAMEBORDER_RIGHT,BOX_LINE_RIGHT), }; - for (sal_uInt32 i=0; i < sizeof(eTypes1)/sizeof(TBorderPair); ++i) + for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(eTypes1); ++i) aBoxItem.SetLine( aFrameSel.GetFrameBorderStyle( eTypes1[i].first ), eTypes1[i].second ); //-------------------------------- @@ -691,7 +687,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI), TBorderPair(svx::FRAMEBORDER_VER,BOXINFO_LINE_VERT) }; - for (sal_uInt32 j=0; j < sizeof(eTypes2)/sizeof(TBorderPair); ++j) + for (sal_uInt32 j=0; j < SAL_N_ELEMENTS(eTypes2); ++j) aBoxInfoItem.SetLine( aFrameSel.GetFrameBorderStyle( eTypes2[j].first ), eTypes2[j].second ); aBoxInfoItem.EnableHor( mbHorEnabled ); @@ -921,13 +917,31 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb ) // ----------------------------------------------------------------------- +SvxBorderStyle lcl_getBorderStyle( USHORT nStyle ) +{ + SvxBorderStyle nResult = SOLID; + switch ( nStyle ) + { + case STYLE_DOTTED: + nResult = DOTTED; + break; + case STYLE_DASHED: + nResult = DASHED; + break; + default: + nResult = SOLID; + } + return nResult; +} + IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb ) { if ( pLb == &aLbLineStyle ) aFrameSel.SetStyleToSelection( static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine1() / 100 ), static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryDistance() / 100 ), - static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine2() / 100 ) ); + static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine2() / 100 ), + lcl_getBorderStyle( aLbLineStyle.GetSelectEntryStyle() ) ); return 0; } @@ -1014,9 +1028,7 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const void SvxBorderTabPage::FillPresetVS() { - // find correct image list - bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList& rImgList = bHC ? aBorderImgLstH : aBorderImgLst; + ImageList& rImgList = aBorderImgLst; Size aImgSize( rImgList.GetImage( IID_PRE_CELL_NONE ).GetSizePixel() ); // basic initialization of the ValueSet @@ -1041,9 +1053,7 @@ void SvxBorderTabPage::FillPresetVS() void SvxBorderTabPage::FillShadowVS() { - // find correct image list - bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList& rImgList = bHC ? aShadowImgLstH : aShadowImgLst; + ImageList& rImgList = aShadowImgLst; Size aImgSize( rImgList.GetImage( IID_SHADOWNONE ).GetSizePixel() ); // basic initialization of the ValueSet @@ -1091,6 +1101,8 @@ void SvxBorderTabPage::FillLineListBox_Impl() aLbLineStyle.InsertEntry( LINE_WIDTH0 ); aLbLineStyle.InsertEntry( LINE_WIDTH5 ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DOTTED ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DASHED ); aLbLineStyle.InsertEntry( LINE_WIDTH1 ); aLbLineStyle.InsertEntry( LINE_WIDTH2 ); aLbLineStyle.InsertEntry( LINE_WIDTH3 ); @@ -1214,9 +1226,6 @@ IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox) return 0; } -/* -----------------------------03.06.2002 10:15------------------------------ - - ---------------------------------------------------------------------------*/ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) @@ -1225,14 +1234,14 @@ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) SfxTabPage::DataChanged( rDCEvt ); } -void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pSWModeItem) { nSWMode = pSWModeItem->GetValue(); - // --> OD 2005-03-01 #i43593# + // #i43593# // show checkbox <aMergeWithNextCB> for format.paragraph if ( nSWMode == SW_BORDER_MODE_PARA ) { @@ -1254,3 +1263,4 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc index 3f7699df951b..faf4837eebb7 100644 --- a/cui/source/tabpages/border.hrc +++ b/cui/source/tabpages/border.hrc @@ -70,7 +70,6 @@ // ImageListe fuer ValueSets: #define IL_PRE_BITMAPS 1400 -#define ILH_PRE_BITMAPS 1401 #define IID_PRE_CELL_NONE 1 #define IID_PRE_CELL_ALL 2 #define IID_PRE_CELL_LR 3 @@ -94,7 +93,6 @@ #define IID_PRE_TABLE_OUTER2 21 #define IL_SDW_BITMAPS 1500 -#define ILH_SDW_BITMAPS 1501 #define IID_SHADOWNONE 1 #define IID_SHADOW_BOT_RIGHT 2 #define IID_SHADOW_BOT_LEFT 3 diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 4fc781943d3a..10f6e327ff5b 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -335,12 +335,6 @@ TabPage RID_SVXPAGE_BORDER MaskColor = STD_MASKCOLOR ; _PREVIEW_IDLIST_ }; - ImageList ILH_PRE_BITMAPS - { - Prefix = "prh"; - MaskColor = STD_MASKCOLOR ; - _PREVIEW_IDLIST_ - }; #define _SHADOW_IDLIST_ \ IdList = \ @@ -359,12 +353,6 @@ TabPage RID_SVXPAGE_BORDER MaskColor = STD_MASKCOLOR ; _SHADOW_IDLIST_ }; - ImageList ILH_SDW_BITMAPS - { - Prefix = "shh"; - MaskColor = STD_MASKCOLOR ; - _SHADOW_IDLIST_ - }; }; String RID_SVXSTR_TABLE_PRESET_NONE diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b46f24d5cbfd..04ecaa58e3da 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "borderconn.hxx" #include <svx/frmsel.hxx> #include "editeng/bolnitem.hxx" @@ -302,3 +300,4 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 7ea7289d8ee4..8e6b7c11d917 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a3dc52bd43ad..a02cacd281de 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> @@ -47,7 +45,6 @@ #define _SVX_CHARDLG_CXX #include <svl/languageoptions.hxx> -#include <cuires.hrc> #include "chardlg.hrc" #include <svx/xtable.hxx> // XColorTable @@ -84,11 +81,11 @@ #include <svl/stritem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <cuires.hrc> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 -#include "svx/flagsdef.hxx" //CHINA001 +#include <svx/svxdlg.hxx> +#include <cuires.hrc> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> +#include "svx/flagsdef.hxx" using namespace ::com::sun::star; @@ -621,6 +618,30 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) ); } + //In MacOSX the standard dialogs name font-name, font-style as + //Family, Typeface + //In GNOME the standard dialogs name font-name, font-style as + //Family, Style + //In Windows the standard dialogs name font-name, font-style as + //Font, Style +#ifdef WNT + String sFontFamilyString(CUI_RES(STR_CHARNAME_FONT)); +#else + String sFontFamilyString(CUI_RES(STR_CHARNAME_FAMILY)); +#endif + m_pWestFontNameFT->SetText(sFontFamilyString); + m_pEastFontNameFT->SetText(sFontFamilyString); + m_pCTLFontNameFT->SetText(sFontFamilyString); + +#ifdef MACOSX + String sFontStyleString(CUI_RES(STR_CHARNAME_TYPEFACE)); +#else + String sFontStyleString(CUI_RES(STR_CHARNAME_STYLE)); +#endif + m_pWestFontStyleFT->SetText(sFontStyleString); + m_pEastFontStyleFT->SetText(sFontStyleString); + m_pCTLFontStyleFT->SetText(sFontStyleString); + m_pWestLine ->Show( bCJK ); m_pColorFL ->Show( bCJK ); @@ -720,7 +741,7 @@ void SvxCharNamePage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); //DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; const SfxPoolItem* pItem = NULL; if ( pDocSh ) @@ -733,7 +754,7 @@ void SvxCharNamePage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } m_pColorLB->SetUpdateMode( sal_False ); @@ -922,6 +943,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) else { DBG_ERRORFILE( "invalid font name box" ); + return; } pStyleBox->Fill( pNameBox->GetText(), pFontList ); @@ -968,6 +990,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) else { DBG_ERRORFILE( "invalid font name box" ); + return; } FontInfo _aFontInfo( pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) ); @@ -978,7 +1001,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { - FixedText* pNameLabel = NULL; FontNameBox* pNameBox = NULL; FixedText* pStyleLabel = NULL; FontStyleBox* pStyleBox = NULL; @@ -991,7 +1013,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp switch ( eLangGrp ) { case Western : - pNameLabel = m_pWestFontNameFT; pNameBox = m_pWestFontNameLB; pStyleLabel = m_pWestFontStyleFT; pStyleBox = m_pWestFontStyleLB; @@ -1003,7 +1024,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Asian : - pNameLabel = m_pEastFontNameFT; pNameBox = m_pEastFontNameLB; pStyleLabel = m_pEastFontStyleFT; pStyleBox = m_pEastFontStyleLB; @@ -1015,7 +1035,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Ctl : - pNameLabel = m_pCTLFontNameFT; pNameBox = m_pCTLFontNameLB; pStyleLabel = m_pCTLFontStyleFT; pStyleBox = m_pCTLFontStyleLB; @@ -1047,8 +1066,8 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp FillStyleBox_Impl( pNameBox ); - FASTBOOL bStyle = sal_False; - FASTBOOL bStyleAvailable = sal_True; + bool bStyle = false; + bool bStyleAvailable = true; FontItalic eItalic = ITALIC_NONE; FontWeight eWeight = WEIGHT_NORMAL; switch ( eLangGrp ) @@ -1063,7 +1082,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp { const SvxPostureItem& rItem = (SvxPostureItem&)rSet.Get( nWhich ); eItalic = (FontItalic)rItem.GetValue(); - bStyle = sal_True; + bStyle = true; } bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); @@ -1081,7 +1100,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp eWeight = (FontWeight)rItem.GetValue(); } else - bStyle = sal_False; + bStyle = false; bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); // Aktuell eingestellter Font @@ -1240,7 +1259,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - FASTBOOL bChanged = sal_True; + bool bChanged = true; const String& rFontName = pNameBox->GetText(); const FontList* pFontList = GetFontList(); String aStyleBoxText =pStyleBox->GetText(); @@ -1257,7 +1276,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxFontItem& rItem = *( (const SvxFontItem*)pOld ); if ( rItem.GetFamilyName() == aFontItem.GetFamilyName() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1266,12 +1285,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && rFontName.Len() ) { rSet.Put( aFontItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) rSet.ClearItem( nWhich ); @@ -1296,7 +1315,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxWeightItem& rItem = *( (const SvxWeightItem*)pOld ); if ( rItem.GetValue() == aWeightItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1305,13 +1324,13 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE ) - bChanged = sal_False; + bChanged = true; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxWeightItem*)pItem )->GetValue() != aWeightItem.GetValue() ) - bChanged = sal_True; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == m_pImpl->m_nExtraEntryPos ); @@ -1321,12 +1340,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && aText.Len() ) { rSet.Put( aWeightItem ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_POSTURE; break; @@ -1345,7 +1364,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxPostureItem& rItem = *( (const SvxPostureItem*)pOld ); if ( rItem.GetValue() == aPostureItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1354,13 +1373,13 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetItalic() == ITALIC_NONE && aInfo.GetWeight() != WEIGHT_NORMAL ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() ) - bChanged = sal_True; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == ( m_pImpl->m_nExtraEntryPos + 1 ) ); @@ -1368,7 +1387,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && aText.Len() ) { rSet.Put( aPostureItem ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -1379,12 +1398,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); - FASTBOOL bRel = sal_True; + bool bRel = true; if ( !pSizeBox->IsRelative() ) { nSavedSize *= 10; - bRel = sal_False; + bRel = false; } switch ( eLangGrp ) @@ -1403,7 +1422,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) ); if ( ( (SvxFontHeightItem*)pItem )->GetHeight() != (sal_uInt32)nVal ) - bChanged = sal_True; + bChanged = true; } if ( bChanged || !pOldHeight || @@ -1428,12 +1447,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_LANGUAGE; break; @@ -1450,7 +1469,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxLanguageItem& rItem = *( (const SvxLanguageItem*)pOld ); if ( nLangPos == LISTBOX_ENTRY_NOTFOUND || eLangType == (LanguageType)rItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1459,7 +1478,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -1696,14 +1715,13 @@ void SvxCharNamePage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); if (pFontListItem) SetFontList(*pFontListItem); - //CHINA001 SetFontList(pFontListItem->GetFontList()); if (pFlagItem) { @@ -1792,7 +1810,7 @@ void SvxCharEffectsPage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; if ( pDocSh ) { @@ -1804,7 +1822,7 @@ void SvxCharEffectsPage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } m_aUnderlineColorLB.SetUpdateMode( sal_False ); @@ -2202,7 +2220,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_aUnderlineLB.GetEntryData(i) == eUnderline ) { m_aUnderlineLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2259,7 +2277,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_aOverlineLB.GetEntryData(i) == eOverline ) { m_aOverlineLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2316,7 +2334,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontStrikeout)(sal_uLong)m_aStrikeoutLB.GetEntryData(i) == eStrikeout ) { m_aStrikeoutLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2404,7 +2422,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_aUnderlineLB.GetSelectHdl().Call(NULL); // don't call SelectHdl_Impl directly! // in DisableControls, we may have re-reouted the select handler - // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox // SelectHdl_Impl( &m_aEmphasisLB ); @@ -2619,7 +2636,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); sal_Bool bModified = sal_False; - FASTBOOL bChanged = sal_True; + bool bChanged = true; // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); @@ -2640,7 +2657,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eUnder && ( UNDERLINE_NONE == eUnder || rItem.GetColor() == m_aUnderlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) @@ -2648,12 +2665,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_aUnderlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); @@ -2674,7 +2691,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eOver && ( UNDERLINE_NONE == eOver || rItem.GetColor() == m_aOverlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) @@ -2682,12 +2699,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_aOverlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); @@ -2707,18 +2724,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld ); if ( !m_aStrikeoutLB.IsEnabled() || ((FontStrikeout)rItem.GetValue() == eStrike && !bAllowChg) ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) { rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Individual words nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); @@ -2728,22 +2745,22 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxWordLineModeItem& rItem = *( (const SvxWordLineModeItem*)pOld ); if ( rItem.GetValue() == m_aIndividualWordsBtn.IsChecked() ) - bChanged = sal_False; + bChanged = false; } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aIndividualWordsBtn.IsChecked() == m_aIndividualWordsBtn.GetSavedValue() ) - bChanged = sal_False; + bChanged = false; if ( bChanged ) { rSet.Put( SvxWordLineModeItem( m_aIndividualWordsBtn.IsChecked(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); @@ -2763,34 +2780,34 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxEmphasisMarkItem& rItem = *( (const SvxEmphasisMarkItem*)pOld ); if ( rItem.GetEmphasisMark() == eMark ) - bChanged = sal_False; + bChanged = false; } } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aEmphasisLB.GetSavedValue() == nMarkPos && m_aPositionLB.GetSavedValue() == nPosPos ) - bChanged = sal_False; + bChanged = false; if ( bChanged ) { rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; - FASTBOOL bChecked = sal_False; + bool bChecked = false; sal_uInt16 nCapsPos = m_aEffects2LB.GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; - bChecked = sal_True; + bChecked = true; } if ( pOld ) @@ -2804,18 +2821,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld ); if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged && bChecked ) { rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); @@ -2837,22 +2854,22 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxContourItem& rItem = *( (const SvxContourItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aOutlineBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); @@ -2863,12 +2880,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxShadowedItem& rItem = *( (const SvxShadowedItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aShadowBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2878,7 +2895,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); @@ -2889,17 +2906,17 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxBlinkItem& rItem = *( (const SvxBlinkItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aBlinkingBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -2908,18 +2925,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN ); eState = m_aHiddenBtn.GetState(); - bChanged = sal_True; + bChanged = true; if ( pOld ) { const SvxCharHiddenItem& rItem = *( (const SvxCharHiddenItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aHiddenBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2972,7 +2989,7 @@ void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); @@ -3299,9 +3316,6 @@ IMPL_LINK( SvxCharPositionPage, ScaleWidthModifyHdl_Impl, MetricField*, EMPTYARG return 0; } -/* -----------------28.08.2003 12:12----------------- - - --------------------------------------------------*/ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) { //update the preview @@ -3602,7 +3616,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) sal_Bool bModified = sal_False, bChanged = sal_True; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); - const FASTBOOL bHigh = m_aHighPosBtn.IsChecked(); + const bool bHigh = m_aHighPosBtn.IsChecked(); short nEsc; sal_uInt8 nEscProp; @@ -3677,7 +3691,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxKerningItem( nKerning, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3690,7 +3704,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aPairKerningBtn.IsChecked() != m_aPairKerningBtn.GetSavedValue() ) { rSet.Put( SvxAutoKernItem( m_aPairKerningBtn.IsChecked(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3700,7 +3714,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aScaleWidthMF.GetText() != m_aScaleWidthMF.GetSavedValue() ) { rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_aScaleWidthMF.GetValue(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3718,7 +3732,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) else if (m_a270degRB.IsChecked()) aItem.SetTopToBotton(); rSet.Put( aItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3748,7 +3762,7 @@ void SvxCharPositionPage::SetPreviewBackgroundToCharacter() m_bPreviewBackgroundToCharacter = sal_True; } // ----------------------------------------------------------------------- -void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -3811,25 +3825,25 @@ void SvxCharTwoLinesPage::Initialize() void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { - //CHINA001 SvxCharacterMap aDlg( this ); + bool bStart = pBox == &m_aStartBracketLB; //SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); //if(pFact) { //AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP ); SvxCharacterMap* aDlg = new SvxCharacterMap( this ); - aDlg->DisableFontSelection();//CHINA001 aDlg.DisableFontSelection(); + aDlg->DisableFontSelection(); - if ( aDlg->Execute() == RET_OK )//CHINA001 ( aDlg.Execute() == RET_OK ) + if ( aDlg->Execute() == RET_OK ) { - sal_Unicode cChar = (sal_Unicode) aDlg->GetChar();//CHINA001 aDlg.GetChar(); + sal_Unicode cChar = (sal_Unicode) aDlg->GetChar(); SetBracket( cChar, bStart ); } else { pBox->SelectEntryPos( bStart ? m_nStartBracketPosition : m_nEndBracketPosition ); } - delete aDlg; //add CHINA001 + delete aDlg; } } @@ -3843,7 +3857,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) pBox->SelectEntryPos(0); else { - FASTBOOL bFound = sal_False; + bool bFound = FALSE; for ( sal_uInt16 i = 1; i < pBox->GetEntryCount(); ++i ) { if ( (sal_uLong)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR ) @@ -3983,16 +3997,14 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; return bModified; } -/* -----------------------------04.12.00 09:48-------------------------------- - ---------------------------------------------------------------------------*/ void SvxCharTwoLinesPage::UpdatePreview_Impl() { sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0 @@ -4010,7 +4022,7 @@ void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -4020,3 +4032,5 @@ void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 SetPreviewBackgroundToCharacter(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h index 253745d9623a..168502b6f331 100644 --- a/cui/source/tabpages/chardlg.h +++ b/cui/source/tabpages/chardlg.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..0d583b0431e8 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -70,6 +70,10 @@ #define STR_CHARNAME_NOSTYLE 150 #define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_FAMILY 152 +#define STR_CHARNAME_FONT 153 +#define STR_CHARNAME_STYLE 154 +#define STR_CHARNAME_TYPEFACE 155 // EffectsPage -------------------------------------------------------------- diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 60c511a87f61..abf9edcbd1eb 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -48,13 +48,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; FixedText FT_WEST_NAME_NOCJK { Pos = MAP_APPFONT ( 12 , 6 ); Size = MAP_APPFONT ( 112 , 8 ); - Text [ en-US ] = "~Font"; }; ComboBox LB_WEST_NAME { @@ -78,13 +76,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 14 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "~Typeface"; }; FixedText FT_WEST_STYLE_NOCJK { Pos = MAP_APPFONT ( 130 , 6 ); Size = MAP_APPFONT ( 72 , 8 ); - Text [ en-US ] = "~Typeface"; }; ComboBox LB_WEST_STYLE { @@ -190,7 +186,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 54 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_EAST_NAME { @@ -205,7 +200,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 54 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "T~ypeface"; }; ComboBox LB_EAST_STYLE { @@ -264,7 +258,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_CTL_NAME { @@ -279,7 +272,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 94 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "Ty~peface"; }; ComboBox LB_CTL_STYLE { @@ -370,6 +362,22 @@ TabPage RID_SVXPAGE_CHAR_NAME { Text [ en-US ] = "Transparent"; }; + String STR_CHARNAME_FAMILY + { + Text [ en-US ] = "Family"; + }; + String STR_CHARNAME_FONT + { + Text [ en-US ] = "Font"; + }; + String STR_CHARNAME_STYLE + { + Text [ en-US ] = "Style"; + }; + String STR_CHARNAME_TYPEFACE + { + Text [ en-US ] = "Typeface"; + }; }; // RID_SVXPAGE_CHAR_EFFECTS --------------------------------------------------- diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index f13d36697ca8..f20b636b0570 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <tools/shl.hxx> -#include "svx/ofaitem.hxx" // add CHINA001 -#include <sfx2/request.hxx> // add CHINA001 +#include "svx/ofaitem.hxx" +#include <sfx2/request.hxx> #include <svx/dialogs.hrc> #define _SVX_CONNECT_CXX @@ -182,7 +180,7 @@ SvxConnectionPage::~SvxConnectionPage() |* \************************************************************************/ -void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) +void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) { const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_EDGENODE1HORZDIST ); const SfxItemPool* pPool = rAttrs.GetPool(); @@ -556,7 +554,7 @@ void SvxConnectionPage::FillTypeLB() } } } -void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); if (pOfaPtrItem) @@ -565,3 +563,4 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 8d30c4431e55..37788da81f22 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/basedlgs.hxx> #include <cuires.hrc> #include "dstribut.hxx" @@ -87,36 +85,27 @@ SvxDistributePage::SvxDistributePage( : SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), meDistributeHor(eHor), meDistributeVer(eVer), - maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), + maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )), maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )), - maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), + maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), - maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), + maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), maHorLow (this, CUI_RES(IMG_HOR_LOW )), - maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), + maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )), maHorHigh (this, CUI_RES(IMG_HOR_HIGH )), maFlVertical (this, CUI_RES(FL_VERTICAL )), maBtnVerNone (this, CUI_RES(BTN_VER_NONE )), maBtnVerTop (this, CUI_RES(BTN_VER_TOP )), - maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), + maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )), - maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), - maVerLow (this, CUI_RES(IMG_VER_LOW )), - maVerCenter (this, CUI_RES(IMG_VER_CENTER )), - maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), - maVerHigh (this, CUI_RES(IMG_VER_HIGH )) + maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), + maVerLow (this, CUI_RES(IMG_VER_LOW )), + maVerCenter (this, CUI_RES(IMG_VER_CENTER )), + maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), + maVerHigh (this, CUI_RES(IMG_VER_HIGH )) { - maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); } @@ -169,7 +158,7 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) |* \************************************************************************/ -void __EXPORT SvxDistributePage::Reset(const SfxItemSet& ) +void SvxDistributePage::Reset(const SfxItemSet& ) { maBtnHorNone.SetState(sal_False); maBtnHorLeft.SetState(sal_False); @@ -183,7 +172,7 @@ void __EXPORT SvxDistributePage::Reset(const SfxItemSet& ) case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(sal_True); break; case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(sal_True); break; case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(sal_True); break; - case SvxDistributeHorizontalRight : maBtnHorRight.SetState(sal_True); break; + case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break; } maBtnVerNone.SetState(sal_False); @@ -242,3 +231,4 @@ sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc index 201fac2b5227..564d7d8c3d64 100644 --- a/cui/source/tabpages/dstribut.hrc +++ b/cui/source/tabpages/dstribut.hrc @@ -44,12 +44,3 @@ #define IMG_VER_CENTER 19 #define IMG_VER_DISTANCE 20 #define IMG_VER_HIGH 21 - -#define IMG_HOR_LOW_H 22 -#define IMG_HOR_CENTER_H 23 -#define IMG_HOR_DISTANCE_H 24 -#define IMG_HOR_HIGH_H 25 -#define IMG_VER_LOW_H 26 -#define IMG_VER_CENTER_H 27 -#define IMG_VER_DISTANCE_H 28 -#define IMG_VER_HIGH_H 29 diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index 2c6e953e6b71..ed5108c90d6a 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -214,88 +214,6 @@ TabPage RID_SVXPAGE_DISTRIBUTE }; }; - - Image IMG_HOR_LOW_H - { - ImageBitmap = Bitmap { File = "dsth_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dsth_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_CENTER_H - { - ImageBitmap = Bitmap { File = "dsth_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_HIGH_H - { - ImageBitmap = Bitmap { File = "dsth_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_HIGH_H - { - ImageBitmap = Bitmap { File = "dstv_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_CENTER_H - { - ImageBitmap = Bitmap { File = "dstv_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dstv_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_LOW_H - { - ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 4267ce1a795d..435345baeda2 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> @@ -138,26 +136,15 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) aOrigSizePB.SetAccessibleRelationLabeledBy( &aOrigSizeFT ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SvxGrfCropPage::~SvxGrfCropPage() { aTimer.Stop(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SvxGrfCropPage( pParent, rSet ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) { @@ -248,10 +235,6 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) bReset = sal_False; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); @@ -317,10 +300,6 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) return bModified; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) { #ifdef DBG_UTIL @@ -392,10 +371,6 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcZoom(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) @@ -494,16 +469,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; nLeft = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nRight ); aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit ); } else { -// nRight = aPageSize.Width() - -// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -527,16 +498,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; nTop = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nBottom); aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit ); } else { -// nBottom = aPageSize.Height() - -// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -629,11 +596,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() nMin = nMinWidth - (nL >= 0 ? nL : 0); aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; - aLeftMF.SetMax(aPageSize.Width() - nR - nMin); - aRightMF.SetMax(aPageSize.Width() - nL - nMin); -*/ long nUp = lcl_GetValue( aTopMF, eUnit ); long nMinHeight = (aOrigSize.Height() * 10) /11; nMin = nMinHeight - (nUp >= 0 ? nUp : 0); @@ -642,11 +604,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() long nLow = lcl_GetValue(aBottomMF, eUnit ); nMin = nMinHeight - (nLow >= 0 ? nLow : 0); aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); - - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; - aTopMF.SetMax(aPageSize.Height() - nLow - nMin); - aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/ } /*-------------------------------------------------------------------- Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, @@ -832,6 +789,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz ) Invalidate(); } - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index e4ef79b4f1f9..7177dcfb716d 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> @@ -125,10 +123,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA ); - mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA ); - } //------------ValueSet installieren-------------------------- aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD ); @@ -156,10 +151,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage() { sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { delete mpBmpCapTypes[nBitmap]; - delete mpBmpCapTypesH[nBitmap]; - } } // ----------------------------------------------------------------------- @@ -567,9 +559,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxCaptionTabPage::FillValueSet() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - Image** ppBitmaps = bHighContrast ? mpBmpCapTypesH : mpBmpCapTypes; + Image** ppBitmaps = mpBmpCapTypes; aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) ); @@ -639,12 +629,11 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) break; } } -/*-- 05.03.2004 13:54:26--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink ) { aValidateLink = rLink; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc index 8f76e8572f86..8759a0158f22 100644 --- a/cui/source/tabpages/labdlg.hrc +++ b/cui/source/tabpages/labdlg.hrc @@ -66,11 +66,6 @@ #define BMP_CAPTTYPE_3 3 #define BMP_CAPTTYPE_4 4 -#define BMP_CAPTTYPE_1_H 5 -#define BMP_CAPTTYPE_2_H 6 -#define BMP_CAPTTYPE_3_H 7 -#define BMP_CAPTTYPE_4_H 8 - #define SHOW_HORZ 1 #define SHOW_VERT 2 #define SHOW_ABS 3 diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 1e7da5393a2a..b096b01c0137 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -154,8 +154,6 @@ TabPage RID_SVXPAGE_CAPTION { Pos = MAP_APPFONT ( 6 , 85 ) ; Size = MAP_APPFONT ( 42 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ Text [ en-US ] = "~Length" ; }; MetricField MF_LAENGE @@ -221,22 +219,6 @@ TabPage RID_SVXPAGE_CAPTION { File = "legtyp4.bmp" ; }; - Bitmap BMP_CAPTTYPE_1_H - { - File = "legtyp1_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_2_H - { - File = "legtyp2_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_3_H - { - File = "legtyp3_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_4_H - { - File = "legtyp4_hc.bmp" ; - }; }; // RID_SVXDLG_CAPTION ---------------------------------------------------- diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 339559ba6d92..2084b64da970 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define ITEMID_MACRO 0 #include <svl/macitem.hxx> #undef ITEMID_MACRO @@ -108,7 +106,7 @@ _SfxMacroTabPage_Impl::~_SfxMacroTabPage_Impl() } -static sal_uInt16 __FAR_DATA aPageRg[] = { +static sal_uInt16 aPageRg[] = { SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, 0 }; @@ -235,9 +233,9 @@ void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) { mpImpl->bGotEvents = sal_True; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); - for ( sal_uInt16 nNo = 0; nNo < rList.Count(); ++nNo ) + for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { - const SfxEventName *pOwn = rList.GetObject(nNo); + const SfxEventName *pOwn = rList.at(nNo); AddEvent( pOwn->maUIName, pOwn->mnId ); } } @@ -254,9 +252,9 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) { mpImpl->bGotEvents = sal_True; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); - for ( sal_uInt16 nNo = 0; nNo < rList.Count(); ++nNo ) + for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { - const SfxEventName *pOwn = rList.GetObject(nNo); + const SfxEventName *pOwn = rList.at(nNo); AddEvent( pOwn->maUIName, pOwn->mnId ); } } @@ -500,3 +498,4 @@ SfxMacroAssignDlg::~SfxMacroAssignDlg() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 05e81658b8a3..b5269c81ae3d 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -93,7 +93,6 @@ TabPage RID_SVXPAGE_EVENTASSIGN HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN"; Pos = MAP_APPFONT ( COL4 , ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen Disable = TRUE ; TabStop = TRUE ; Text [ en-US ] = "~Assign" ; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 1ee81c946cfc..27743a3b1819 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -49,8 +47,8 @@ #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/strarray.hxx> -#include <sfx2/request.hxx> //add CHINA001 -#include "svx/ofaitem.hxx" //add CHINA001 +#include <sfx2/request.hxx> +#include "svx/ofaitem.hxx" static sal_uInt16 pRanges[] = { @@ -190,7 +188,7 @@ SvxMeasurePage::~SvxMeasurePage() |* \************************************************************************/ -void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) +void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -527,9 +525,6 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } } -//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; -//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW}; - if( bPositionModified ) { // Position @@ -866,7 +861,7 @@ void SvxMeasurePage::FillUnitLB() aLbUnit.SetEntryData( nPos, (void*)nUnit ); } } -void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); @@ -876,3 +871,4 @@ void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 27678b02f50b..2fa12f871019 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,13 +26,6 @@ * ************************************************************************/ -#if !ENABLE_LAYOUT_EXPERIMENTAL -//#undef ENABLE_LAYOUT -#endif - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -55,10 +49,10 @@ #include "numfmt.hxx" #include <svx/numfmtsh.hxx> #include <dialmgr.hxx> -#include <sfx2/request.hxx> //CHINA001 -#include <sfx2/app.hxx> //CHINA001 +#include <sfx2/request.hxx> +#include <sfx2/app.hxx> #include <sfx2/basedlgs.hxx> -#include "svx/flagsdef.hxx" //CHINA001 +#include "svx/flagsdef.hxx" #define NUMKEY_UNDEFINED SAL_MAX_UINT32 @@ -78,15 +72,12 @@ static sal_uInt16 pRanges[] = }; /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreview -#* #* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl -#* #* Input: Fenster, Resource-ID -#* #* Output: --- #* #************************************************************************/ @@ -105,15 +96,12 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId } /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreview -#* #* Funktion: Destruktor der Klasse SvxNumberPreviewImpl -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -123,15 +111,12 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl() } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreviewImpl -#* #* Funktion: Funktion fuer das Aendern des Preview- Strings -#* #* Input: String, Farbe -#* #* Output: --- #* #************************************************************************/ @@ -148,15 +133,12 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr, } /************************************************************************* -#* Methode: Paint Datum:02.10.97 +#* Methode: Paint #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreviewImpl -#* #* Funktion: Funktion fuer das neu zeichnen des Fensters. -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -307,7 +289,6 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); - ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); bNumItemFlag=sal_True; bOneAreaFlag=sal_False; @@ -320,13 +301,8 @@ void SvxNumberFormatTabPage::Init_Impl() nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight; aIbAdd. SetModeImage( aIconList.GetImage( IID_ADD ) ); - aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST ); - aIbRemove. SetModeImage( aIconList.GetImage( IID_REMOVE ) ); - aIbRemove. SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST ); - aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); - aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); aIbAdd.Enable(sal_False ); aIbRemove.Enable(sal_False ); @@ -390,15 +366,12 @@ void SvxNumberFormatTabPage::Init_Impl() } /************************************************************************* -#* Methode: GetRanges Datum:02.10.97 +#* Methode: GetRanges #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Liefert Bereichsangaben zurueck. -#* #* Input: --- -#* #* Output: Bereich #* #************************************************************************/ @@ -410,15 +383,12 @@ sal_uInt16* SvxNumberFormatTabPage::GetRanges() /************************************************************************* -#* Methode: Create Datum:02.10.97 +#* Methode: Create #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Erzeugt eine neue Zahlenformat- Seite. -#* #* Input: Fenster, SfxItemSet -#* #* Output: neue TabPage #* #************************************************************************/ @@ -431,16 +401,13 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, /************************************************************************* -#* Methode: Reset Datum:02.10.97 +#* Methode: Reset #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Die Attribute des Dialogs werden mit Hilfe #* des Itemsets neu eingestellt. -#* #* Input: SfxItemSet -#* #* Output: --- #* #************************************************************************/ @@ -511,7 +478,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) bOneAreaFlag= pBoolItem->GetValue(); } } - //bOneAreaFlag=sal_True; //@@ Debug-Test eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); @@ -623,7 +589,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); UpdateFormatListBox_Impl(sal_False,sal_True); -//! erAck 26.01.01 //! This spoils everything because it rematches currency formats based on //! the selected aLbCurrency entry instead of the current format. //! Besides that everything seems to be initialized by now, so why call it? @@ -649,16 +614,13 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } /************************************************************************* -#* Methode: Obstructing Datum:02.10.97 +#* Methode: Obstructing #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel #* und direkter Eingabe. -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -731,15 +693,12 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() /************************************************************************* -#* Methode: HideLanguage Datum:14.05.98 +#* Methode: HideLanguage #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Versteckt die Spracheinstellung: -#* #* Input: sal_Bool nFlag -#* #* Output: --- #* #************************************************************************/ @@ -764,17 +723,14 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) } /************************************************************************* -#* Methode: FillItemSet Datum:02.10.97 +#* Methode: FillItemSet #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Stellt die Attribute im ItemSet ein, #* sowie in der DocShell den numItem, wenn #* bNumItemFlag nicht gesetzt ist. -#* #* Input: SfxItemSet -#* #* Output: --- #* #************************************************************************/ @@ -883,18 +839,6 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { -/* if ( (ULONG_MAX != nInitFormat) && _pSet ) - { - const sal_uLong nCurKey = pNumFmtShell->GetCurNumFmtKey(); - const sal_uInt16 nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); - SfxItemState eItemState = GetItemSet().GetItemState( nWhich, sal_False ); - - if ( (nInitFormat == nCurKey) && (SFX_ITEM_DEFAULT == eItemState) ) - _pSet->ClearItem( nWhich ); - else - _pSet->Put( SfxUInt32Item( nWhich, nCurKey ) ); - } - */ if ( _pSet ) FillItemSet( *_pSet ); return LEAVE_PAGE; @@ -979,15 +923,12 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: DeleteEntryList_Impl Datum:02.10.97 +#* Methode: DeleteEntryList_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Loescht eine SvStrings- Liste -#* #* Input: String-liste -#* #* Output: --- #* #************************************************************************/ @@ -1000,19 +941,16 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: UpdateOptions_Impl Datum:02.10.97 +#* Methode: UpdateOptions_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Stellt je nach eingestelltem Format die Options- #* attribute neu ein. -#* #* Input: Flag, ob sich die Kategorie geaendert hat. -#* #* Output: --- #* -#***?********************************************************************/ +#************************************************************************/ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sal_False*/ ) { @@ -1024,18 +962,10 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa sal_uInt16 nZeroes = 0; sal_Bool bNegRed = sal_False; sal_Bool bThousand = sal_False; - short nTmpCatPos; sal_uInt16 nCurrencyPos =aLbCurrency.GetSelectEntryPos(); if(bOneAreaFlag) - { - nTmpCatPos=nFixedCategory; nCurCategory=nFixedCategory; - } - else - { - nTmpCatPos=nCurCategory; - } pNumFmtShell->GetOptions( theFormat, @@ -1093,10 +1023,6 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa aEdLeadZeroes.Enable(); aBtnNegRed.Enable(); aBtnThousand.Enable(); - /* - aEdDecimals .SetValue( nDecimals ); - aEdLeadZeroes.SetValue( nZeroes ); - */ aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) ); aBtnNegRed .Check( bNegRed ); @@ -1128,17 +1054,14 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa /************************************************************************* -#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 +#* Methode: UpdateFormatListBox_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Aktualisiert die Format- Listbox und zusaetzlich #* wird abhaengig vom bUpdateEdit- Flag der String #* in der Editbox geaendert. -#* #* Input: Flags fuer Kategorie und Editbox -#* #* Output: --- #* #************************************************************************/ @@ -1207,8 +1130,6 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl String aFormat=*aEntryList[nFmtLbSelPos]; aEdFormat.SetText(aFormat); aFtComment.SetText(pNumFmtShell->GetComment4Entry(nFmtLbSelPos)); - - //@23.09.97 aEdFormat.SetText( aLbFormat.GetSelectEntry() ); } if(!bOneAreaFlag || !bCat) @@ -1259,17 +1180,14 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl /************************************************************************* -#* Handle: DoubleClickHdl_Impl Datum:02.10.97 +#* Handle: DoubleClickHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Bei einem Doppelklick in die Format- Listbox #* wird der Wert uebernommen und der OK-Button #* ausgeloest -#* #* Input: Pointer auf Listbox -#* #* Output: --- #* #************************************************************************/ @@ -1297,17 +1215,14 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) /************************************************************************* -#* Methode: SelFormatHdl_Impl Datum:02.10.97 +#* Methode: SelFormatHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie #* oder das Format aendert. Dem entsprechend werden die #* Einstellungen geaendert. -#* #* Input: Pointer auf Listbox -#* #* Output: --- #* #************************************************************************/ @@ -1403,9 +1318,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) } UpdateOptions_Impl( sal_False ); - //------- return 0; - //------- } //-------------------------------------------------------------------- @@ -1416,9 +1329,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) EditHdl_Impl( NULL ); UpdateOptions_Impl( sal_False ); - //------- return 0; - //------- } //-------------------------------------------------------------------- @@ -1428,26 +1339,21 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) UpdateFormatListBox_Impl( sal_False, sal_True ); EditHdl_Impl( &aEdFormat ); - //------- return 0; - //------- } return 0; } /************************************************************************* -#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 +#* Methode: ClickHdl_Impl, ImageButton* pIB #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button #* wird diese Funktion aufgerufen und die Zahlenformat- #* Liste den entsprechend geaendert. -#* #* Input: Toolbox- Button -#* #* Output: --- #* #************************************************************************/ @@ -1529,7 +1435,6 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) aLbFormat.SelectEntryPos( (sal_uInt16)nFmtLbSelPos ); aEdFormat.SetText( aFormat ); - //aEdComment.SetText(String()); //@@ ??? aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen ChangePreviewText( (sal_uInt16)nFmtLbSelPos ); @@ -1608,16 +1513,13 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) /************************************************************************* -#* Methode: EditHdl_Impl Datum:02.10.97 +#* Methode: EditHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, #* so wird die Vorschau aktualisiert und -#* #* Input: Pointer auf Editbox -#* #* Output: --- #* #************************************************************************/ @@ -1636,7 +1538,6 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) else { String aFormat = aEdFormat.GetText(); - //aFtComment.SetText(String()); MakePreviewText( aFormat ); if ( pNumFmtShell->FindEntry( aFormat, &nCurKey ) ) @@ -1682,15 +1583,12 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1720,7 +1618,6 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) (sal_uInt16)aLbFormat.GetSelectEntryPos() ); aEdFormat.SetText( aFormat ); - //aFtComment.SetText(String()); MakePreviewText( aFormat ); if ( pNumFmtShell->FindEntry( aFormat ) ) @@ -1749,15 +1646,12 @@ IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG) /************************************************************************* -#* Methode: LostFocusHdl_Impl Datum:30.10.97 +#* Methode: LostFocusHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1783,15 +1677,12 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1860,15 +1751,12 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) return SfxTabPage::PreNotify( rNEvt ); } /************************************************************************* -#* Methode: SetOkHdl Datum:01.11.97 +#* Methode: SetOkHdl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Setzt den OkHandler neu. -#* #* Input: Neuer OkHandler -#* #* Output: --- #* #************************************************************************/ @@ -1883,7 +1771,6 @@ void SvxNumberFormatTabPage::FillCurrencyBox() SvStringsDtor aList; NfShCurrencyEntries rEntries; XubString* pEntry = NULL; - sal_uInt16 nPos=0; sal_uInt16 nSelPos=0; pNumFmtShell->GetCurrencySymbols( aList, &nSelPos); @@ -1891,7 +1778,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox() for(sal_uInt16 i=1;i<aList.Count();i++) { pEntry=aList[i]; - nPos=aLbCurrency.InsertEntry( *pEntry); + aLbCurrency.InsertEntry( *pEntry); } aLbCurrency.SelectEntryPos(nSelPos); } @@ -1931,12 +1818,11 @@ void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos) } aLbCategory.SelectEntryPos(nPos); } -/* -----------------12.11.2002 14:35----------------- - * to support Writer text field language handling an - * additional entry needs to be inserted into the ListBox - * which marks a certain language as automatically detected - * Additionally the "Default" language is removed - * --------------------------------------------------*/ +/* to support Writer text field language handling an + additional entry needs to be inserted into the ListBox + which marks a certain language as automatically detected + Additionally the "Default" language is removed +*/ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect) { aLbLanguage.RemoveLanguage(LANGUAGE_SYSTEM); @@ -1946,7 +1832,7 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, s aLbLanguage.SelectEntryPos(nPos); } -void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,sal_False); SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,sal_False); @@ -1955,3 +1841,5 @@ void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 if (pLinkItem) SetOkHdl(pLinkItem->GetValue()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index f863a303c800..6b72d486af41 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -62,7 +62,6 @@ #define IL_ICON 32 #define LB_CURRENCY 33 #define CB_SOURCEFORMAT 34 -#define IL_ICON_HC 35 #define STR_AUTO_ENTRY 36 #define TBX_ADDREMOVE 1 diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index b3f2d22fd204..867f93c7e753 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -147,7 +147,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT { Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 69 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Führende ~Nullen : F³hrende ~Nullen */ Text [ en-US ] = "Leading ~zeroes" ; }; NumericField ED_LEADZEROES @@ -250,18 +249,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; IdCount = { 3 ; }; }; - ImageList IL_ICON_HC - { - Prefix = "nuh"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - IdList = - { - IID_ADD ; - IID_REMOVE ; - IID_INFO ; - }; - IdCount = { 3 ; }; - }; String STR_AUTO_ENTRY { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 5d2e85da8a3b..1f912e608ba9 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -35,7 +33,6 @@ #include <numpages.hxx> #include <numpages.hrc> #include <dialmgr.hxx> -#include <cuires.hrc> #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> @@ -75,11 +72,11 @@ #include <vector> #include "sfx2/opengrf.hxx" -#include <cuires.hrc> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 -#include <svl/aeitem.hxx> //add CHINA001 -#include <svl/stritem.hxx>//add CHINA001 -#include <svl/slstitm.hxx> //add CHINA001 +#include <cuires.hrc> +#include <sfx2/request.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/slstitm.hxx> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -90,13 +87,9 @@ using namespace com::sun::star::text; using namespace com::sun::star::container; using namespace com::sun::star::style; using rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr); -/*-----------------07.02.97 15.37------------------- - ---------------------------------------------------*/ #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 @@ -118,22 +111,18 @@ static const sal_Char cPrefix[] = "Prefix"; static const sal_Char cSuffix[] = "Suffix"; static const sal_Char cBulletChar[] = "BulletChar"; static const sal_Char cBulletFontName[] = "BulletFontName"; -/* -----------------------------31.01.01 10:23-------------------------------- - ---------------------------------------------------------------------------*/ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() { Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); Reference < XInterface > xI = xMSF->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) ); Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY); DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); return xRet; } -/* -----------------------------31.01.01 11:40-------------------------------- - ---------------------------------------------------------------------------*/ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps) { const PropertyValue* pValues = rLevelProps.getConstArray(); @@ -155,9 +144,7 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r } return pNew; } -/* -----------------28.10.98 08:32------------------- - * - * --------------------------------------------------*/ + // Die Auswahl an Bullets aus den StarSymbol static const sal_Unicode aBulletTypes[] = { @@ -170,10 +157,8 @@ static const sal_Unicode aBulletTypes[] = 0x2717, 0x2714 }; -/* -----------------28.10.98 09:42------------------- - * - * --------------------------------------------------*/ -static sal_Char __READONLY_DATA aNumChar[] = + +static sal_Char const aNumChar[] = { 'A', //CHARS_UPPER_LETTER 'a', //CHARS_LOWER_LETTER @@ -183,9 +168,7 @@ static sal_Char __READONLY_DATA aNumChar[] = ' ' }; -/*-----------------18.03.98 08:35------------------- - Ist eins der maskierten Formate gesetzt? ---------------------------------------------------*/ +// Ist eins der maskierten Formate gesetzt? sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) { sal_Bool bRet = sal_False; @@ -198,9 +181,6 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) } return bRet; } -/* -----------------28.10.98 08:50------------------- - * - * --------------------------------------------------*/ Font& lcl_GetDefaultBulletFont() { @@ -273,9 +253,6 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, pExamplesVS->SetNumberingSettings(aNumberings, xFormat, aLocale); } } -/*-----------------07.02.97 12.08------------------- - ---------------------------------------------------*/ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() { @@ -285,21 +262,12 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, aNumSettingsArr.DeleteAndDestroy(0, aNumSettingsArr.Count()); } -/*-----------------07.02.97 12.13------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxSingleNumPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.09------------------- - ---------------------------------------------------*/ - - sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pSaveNum) @@ -312,10 +280,6 @@ sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------08.02.97 16.27------------------- - ---------------------------------------------------*/ - void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -351,10 +315,6 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = sal_False; } -/*-----------------08.02.97 11.28------------------- - ---------------------------------------------------*/ - int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -362,15 +322,10 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.09------------------- - ---------------------------------------------------*/ - - void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); + //im Draw gibt es das Item als WhichId, im Writer nur als SlotId SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem); if(eState != SFX_ITEM_SET) @@ -393,9 +348,6 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) else if(*pSaveNum != *pActNum) *pActNum = *pSaveNum; } -/*-----------------08.02.97 11.40------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { @@ -439,9 +391,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.15------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -450,11 +399,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -475,10 +419,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - SvxBulletPickTabPage::~SvxBulletPickTabPage() { @@ -486,10 +426,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, delete pExamplesVS; delete pSaveNum; } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) @@ -497,11 +433,6 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, return new SvxBulletPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - - sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) @@ -512,9 +443,6 @@ sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; } -/*-----------------08.02.97 16.28------------------- - ---------------------------------------------------*/ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) { @@ -549,9 +477,6 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) bPreset |= bIsPreset; bModified = sal_False; } -/*-----------------08.02.97 11.28------------------- - ---------------------------------------------------*/ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { @@ -560,11 +485,6 @@ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.11------------------- - ---------------------------------------------------*/ - - void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -586,16 +506,11 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); - if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) *pActNum = *pSaveNum; } -/*-----------------08.02.97 11.58------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { @@ -627,9 +542,7 @@ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.16------------------- ---------------------------------------------------*/ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -638,7 +551,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -//Add CHINA001 + void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) { @@ -649,11 +562,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) } -//end of add CHINA001 -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, @@ -711,10 +619,6 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetOutlineNumberingSettings(aOutlineAccess, xFormat, aLocale); } } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - SvxNumPickTabPage::~SvxNumPickTabPage() { @@ -723,22 +627,12 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, delete pSaveNum; } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - - SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - - sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) @@ -749,9 +643,6 @@ sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; } -/*-----------------08.02.97 16.28------------------- - ---------------------------------------------------*/ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { @@ -787,10 +678,6 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = sal_False; } -/* -----------------08.02.97 11.29------------------- - ---------------------------------------------------*/ - int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -798,10 +685,6 @@ int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -823,7 +706,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -831,10 +713,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) } -/*-----------------08.02.97 11.58------------------- - Hier werden alle Ebenen veraendert, ---------------------------------------------------*/ - +// Hier werden alle Ebenen veraendert IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { if(pActNum) @@ -917,9 +796,6 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.16------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -928,7 +804,6 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -//add CHINA001 begin void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); @@ -938,12 +813,7 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) if (pNumCharFmt &&pBulletCharFmt) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } -//end of CHINA001 -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -967,7 +837,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); // Grafiknamen ermitteln - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(sal_uInt16 i = 0; i < aGrfNames.Count(); i++) @@ -992,11 +861,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, pExamplesVS->SetAccessibleRelationMemberOf( &aValuesFL ); } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - - SvxBitmapPickTabPage::~SvxBitmapPickTabPage() +SvxBitmapPickTabPage::~SvxBitmapPickTabPage() { String* pStr = (String*)aGrfNames.First(); while( pStr ) @@ -1009,26 +874,17 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, delete pSaveNum; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBitmapPickTabPage(pParent, rAttrSet); } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; bPreset = sal_False; sal_Bool bIsPreset = sal_False; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -1058,9 +914,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) bPreset |= bIsPreset; bModified = sal_False; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { @@ -1068,16 +921,11 @@ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) FillItemSet(*_pSet); return sal_True; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( !aGrfNames.Count() ) { -// das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return sal_False; } if( (bPreset || bModified) && pActNum) @@ -1089,9 +937,6 @@ sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) { @@ -1130,10 +975,6 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) } } -/*-----------------12.02.97 07.53------------------- - ---------------------------------------------------*/ - IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { if(pActNum) @@ -1181,9 +1022,6 @@ IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.17------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -1191,9 +1029,7 @@ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) rOk.GetClickHdl().Call(&rOk); return 0; } -/* -----------------03.11.99 13:46------------------- - --------------------------------------------------*/ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) { if(!pExamplesVS->IsNoSelection()) @@ -1202,85 +1038,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) } return 0; } -/*-----------------13.02.97 09.40------------------- - ---------------------------------------------------*/ - -//CHINA001 SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/ ) : -//CHINA001 -//CHINA001 SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), -//CHINA001 // rStrList ( rStrNames ), -//CHINA001 bGrfNotFound( sal_False ) -//CHINA001 -//CHINA001 { -//CHINA001 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); -//CHINA001 SetStyle( GetStyle() | WB_VSCROLL ); -//CHINA001 SetLineCount( 3 ); -//CHINA001 aFormatTimer.SetTimeout(300); -//CHINA001 aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl)); -//CHINA001 } -//CHINA001 -//CHINA001 /*-----------------13.02.97 09.41------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 SvxBmpNumValueSet::~SvxBmpNumValueSet() -//CHINA001 { -//CHINA001 GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); -//CHINA001 aFormatTimer.Stop(); -//CHINA001 } -//CHINA001 /*-----------------13.02.97 09.41------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) -//CHINA001 { -//CHINA001 SvxNumValueSet::UserDraw(rUDEvt); -//CHINA001 -//CHINA001 Rectangle aRect = rUDEvt.GetRect(); -//CHINA001 OutputDevice* pDev = rUDEvt.GetDevice(); -//CHINA001 sal_uInt16 nItemId = rUDEvt.GetItemId(); -//CHINA001 Point aBLPos = aRect.TopLeft(); -//CHINA001 -//CHINA001 int nRectHeight = aRect.GetHeight(); -//CHINA001 Size aSize(nRectHeight/8, nRectHeight/8); -//CHINA001 -//CHINA001 Graphic aGraphic; -//CHINA001 if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, -//CHINA001 &aGraphic, NULL)) -//CHINA001 { -//CHINA001 bGrfNotFound = sal_True; -//CHINA001 } -//CHINA001 else -//CHINA001 { -//CHINA001 Point aPos(aBLPos.X() + 5, 0); -//CHINA001 for( sal_uInt16 i = 0; i < 3; i++ ) -//CHINA001 { -//CHINA001 sal_uInt16 nY = 11 + i * 33; -//CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; -//CHINA001 aGraphic.Draw( pDev, aPos, aSize ); -//CHINA001 } -//CHINA001 } -//CHINA001 } -//CHINA001 -//CHINA001 /*-----------------14.02.97 07.34------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) -//CHINA001 { -//CHINA001 // nur, wenn eine Grafik nicht da war, muss formatiert werden -//CHINA001 if(bGrfNotFound) -//CHINA001 { -//CHINA001 bGrfNotFound = sal_False; -//CHINA001 Format(); -//CHINA001 } -//CHINA001 Invalidate(); -//CHINA001 return 0; -//CHINA001 } -/*-----------------01.12.97 16:15------------------- - Tabpage Numerierungsoptionen ---------------------------------------------------*/ + +// Tabpage Numerierungsoptionen #define NUM_NO_GRAPHIC 1000 SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -1430,9 +1189,6 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, aBulletPB.SetAccessibleName(aStartFT.GetText()); } -/*-----------------01.12.97 16:30------------------- - ---------------------------------------------------*/ SvxNumOptionsTabPage::~SvxNumOptionsTabPage() { delete aBitmapMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY ); @@ -1447,9 +1203,6 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage() delete pSaveNum; } -/*-----------------03.12.97 07:52------------------- - ---------------------------------------------------*/ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) @@ -1461,17 +1214,12 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) aHeightMF .SetUnit( eMetric ); } -/*-----------------01.12.97 16:30------------------- - ---------------------------------------------------*/ SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumOptionsTabPage(pParent, rAttrSet); }; -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -1512,18 +1260,14 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } } -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(*_pSet); return sal_True; } -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); @@ -1535,9 +1279,7 @@ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; }; -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -1577,7 +1319,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); sal_uInt16 nMask = 1; aLevelLB.SetUpdateMode(sal_False); aLevelLB.SetNoSelection(); @@ -1607,7 +1348,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -1618,7 +1359,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } aBulColLB.InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC )); @@ -1710,9 +1451,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) bModified = sal_False; } -/*-----------------02.12.97 13:47------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::InitControls() { sal_Bool bShowBullet = sal_True; @@ -1859,12 +1598,6 @@ void SvxNumOptionsTabPage::InitControls() aStartED.SetText(aEmptyStr); break; case SHOW_BULLET: - { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); - } break; case SHOW_BITMAP: break; @@ -1893,10 +1626,7 @@ void SvxNumOptionsTabPage::InitControls() pPreviewWIN->Invalidate(); } -/*-----------------02.12.97 14:01------------------- - 0 - Nummer; 1 - Bullet; 2 - Bitmap ---------------------------------------------------*/ - +// 0 - Nummer; 1 - Bullet; 2 - Bitmap void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) { if(nBullet == nType) @@ -1971,9 +1701,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) aOrientLB .Enable(bEnableBitmap); } -/*-----------------02.12.97 13:51------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) { sal_uInt16 nSaveNumLvl = nActNumLvl; @@ -2015,17 +1743,13 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) InitControls(); return 0; } -/* -----------------------------05.04.2002 15:30------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer*, EMPTYARG ) { pPreviewWIN->Invalidate(); return 0; } -/*-----------------03.12.97 12:01------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) { for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2046,13 +1770,9 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) return 0; } -/*-----------------02.12.97 08:56------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { String sSelectStyle; - sal_Int16 eOldType; sal_Bool bShowOrient = sal_False; sal_Bool bBmp = sal_False; String aEmptyStr; @@ -2062,7 +1782,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - eOldType = aNumFmt.GetNumberingType(); // PAGEDESC gibt es nicht sal_uInt16 nNumType = (sal_uInt16)(sal_uLong)pBox->GetEntryData(pBox->GetSelectEntryPos()); aNumFmt.SetNumberingType((sal_Int16)nNumType); @@ -2090,8 +1809,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetBulletChar( SVX_DEF_BULLET ); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); - //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont()); - //aBulletFT.SetText( aNumFmt.GetBulletChar() ); // Zuweisung der Zeichenvorlage automatisch if(bAutomaticCharStyles) { @@ -2102,7 +1819,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -2132,14 +1848,11 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aCharFmtLB.SelectEntry(sSelectStyle); CharFmtHdl_Impl(&aCharFmtLB); - // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt bAutomaticCharStyles = sal_True; } return 0; } -/* -----------------06.11.2002 14:27----------------- - * - * --------------------------------------------------*/ + void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) { sal_Bool bIsNull = aStartED.GetValue() == 0; @@ -2150,9 +1863,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) if(bIsNull && bNoZeroAllowed) aStartED.GetModifyHdl().Call(&aStartED); } -/*-----------------03.12.97 16:43------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) { sal_uInt16 nPos = pBox->GetSelectEntryPos(); @@ -2180,9 +1891,6 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) } -/*-----------------06.12.97 12:00------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) { sal_Bool bSet = pBox->IsChecked(); @@ -2201,9 +1909,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) InitControls(); return 0; } -/* -----------------16.11.98 14:20------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox ) { Color nSetColor = pBox->GetSelectEntryColor(); @@ -2222,9 +1928,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox ) SetModified(); return 0; } -/* -----------------16.11.98 14:20------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) { sal_uInt16 nRelSize = (sal_uInt16)pField->GetValue(); @@ -2244,9 +1948,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) return 0; } -/*-----------------02.12.97 10:50------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { sal_uInt16 nItemId = pButton->GetCurItemId(); @@ -2321,9 +2022,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) } return 0; } -/* -----------------27.07.99 12:20------------------- - --------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) { if(!bMenuButtonInitialized) @@ -2376,9 +2075,6 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) return 0; } -/*-----------------02.12.97 10:58------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) { SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True ); @@ -2440,10 +2136,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) return 0; } -/*-----------------03.03.97 15:21------------------- - ---------------------------------------------------*/ - IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) { sal_Bool bWidth = pField == &aWidthMF; @@ -2512,10 +2204,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) { if (pBox->IsChecked()) @@ -2528,9 +2216,6 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) return 0; } -/*-----------------02.12.97 16:07------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG ) { bAutomaticCharStyles = sal_False; @@ -2559,9 +2244,6 @@ IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG ) }; -/*-----------------03.12.97 11:01------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) { sal_Bool bPrefix = pEdit == &aPrefixED; @@ -2598,9 +2280,6 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) return 0; } -/*-----------------09.12.97 11:49------------------- - ---------------------------------------------------*/ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, sal_uInt16 nDivision) { @@ -2623,9 +2302,6 @@ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sa } -/*-----------------09.12.97 11:54------------------- - ---------------------------------------------------*/ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, const SvxNumberFormat& rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, const Size& rSize) @@ -2660,9 +2336,8 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, pVDev->SetFont(aTmpFont); return nRet; } -/*-----------------02.12.97 10:34------------------- - Vorschau der Numerierung painten ---------------------------------------------------*/ + +// Vorschau der Numerierung painten void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); @@ -2710,7 +2385,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); - // sal_uInt16 nFontHeight = nYStep * 6 / 10; if(bPosition) nFontHeight = nYStep * 15 / 10; @@ -2735,7 +2409,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-16 #newlistlevelattrs# sal_uInt16 nXStart( 0 ); short nTextOffset( 0 ); sal_uInt16 nNumberXPos( 0 ); @@ -2768,7 +2441,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nNumberXPos = static_cast<sal_uInt16>( nTmpNumberXPos ); } } - // <-- sal_uInt16 nBulletWidth = 0; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType() &(~LINK_TOKEN))) @@ -2803,7 +2475,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = (sal_uInt16)pVDev->GetTextWidth(aText); nPreNum++; } - // --> OD 2008-01-16 #newlistlevelattrs# if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT && rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { @@ -2813,7 +2484,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText); } - // --> OD 2008-01-16 #newlistlevelattrs# sal_uInt16 nTextXPos( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2847,7 +2517,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nXStart = static_cast<sal_uInt16>( rFmt.GetIndentAt() / nWidthRelation ); } - // <-- Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); pVDev->SetFillColor( aBackColor ); @@ -2875,7 +2544,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-31 #newlistlevelattrs# sal_uInt16 nXStart( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2897,7 +2565,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } nXStart /= 2; nXStart += 2; - // <-- sal_uInt16 nTextOffset = 2 * nXStep; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType()&(~LINK_TOKEN)) ) { @@ -2969,9 +2636,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ), @@ -2987,7 +2651,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aDistNumMF( this, CUI_RES(MF_NUMDIST )), aAlignFT( this, CUI_RES(FT_ALIGN )), aAlignLB( this, CUI_RES(LB_ALIGN )), - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ), aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ), aListtabFT( this, CUI_RES(FT_LISTTAB) ), @@ -2998,7 +2661,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ), aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ), aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ), - // <-- aStandardPB( this, CUI_RES(PB_STANDARD )), pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), @@ -3008,9 +2670,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, bModified(false), bPreset(false), bInInintControl(sal_False), - // --> OD 2008-01-11 #newlistlevelattrs# bLabelAlignmentPosAndSpaceModeActive( false ) - // <-- { FreeResource(); SetExchangeSupport(); @@ -3018,7 +2678,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aRelativeCB.Check(); aAlignLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); - // --> OD 2008-01-10 #newlistlevelattrs# aAlign2LB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); for ( sal_uInt16 i = 0; i < aAlignLB.GetEntryCount(); ++i ) { @@ -3026,7 +2685,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, } aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() ); aAlign2FT.SetText( aAlignFT.GetText() ); - // <-- Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl); @@ -3042,7 +2700,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentMF.SetDownHdl(aLk); aIndentMF.SetLoseFocusHdl(aLk); - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() ); aLabelFollowedByLB.SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); @@ -3060,7 +2717,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentAtMF.SetUpHdl(aLk); aIndentAtMF.SetDownHdl(aLk); aIndentAtMF.SetLoseFocusHdl(aLk); - // <-- aLevelLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl)); aRelativeCB.SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl)); @@ -3071,29 +2727,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, pPreviewWIN->SetPositionMode(); eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); - //HACK("der Wert sollte mal sinnvol gesetzt werden") - long nWidth = 10000; - nWidth = OutputDevice::LogicToLogic( nWidth, - (MapUnit)eCoreUnit, MAP_100TH_MM ); - - aDistBorderMF.SetMax(aDistBorderMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aDistNumMF .SetMax(aDistNumMF .Normalize( nWidth ), FUNIT_100TH_MM ); - aIndentMF .SetMax(aIndentMF .Normalize( nWidth ), FUNIT_100TH_MM ); - // --> OD 2008-02-18 #newlistlevelattrs# - aListtabMF.SetMax(aListtabMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aAlignedAtMF.SetMax(aAlignedAtMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aIndentAtMF.SetMax(aIndentAtMF.Normalize( nWidth ), FUNIT_100TH_MM ); - // <-- - long nLast2 = nWidth /2; - aDistBorderMF.SetLast( aDistBorderMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aDistNumMF .SetLast( aDistNumMF .Normalize( nLast2 ), FUNIT_100TH_MM ); - aIndentMF .SetLast( aIndentMF .Normalize( nLast2 ), FUNIT_100TH_MM ); - // --> OD 2008-02-18 #newlistlevelattrs# - aListtabMF.SetLast(aListtabMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aAlignedAtMF.SetLast(aAlignedAtMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aIndentAtMF.SetLast(aIndentAtMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - // <-- - #if OSL_DEBUG_LEVEL > 1 pDebugFixedText = new FixedText(this, 0); pDebugFixedText->Show(); @@ -3106,9 +2739,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL); } -/*-----------------03.12.97 10:02------------------- ---------------------------------------------------*/ SvxNumPositionTabPage::~SvxNumPositionTabPage() { delete pActNum; @@ -3148,16 +2779,11 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) } #endif -/*-----------------03.12.97 10:06------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::InitControls() { bInInintControl = sal_True; - // --> OD 2008-01-11 #newlistlevelattrs# const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); - // <-- const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; @@ -3172,12 +2798,10 @@ void SvxNumPositionTabPage::InitControls() bool bSameIndent = !bLabelAlignmentPosAndSpaceModeActive; bool bSameAdjust = true; - // --> OD 2008-01-11 #newlistlevelattrs# bool bSameLabelFollowedBy = bLabelAlignmentPosAndSpaceModeActive; bool bSameListtab = bLabelAlignmentPosAndSpaceModeActive; bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive; bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive; - // <-- const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; sal_uInt16 nMask = 1; @@ -3203,7 +2827,6 @@ void SvxNumPositionTabPage::InitControls() if( i > nLvl) { - // --> OD 2008-01-11 #newlistlevelattrs# bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); if ( !bLabelAlignmentPosAndSpaceModeActive ) { @@ -3238,7 +2861,6 @@ void SvxNumPositionTabPage::InitControls() bSameIndentAt &= aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt(); } - // <-- } } nMask <<= 1; @@ -3284,19 +2906,14 @@ void SvxNumPositionTabPage::InitControls() else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT) nPos = 2; aAlignLB.SelectEntryPos(nPos); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SelectEntryPos( nPos ); - // <-- } else { aAlignLB.SetNoSelection(); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SetNoSelection(); - // <-- } - // --> OD 2008-01-11 #newlistlevelattrs# if ( bSameLabelFollowedBy ) { sal_uInt16 nPos = 0; // LISTTAB @@ -3354,7 +2971,6 @@ void SvxNumPositionTabPage::InitControls() { aIndentAtMF.SetText(aEmptyStr); } - // <-- if ( bSetDistEmpty ) aDistBorderMF.SetText(aEmptyStr); @@ -3362,9 +2978,6 @@ void SvxNumPositionTabPage::InitControls() bInInintControl = sal_False; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -3377,7 +2990,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem)) nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue(); } - // if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem)) { delete pSaveNum; @@ -3403,10 +3015,8 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) aRelativeCB.Enable(nActNumLvl != 1); aLevelLB.SetUpdateMode(sal_True); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); } @@ -3414,9 +3024,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) pPreviewWIN->Invalidate(); } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -3424,9 +3031,6 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); @@ -3440,9 +3044,6 @@ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -3503,19 +3104,13 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) *pActNum = *pSaveNum; pPreviewWIN->SetNumRule(pActNum); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); -// const sal_Bool bDraw = pActNum->IsFeatureSupported(NUM_CONTINUOUS); -// aDistNumFT.Show(bDraw); -// aDistNumMF.Show(bDraw); - // <-- InitControls(); bModified = sal_False; } -// --> OD 2008-01-11 #newlistlevelattrs# void SvxNumPositionTabPage::InitPosAndSpaceMode() { if ( pActNum == 0 ) @@ -3571,20 +3166,13 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive ); aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive ); } -// <-- - -/*-----------------03.12.97 10:02------------------- ---------------------------------------------------*/ SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPositionTabPage(pParent, rAttrSet); } -/*-----------------04.12.97 12:51------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) @@ -3592,25 +3180,18 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) aDistBorderMF .SetDecimalDigits(1); aDistNumMF .SetDecimalDigits(1); aIndentMF .SetDecimalDigits(1); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); aIndentAtMF.SetDecimalDigits(1); - // <-- } aDistBorderMF .SetUnit( eMetric ); aDistNumMF .SetUnit( eMetric ); aIndentMF .SetUnit( eMetric ); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); aIndentAtMF.SetUnit( eMetric ); - // <-- } -/*-----------------03.12.97 11:06------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) { sal_uInt16 nMask = 1; @@ -3620,11 +3201,9 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - // --> OD 2008-01-11 #newlistlevelattrs# const sal_uInt16 nPos = aAlignLB.IsVisible() ? aAlignLB.GetSelectEntryPos() : aAlign2LB.GetSelectEntryPos(); - // <-- SvxAdjust eAdjust = SVX_ADJUST_CENTER; if(nPos == 0) eAdjust = SVX_ADJUST_LEFT; @@ -3638,9 +3217,7 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) SetModified(); return 0; } -/*-----------------03.12.97 11:11------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) { sal_uInt16 nSaveNumLvl = nActNumLvl; @@ -3681,16 +3258,12 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) } aRelativeCB.Enable(nActNumLvl != 1); SetModified(); - // --> OD 2008-01-15 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); return 0; } -/*-----------------03.12.97 12:24------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) { if(bInInintControl) @@ -3762,9 +3335,6 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) return 0; } -/*-----------------04.12.97 12:35------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) { sal_Bool bOn = pBox->IsChecked(); @@ -3808,7 +3378,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) return 0; } -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) { // determine value to be set at the chosen list levels @@ -3868,9 +3437,7 @@ IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3896,9 +3463,7 @@ IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3925,9 +3490,7 @@ IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3957,27 +3520,21 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -/*-----------------05.12.97 15:33------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) { sal_uInt16 nMask = 1; - // --> OD 2008-02-11 #newlistlevelattrs# SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), pActNum->GetLevelCount(), pActNum->IsContinuousNumbering(), SVX_RULETYPE_NUMBERING, pActNum->GetLevel( 0 ).GetPositionAndSpaceMode() ); - // <-- for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt( pActNum->GetLevel( i ) ); SvxNumberFormat aTempFmt(aTmpNumRule.GetLevel( i )); - // --> OD 2008-02-05 #newlistlevelattrs# aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() ); if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -3993,7 +3550,6 @@ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() ); aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() ); } - // <-- pActNum->SetLevel( i, aNumFmt ); } @@ -4025,7 +3581,7 @@ void SvxNumOptionsTabPage::SetModified(sal_Bool bRepaint) } } -//Add CHINA001 + void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); @@ -4051,10 +3607,6 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); } -//end of add CHINA001 - -//add CHINA001 begin - void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); @@ -4062,3 +3614,5 @@ void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5bc52b99f3a9..aa5d75239b65 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -39,6 +37,7 @@ #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> #include "svx/htmlmode.hxx" +#include <sal/macros.h> #define _SVX_PAGE_CXX @@ -56,7 +55,6 @@ #include <editeng/sizeitem.hxx> #include <editeng/frmdiritem.hxx> #include "svx/dlgutil.hxx" -#include <dialmgr.hxx> #include <editeng/paperinf.hxx> #include <dialmgr.hxx> #include <sfx2/module.hxx> @@ -68,9 +66,9 @@ // #i4219# #include <svtools/optionsdrawinglayer.hxx> -#include <svl/slstitm.hxx> //CHINA001 -#include <svl/aeitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svl/slstitm.hxx> +#include <svl/aeitem.hxx> +#include <sfx2/request.hxx> // configuration helper ======================================================= /** Helper to get a configuration setting. @@ -154,9 +152,7 @@ sal_uInt16 aArr[] = sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) { - const sal_uInt16 nCount = sizeof(aArr) / sizeof(sal_uInt16); - - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aArr); ++i ) if ( aArr[i] == ( nUsage & 0x000f ) ) return i; return SVX_PAGE_ALL; @@ -166,9 +162,7 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) { - const sal_uInt16 nCount = sizeof(aArr) / sizeof(sal_uInt16); - - if ( nPos >= nCount ) + if ( nPos >= SAL_N_ELEMENTS(aArr) ) return 0; return aArr[nPos]; } @@ -564,7 +558,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); - FASTBOOL bOrientationSupport = + bool bOrientationSupport = pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION ); #ifdef OS2 // unter OS/2 wird bei HasSupport() immer sal_True returned @@ -1157,7 +1151,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) // ----------------------------------------------------------------------- -void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet ) +void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); Orientation eOri = ORIENTATION_PORTRAIT; @@ -1759,7 +1753,7 @@ bool SvxPageDescPage::IsMarginOutOfRange() return bRet; } -void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,sal_False); SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,sal_False); @@ -1772,3 +1766,5 @@ void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 if (pCollectListItem) SetCollectionList(pCollectListItem->GetList()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 9de1ee21d3e5..6d5821fdc5ea 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 81f898679984..e0c26d5d42f5 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/style.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -38,6 +36,7 @@ #define _SVX_PARAGRPH_CXX 0 #include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> #include <editeng/pgrditem.hxx> #include <cuires.hrc> #include "paragrph.hrc" @@ -59,9 +58,9 @@ #include <dialmgr.hxx> #include "svx/htmlmode.hxx" #include <editeng/paravertalignitem.hxx> -#include <svl/eitem.hxx> //add CHINA001 -#include <sfx2/request.hxx> //add CHINA001 -#include <svl/intitem.hxx> //add CHINA001 +#include <svl/eitem.hxx> +#include <sfx2/request.hxx> +#include <svl/intitem.hxx> // static ---------------------------------------------------------------- @@ -179,9 +178,6 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { -//! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! - SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = @@ -272,7 +268,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: - DBG_ERROR( "unbekannter Type fuer Zeilenabstand." ); + OSL_FAIL( "unbekannter Type fuer Zeilenabstand." ); break; } eState = GetItemSet().GetItemState( nWhich ); @@ -282,7 +278,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aSpacing ); - bModified |= sal_True; + bModified = sal_True; } } @@ -324,10 +320,10 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= sal_True; + bModified = sal_True; } } - FASTBOOL bNullTab = sal_False; + bool bNullTab = false; if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || @@ -374,14 +370,14 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } aMargin.SetAutoFirst(aAutoCB.IsChecked()); if ( aMargin.GetTxtFirstLineOfst() < 0 ) - bNullTab = sal_True; + bNullTab = true; eState = GetItemSet().GetItemState( nWhich ); if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= sal_True; + bModified = sal_True; } } @@ -418,7 +414,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { pRegItem->SetValue(!bSet); rOutSet.Put(*pRegItem); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, sal_False ) ) rOutSet.ClearItem(_nWhich); @@ -438,12 +434,28 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) // Metrik einstellen FieldUnit eFUnit = GetModuleFieldUnit( rSet ); + + sal_Bool bApplyCharUnit = GetApplyCharUnit( rSet ); + + SvtCJKOptions aCJKOptions; + if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) + eFUnit = FUNIT_CHAR; + SetFieldUnit( aLeftIndent, eFUnit ); SetFieldUnit( aRightIndent, eFUnit ); SetFieldUnit( aFLineIndent, eFUnit ); - SetFieldUnit( aTopDist, eFUnit ); - SetFieldUnit( aBottomDist, eFUnit ); - SetFieldUnit( aLineDistAtMetricBox, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + { + SetFieldUnit( aTopDist, FUNIT_LINE ); + SetFieldUnit( aBottomDist, FUNIT_LINE ); + SetFieldUnit( aLineDistAtMetricBox, FUNIT_POINT ); + } + else + { + SetFieldUnit( aTopDist, eFUnit ); + SetFieldUnit( aBottomDist, eFUnit ); + SetFieldUnit( aLineDistAtMetricBox, eFUnit ); + } sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxItemState eItemState = rSet.GetItemState( _nWhich ); @@ -535,7 +547,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { aTopDist.SetRelative(); - SetFieldUnit( aTopDist, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + SetFieldUnit( aTopDist, FUNIT_LINE ); + else + SetFieldUnit( aTopDist, eFUnit ); SetMetricValue( aTopDist, rOldItem.GetUpper(), eUnit ); } @@ -547,7 +562,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { aBottomDist.SetRelative(); - SetFieldUnit( aBottomDist, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + SetFieldUnit( aBottomDist, FUNIT_LINE ); + else + SetFieldUnit( aBottomDist, eFUnit ); SetMetricValue( aBottomDist, rOldItem.GetLower(), eUnit ); } } @@ -943,9 +961,6 @@ void SvxStdParagraphTabPage::EnableRegisterMode() aRegisterFL.Show(); } -/*-----------------16.01.97 19.54------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) { sal_Bool bEnable = !pBox->IsChecked(); @@ -954,42 +969,33 @@ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) return 0; } -/*-----------------16.01.97 18.00------------------- - ---------------------------------------------------*/ void SvxStdParagraphTabPage::SetPageWidth( sal_uInt16 nPageWidth ) { nWidth = nPageWidth; } -/*-----------------17.01.97 08.11------------------- ---------------------------------------------------*/ void SvxStdParagraphTabPage::EnableAutoFirstLine() { aAutoCB.Show(); } -/*-----------------11.06.97 11.48------------------- - absoluter Zeilenabstand ---------------------------------------------------*/ + void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) { aLineDist.InsertEntry(sAbsDist); nMinFixDist = nMinTwip; } -//addd CHINA001 begin + void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) { -/* CHINA001 different bit represent call to different method of SvxStdParagraphTabPage +/* different bit represent call to different method of SvxStdParagraphTabPage 0x0001 --->EnableRelativeMode() 0x0002 --->EnableRegisterMode() 0x0004 --->EnableAutoFirstLine() 0x0008 --->EnableNegativeMode() - - */ SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); @@ -1018,7 +1024,7 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) EnableNegativeMode(); } -//end of CHINA001 + #define LASTLINEPOS_DEFAULT 0 #define LASTLINEPOS_LEFT 1 @@ -1028,9 +1034,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) // class SvxParaAlignTabPage ------------------------------------------------ -/*-----------------16.01.97 19.34------------------- - ---------------------------------------------------*/ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet), aAlignFrm ( this, CUI_RES( FL_ALIGN ) ), @@ -1102,16 +1105,10 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ SvxParaAlignTabPage::~SvxParaAlignTabPage() { } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -1119,50 +1116,41 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxParaAlignTabPage(pParent, rSet); } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ sal_uInt16* SvxParaAlignTabPage::GetRanges() { return pAlignRanges; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; - FASTBOOL bAdj = sal_False, bChecked = sal_False; + bool bAdj = false, bChecked = false; SvxAdjust eAdjust = SVX_ADJUST_LEFT; if ( aLeft.IsChecked() ) { eAdjust = SVX_ADJUST_LEFT; bAdj = !aLeft.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aRight.IsChecked() ) { eAdjust = SVX_ADJUST_RIGHT; bAdj = !aRight.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aCenter.IsChecked() ) { eAdjust = SVX_ADJUST_CENTER; bAdj = !aCenter.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aJustify.IsChecked() ) { @@ -1170,7 +1158,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) bAdj = !aJustify.GetSavedValue() || aExpandCB.IsChecked() != aExpandCB.GetSavedValue() || aLastLineLB.GetSelectEntryPos() != aLastLineLB.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1188,7 +1176,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) else if ( 2 == nLBPos ) eLastBlock = SVX_ADJUST_BLOCK; - FASTBOOL bNothingWasChecked = + bool bNothingWasChecked = !aLeft.GetSavedValue() && !aRight.GetSavedValue() && !aCenter.GetSavedValue() && !aJustify.GetSavedValue(); @@ -1197,7 +1185,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) pOld->GetLastBlock() != eLastBlock || ( bChecked && bNothingWasChecked ) ) { - bModified |= sal_True; + bModified = TRUE; SvxAdjustItem aAdj( (const SvxAdjustItem&)GetItemSet().Get( _nWhich ) ); aAdj.SetAdjust( eAdjust ); @@ -1230,9 +1218,6 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) return bModified; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1331,9 +1316,6 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) UpdateExample_Impl(sal_True); } -/*-----------------17.01.97 08.06------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG ) { sal_Bool bJustify = aJustify.IsChecked(); @@ -1368,9 +1350,6 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) return 0; } -/*-----------------16.01.97 19.34------------------- - ---------------------------------------------------*/ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) { if ( aLeft.IsChecked() ) @@ -1393,9 +1372,8 @@ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) aExampleWin.Draw( bAll ); } -/*-----------------17.01.97 08.04------------------- - Erweiterungen fuer den Blocksatz einschalten ---------------------------------------------------*/ + +// Erweiterungen fuer den Blocksatz einschalten void SvxParaAlignTabPage::EnableJustifyExt() { aLastLineFT.Show(); @@ -1406,7 +1384,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() aSnapToGridCB.Show(); } -//add CHINA001 begin + void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); @@ -1414,8 +1392,6 @@ void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) if(pBoolItem->GetValue()) EnableJustifyExt(); } -//end of CHINA001 -// class SvxExtParagraphTabPage ------------------------------------------ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, const SfxItemSet& rSet ) @@ -1453,7 +1429,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) eHyphenState != aHyphenBox.GetSavedValue()) { rOutSet.Put( aHyphen ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1467,14 +1443,14 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { rOutSet.Put( aPageNum ); - bModified |= sal_True; + bModified = sal_True; } } // Seitenumbruch TriState eState = aApplyCollBtn.GetState(); - FASTBOOL bIsPageModel = sal_False; + bool bIsPageModel = false; _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); String sPage; @@ -1492,13 +1468,13 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { rOutSet.Put( SvxPageModelItem( sPage, sal_False, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } else - bIsPageModel = sal_False; + bIsPageModel = false; } else if(STATE_CHECK == eState && aApplyCollBtn.IsEnabled()) - bIsPageModel = sal_True; + bIsPageModel = true; else rOutSet.Put( SvxPageModelItem( sPage, sal_False, _nWhich ) ); @@ -1554,7 +1530,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { - bModified |= sal_True; + bModified = sal_True; rOutSet.Put( aBreak ); } } @@ -1573,7 +1549,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) ( eState == STATE_NOCHECK ) ) { rOutSet.Put( SvxFmtSplitItem( eState == STATE_NOCHECK, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1587,7 +1563,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) // hat sich der Status geaendert, muss immer geputtet werden rOutSet.Put( SvxFmtKeepItem( eState == STATE_CHECK, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } // Witwen und Waisen @@ -1604,7 +1580,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aWidowBox.GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1623,7 +1599,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(const SvxOrphansItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1728,7 +1704,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(sal_False); aPagenumText.Enable(sal_False); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1954,10 +1929,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )), aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )), aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )), -// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ), -// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ), -// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ), -// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), @@ -2034,7 +2005,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // ----------------------------------------------------------------------- -__EXPORT SvxExtParagraphTabPage::~SvxExtParagraphTabPage() +SvxExtParagraphTabPage::~SvxExtParagraphTabPage() { } @@ -2238,7 +2209,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox ) PageBreakPosHdl_Impl( &aBreakPositionLB ); return 0; } -//Add CHINA001 begin + void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) { @@ -2251,10 +2222,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) } -//end of Add CHINA001 -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet), aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )), @@ -2271,22 +2239,16 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : aForbiddenRulesCB.SetClickHdl( aLink ); } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianTabPage::~SvxAsianTabPage() { } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxAsianTabPage(pParent, rSet); } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxAsianTabPage::GetRanges() { static sal_uInt16 pRanges[] = @@ -2296,9 +2258,7 @@ sal_uInt16* SvxAsianTabPage::GetRanges() }; return pRanges; } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bRet = sal_False; @@ -2332,9 +2292,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) } return bRet; } -/*-- 29.11.00 11:36:25--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox) { sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId); @@ -2355,23 +2313,16 @@ void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox) void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) { lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB ); -// lcl_SetBox(rSet, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); - //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(sal_False); -// aPuntuationCB .Enable(sal_False); -// aAdjustNumbersCB .Enable(sal_False); } -/* -----------------------------19.12.00 12:59-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox ) { pBox->EnableTriState( sal_False ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index cd13bdb12a6d..b5659ca76f1c 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -694,9 +694,8 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH Left = TRUE ; }; }; -/*-- 29.11.00 11:36:24--------------------------------------------------- - Asian typography - -----------------------------------------------------------------------*/ + +// Asian typography TabPage RID_SVXPAGE_PARA_ASIAN { HelpId = HID_SVXPAGE_PARA_ASIAN ; diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..4f39be3c957b 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -29,110 +29,74 @@ String RID_SVXSTR_DESC_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ Text [ en-US ] = "Please enter a name for the gradient:" ; }; String RID_SVXSTR_ASK_DEL_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the gradient?" ; }; String RID_SVXSTR_ASK_CHANGE_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; }; String RID_SVXSTR_DESC_NEW_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ Text [ en-US ] = "Please enter a name for the bitmap:" ; }; String RID_SVXSTR_DESC_EXT_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ Text [ en-US ] = "Please enter a name for the external bitmap:" ; }; String RID_SVXSTR_ASK_DEL_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; }; String RID_SVXSTR_ASK_CHANGE_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; }; String RID_SVXSTR_DESC_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ Text [ en-US ] = "Please enter a name for the line style:" ; }; String RID_SVXSTR_ASK_DEL_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the line style?" ; }; String RID_SVXSTR_ASK_CHANGE_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; }; String RID_SVXSTR_DESC_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ Text [ en-US ] = "Please enter a name for the hatching:" ; }; String RID_SVXSTR_ASK_DEL_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the hatching?" ; }; String RID_SVXSTR_ASK_CHANGE_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; }; String RID_SVXSTR_CHANGE { - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ Text [ en-US ] = "Modify" ; }; String RID_SVXSTR_ADD { - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ Text [ en-US ] = "Add" ; }; String RID_SVXSTR_DESC_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ Text [ en-US ] = "Please enter a name for the new color:" ; }; String RID_SVXSTR_ASK_DEL_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the color?" ; }; String RID_SVXSTR_ASK_CHANGE_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; }; String RID_SVXSTR_TABLE @@ -149,8 +113,6 @@ String RID_SVXSTR_READ_DATA_ERROR }; String RID_SVXSTR_WARN_TABLE_OVERWRITE { - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; }; String RID_SVXSTR_WARN_NAME_DUPLICATE @@ -159,20 +121,14 @@ String RID_SVXSTR_WARN_NAME_DUPLICATE }; String RID_SVXSTR_DESC_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ Text [ en-US ] = "Please enter a name for the new arrowhead:" ; }; String RID_SVXSTR_ASK_DEL_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the arrowhead?" ; }; String RID_SVXSTR_ASK_CHANGE_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; }; diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index d231e3249cb4..2d08dede00ce 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <cstddef> #include <swpossizetabpage.hxx> #include <dialmgr.hxx> @@ -42,6 +40,7 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/rectenum.hxx> +#include <sal/macros.h> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -93,14 +92,14 @@ struct StringIdPair_Impl #define LB_REL_CHAR 0x00020000L // as char, relative to character #define LB_REL_ROW 0x00040000L // as char, relative to line -// OD 10.11.2003 #i22305# +// #i22305# #define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame #define LB_FLY_VERT_PRTAREA 0x00200000L // vertical frame text area -// OD 11.11.2003 #i22341# +// #i22341# #define LB_VERT_LINE 0x00400000L // vertical text line -static RelationMap __FAR_DATA aRelationMap[] = +static RelationMap aRelationMap[] = { {SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, RelOrientation::FRAME}, {SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA, RelOrientation::PRINT_AREA}, @@ -120,15 +119,15 @@ static RelationMap __FAR_DATA aRelationMap[] = {SwFPos::REL_BORDER, SwFPos::REL_BORDER, LB_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::REL_PRTAREA, SwFPos::REL_PRTAREA, LB_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 10.11.2003 #i22305# + // #i22305# {SwFPos::FLY_REL_PG_FRAME, SwFPos::FLY_REL_PG_FRAME, LB_FLY_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::FLY_REL_PG_PRTAREA, SwFPos::FLY_REL_PG_PRTAREA, LB_FLY_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 11.11.2003 #i22341# + // #i22341# {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, RelOrientation::TEXT_LINE} }; -static RelationMap __FAR_DATA aAsCharRelationMap[] = +static RelationMap aAsCharRelationMap[] = { {SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, RelOrientation::FRAME}, {SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, RelOrientation::FRAME}, @@ -142,7 +141,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] = #define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHPageMap[] = +static FrmMap aHPageMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PAGE_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PAGE_REL}, @@ -150,14 +149,14 @@ static FrmMap __FAR_DATA aHPageMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_PAGE_REL} }; -static FrmMap __FAR_DATA aHPageHtmlMap[] = +static FrmMap aHPageHtmlMap[] = { {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; #define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVPageMap[] = +static FrmMap aVPageMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PAGE_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PAGE_REL}, @@ -165,7 +164,7 @@ static FrmMap __FAR_DATA aVPageMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PAGE_REL} }; -static FrmMap __FAR_DATA aVPageHtmlMap[] = +static FrmMap aVPageHtmlMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_REL_PG_FRAME} }; @@ -177,7 +176,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] = #define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHFrameMap[] = +static FrmMap aHFrameMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_FRAME_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_FRAME_REL}, @@ -185,17 +184,17 @@ static FrmMap __FAR_DATA aHFrameMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_FRAME_REL} }; -static FrmMap __FAR_DATA aHFlyHtmlMap[] = +static FrmMap aHFlyHtmlMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, LB_FLY_REL_PG_FRAME}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects -// OD 10.11.2003 #i22305# +// #i18732# - own vertical alignment map for to frame anchored objects +// #i22305# #define VERT_FRAME_REL (LB_VERT_FRAME|LB_FLY_VERT_PRTAREA) -static FrmMap __FAR_DATA aVFrameMap[] = +static FrmMap aVFrameMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_FRAME_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_FRAME_REL}, @@ -203,17 +202,17 @@ static FrmMap __FAR_DATA aVFrameMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_FRAME_REL} }; -static FrmMap __FAR_DATA aVFlyHtmlMap[] = +static FrmMap aVFlyHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_FLY_VERT_FRAME}, {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_FLY_VERT_FRAME} }; -static FrmMap __FAR_DATA aVMultiSelectionMap[] = +static FrmMap aVMultiSelectionMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, 0} }; -static FrmMap __FAR_DATA aHMultiSelectionMap[] = +static FrmMap aHMultiSelectionMap[] = { {SwFPos::FROMLEFT, SwFPos::FROMLEFT, HoriOrientation::NONE, 0} }; @@ -226,7 +225,7 @@ static FrmMap __FAR_DATA aHMultiSelectionMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) -static FrmMap __FAR_DATA aHParaMap[] = +static FrmMap aHParaMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PARA_REL}, @@ -236,13 +235,13 @@ static FrmMap __FAR_DATA aHParaMap[] = #define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) -static FrmMap __FAR_DATA aHParaHtmlMap[] = +static FrmMap aHParaHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; -static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = +static FrmMap aHParaHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL} @@ -252,7 +251,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = #define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVParaMap[] = +static FrmMap aVParaMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PARA_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PARA_REL}, @@ -260,7 +259,7 @@ static FrmMap __FAR_DATA aVParaMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PARA_REL} }; -static FrmMap __FAR_DATA aVParaHtmlMap[] = +static FrmMap aVParaHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_VERT_PRTAREA} }; @@ -273,7 +272,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharMap[] = +static FrmMap aHCharMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_CHAR_REL}, @@ -283,27 +282,27 @@ static FrmMap __FAR_DATA aHCharMap[] = #define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharHtmlMap[] = +static FrmMap aHCharHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT, HTML_HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_CHAR_REL} }; -static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = +static FrmMap aHCharHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, LB_PRTAREA|LB_REL_CHAR}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, LB_PRTAREA}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - allow vertical alignment at page areas -// OD 12.11.2003 #i22341# - handle <LB_REL_CHAR> on its own +// #i18732# - allow vertical alignment at page areas +// #i22341# - handle <LB_REL_CHAR> on its own #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVCharMap[] = +static FrmMap aVCharMap[] = { - // OD 11.11.2003 #i22341# + // #i22341# // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> // Note: Because of these adjustments the map becomes ambigous in its values @@ -322,12 +321,12 @@ static FrmMap __FAR_DATA aVCharMap[] = }; -static FrmMap __FAR_DATA aVCharHtmlMap[] = +static FrmMap aVCharHtmlMap[] = { {SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} }; -static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = +static FrmMap aVCharHtmlAbsMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_CHAR}, {SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} @@ -336,7 +335,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = anchored as character --------------------------------------------------------------------*/ -static FrmMap __FAR_DATA aVAsCharMap[] = +static FrmMap aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, LB_REL_BASE}, @@ -353,7 +352,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] = {SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, VertOrientation::NONE, LB_REL_BASE} }; -static FrmMap __FAR_DATA aVAsCharHtmlMap[] = +static FrmMap aVAsCharHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::CENTER, LB_REL_BASE}, @@ -364,66 +363,60 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] = {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::LINE_BOTTOM, LB_REL_ROW}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::LINE_CENTER, LB_REL_ROW} }; -/*-- 05.03.2004 15:52:56--------------------------------------------------- - -----------------------------------------------------------------------*/ std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) { - if ( pMap ) + if( pMap ) { - std::size_t aSizeOf = sizeof(FrmMap); - if( pMap == aVParaHtmlMap) - return sizeof(aVParaHtmlMap) / aSizeOf; - if( pMap == aVAsCharHtmlMap) - return sizeof(aVAsCharHtmlMap) / aSizeOf; - if( pMap == aHParaHtmlMap) - return sizeof(aHParaHtmlMap) / aSizeOf; - if( pMap == aHParaHtmlAbsMap) - return sizeof(aHParaHtmlAbsMap) / aSizeOf; - if ( pMap == aVPageMap ) - return sizeof(aVPageMap) / aSizeOf; - if ( pMap == aVPageHtmlMap ) - return sizeof(aVPageHtmlMap) / aSizeOf; - if ( pMap == aVAsCharMap ) - return sizeof(aVAsCharMap) / aSizeOf; - if ( pMap == aVParaMap ) - return sizeof(aVParaMap) / aSizeOf; - if ( pMap == aHParaMap ) - return sizeof(aHParaMap) / aSizeOf; - if ( pMap == aHFrameMap ) - return sizeof(aHFrameMap) / aSizeOf; - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects - if ( pMap == aVFrameMap ) - return sizeof(aVFrameMap) / aSizeOf; - if ( pMap == aHCharMap ) - return sizeof(aHCharMap) / aSizeOf; - if ( pMap == aHCharHtmlMap ) - return sizeof(aHCharHtmlMap) / aSizeOf; - if ( pMap == aHCharHtmlAbsMap ) - return sizeof(aHCharHtmlAbsMap) / aSizeOf; - if ( pMap == aVCharMap ) - return sizeof(aVCharMap) / aSizeOf; - if ( pMap == aVCharHtmlMap ) - return sizeof(aVCharHtmlMap) / aSizeOf; - if ( pMap == aVCharHtmlAbsMap ) - return sizeof(aVCharHtmlAbsMap) / aSizeOf; - if ( pMap == aHPageHtmlMap ) - return sizeof(aHPageHtmlMap) / aSizeOf; - if ( pMap == aHFlyHtmlMap ) - return sizeof(aHFlyHtmlMap) / aSizeOf; - if ( pMap == aVFlyHtmlMap ) - return sizeof(aVFlyHtmlMap) / aSizeOf; - if( pMap == aVMultiSelectionMap) - return sizeof(aVMultiSelectionMap) / aSizeOf; - if( pMap == aHMultiSelectionMap) - return sizeof(aHMultiSelectionMap) / aSizeOf; - return sizeof(aHPageMap) / aSizeOf; + if( pMap == aVParaHtmlMap ) + return SAL_N_ELEMENTS(aVParaHtmlMap); + if( pMap == aVAsCharHtmlMap ) + return SAL_N_ELEMENTS( aVAsCharHtmlMap ); + if( pMap == aHParaHtmlMap ) + return SAL_N_ELEMENTS( aHParaHtmlMap ); + if( pMap == aHParaHtmlAbsMap ) + return SAL_N_ELEMENTS( aHParaHtmlAbsMap ); + if( pMap == aVPageMap ) + return SAL_N_ELEMENTS( aVPageMap ); + if( pMap == aVPageHtmlMap ) + return SAL_N_ELEMENTS( aVPageHtmlMap ); + if( pMap == aVAsCharMap ) + return SAL_N_ELEMENTS( aVAsCharMap ); + if( pMap == aVParaMap ) + return SAL_N_ELEMENTS( aVParaMap ); + if( pMap == aHParaMap ) + return SAL_N_ELEMENTS( aHParaMap ); + if( pMap == aHFrameMap ) + return SAL_N_ELEMENTS( aHFrameMap ); + if( pMap == aVFrameMap ) + return SAL_N_ELEMENTS( aVFrameMap ); + if( pMap == aHCharMap ) + return SAL_N_ELEMENTS( aHCharMap ); + if( pMap == aHCharHtmlMap ) + return SAL_N_ELEMENTS( aHCharHtmlMap ); + if( pMap == aHCharHtmlAbsMap ) + return SAL_N_ELEMENTS( aHCharHtmlAbsMap ); + if( pMap == aVCharMap ) + return SAL_N_ELEMENTS( aVCharMap ); + if( pMap == aVCharHtmlMap ) + return SAL_N_ELEMENTS( aVCharHtmlMap ); + if( pMap == aVCharHtmlAbsMap ) + return SAL_N_ELEMENTS( aVCharHtmlAbsMap ); + if( pMap == aHPageHtmlMap ) + return SAL_N_ELEMENTS( aHPageHtmlMap ); + if( pMap == aHFlyHtmlMap ) + return SAL_N_ELEMENTS( aHFlyHtmlMap ); + if( pMap == aVFlyHtmlMap ) + return SAL_N_ELEMENTS( aVFlyHtmlMap ); + if( pMap == aVMultiSelectionMap ) + return SAL_N_ELEMENTS( aVMultiSelectionMap ); + if( pMap == aHMultiSelectionMap ) + return SAL_N_ELEMENTS( aHMultiSelectionMap ); + return SAL_N_ELEMENTS(aHPageMap); } return 0; } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bRTL) { @@ -461,7 +454,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( {SwFPos::REL_FRM_BOTTOM, SwFPos::REL_FRM_RIGHT } }; sal_uInt16 nIndex; - for(nIndex = 0; nIndex < sizeof(aHoriIds) / sizeof(StringIdPair_Impl); ++nIndex) + for(nIndex = 0; nIndex < SAL_N_ELEMENTS(aHoriIds); ++nIndex) { if(aHoriIds[nIndex].eHori == eStringId) { @@ -470,7 +463,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } } nIndex = 0; - for(nIndex = 0; nIndex < sizeof(aVertIds) / sizeof(StringIdPair_Impl); ++nIndex) + for(nIndex = 0; nIndex < SAL_N_ELEMENTS(aVertIds); ++nIndex) { if(aVertIds[nIndex].eHori == eStringId) { @@ -481,14 +474,13 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } return eStringId; } -// OD 12.11.2003 #i22341# - helper method in order to determine all possible +// #i22341# - helper method in order to determine all possible // listbox relations in a relation map for a given relation sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) { sal_uLong nLBRelations = 0L; - sal_uInt16 nRelMapSize = sizeof(aRelationMap) / sizeof(RelationMap); - for ( sal_uInt16 nRelMapPos = 0; nRelMapPos < nRelMapSize; ++nRelMapPos ) + for ( sal_uInt16 nRelMapPos = 0; nRelMapPos < SAL_N_ELEMENTS(aRelationMap); ++nRelMapPos ) { if ( aRelationMap[nRelMapPos].nRelation == _nRel ) { @@ -499,7 +491,7 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) return nLBRelations; } -// OD 14.11.2003 #i22341# - helper method on order to determine all possible +// #i22341# - helper method on order to determine all possible // listbox relations in a relation map for a given string ID sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, const SvxSwFramePosString::StringId _eStrId, @@ -519,9 +511,7 @@ sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ), #ifdef _MSC_VER @@ -623,22 +613,16 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn m_aHoriMirrorCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, MirrorHdl)); m_aPositionCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, ProtectHdl)); } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new SvxSwPosSizeTabPage(pParent, rSet); } -/*-- 05.03.2004 17:27:42--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() { static sal_uInt16 pSwPosRanges[] = @@ -667,9 +651,7 @@ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() }; return pSwPosRanges; } -/*-- 03.03.2004 12:21:34--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { bool bAnchorChanged = false; @@ -773,7 +755,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) sal_uInt16 nMapPos = GetMapPos(m_pVMap, m_aVertLB); short nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); short nRel = GetRelation(m_pVMap, m_aVertToLB); - // --> OD 2004-10-21 #i34055# - convert vertical position for + // #i34055# - convert vertical position for // as-character anchored objects long nVertByPos = static_cast<long>(m_aVertByMF.Denormalize(m_aVertByMF.GetValue(FUNIT_TWIP))); @@ -781,7 +763,6 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { nVertByPos *= -1; } - // <-- if ( nAlign != rVertOrient.GetValue() || nRel != rVertRelation.GetValue() || ( m_aVertByMF.IsEnabled() && @@ -795,7 +776,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) } } - // OD 19.09.2003 #i18732# + // #i18732# if(m_aFollowCB.IsChecked() != m_aFollowCB.GetSavedValue()) { //Writer internal type - based on SfxBoolItem @@ -826,9 +807,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) return bModified; } -/*-- 03.03.2004 12:21:34--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) { const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TRANSFORM_ANCHOR ); @@ -931,15 +910,15 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) } m_aHoriMirrorCB.Show(sal_False); m_aKeepRatioCB.Enable(sal_False); - // OD 19.09.2003 #i18732# - hide checkbox in HTML mode + // #i18732# - hide checkbox in HTML mode m_aFollowCB.Show(sal_False); } else { - // OD 06.11.2003 #i18732# correct enable/disable of check box 'Mirror on..' + // #i18732# correct enable/disable of check box 'Mirror on..' m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable/disable check box 'Follow text flow'. + // #i18732# - enable/disable check box 'Follow text flow'. m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); } @@ -997,24 +976,20 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_aVertByMF.SaveValue(); m_aHoriByMF.SaveValue(); - // OD 19.09.2003 #i18732# + // #i18732# m_aFollowCB.SaveValue(); RangeModifyHdl(&m_aWidthMF); // initially set maximum values } } -/*-- 03.03.2004 12:21:35--------------------------------------------------- - -----------------------------------------------------------------------*/ int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( *_pSet ); return( LEAVE_PAGE ); } -/*-- 04.03.2004 09:14:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) { if((nAnchorEnable & SVX_OBJ_AT_FLY)) @@ -1022,9 +997,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) if(!(nAnchorEnable & SVX_OBJ_PAGE)) m_aToPageRB.Enable(sal_False); } -/*-- 04.03.2004 09:33:33--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) { short nRet = -1; @@ -1066,9 +1039,7 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) } return nRet; } -/*-- 05.03.2004 10:43:32--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) { if(m_bPositioningDisabled) @@ -1079,7 +1050,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) aVal.bAutoHeight = false; aVal.bAutoWidth = false; aVal.bMirror = m_aHoriMirrorCB.IsChecked(); - // OD 18.09.2003 #i18732# + // #i18732# aVal.bFollowTextFlow = m_aFollowCB.IsChecked(); if ( m_pHMap ) @@ -1152,14 +1123,12 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) return 0; } -/*-- 05.03.2004 11:12:56--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) { m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable check box 'Follow text flow' for anchor + // #i18732# - enable check box 'Follow text flow' for anchor // type to-paragraph' and to-character m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); @@ -1175,9 +1144,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) } return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG ) { short nId = GetAnchorType(); @@ -1185,9 +1152,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG ) return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) { sal_Bool bHori = pLB == &m_aHoriToLB; @@ -1199,32 +1164,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) else m_bAtVertPosModified = sal_True; - // OD 12.11.2003 #i22341# - following special handling no longer needed - /* - if (!bHori && m_pVMap == aVCharMap) - { - // Ausrichtung Vertikal - String sEntry; - sal_uInt16 nMapPos = GetMapPos(m_pVMap, m_aVertLB); - sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); - sal_uInt16 nRel = GetRelation(m_pVMap, m_aVertToLB); - - if (nRel == SwFPos::REL_CHAR) - sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM); - else - sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP); - - sal_uInt16 nOldPos = m_aVertLB.GetSelectEntryPos(); - - String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1); - if (sName != sEntry) - { - m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1); - m_aVertLB.InsertEntry(sEntry); - m_aVertLB.SelectEntryPos(nOldPos); - } - } - */ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung { if(bHori) @@ -1246,9 +1185,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) { sal_Bool bHori = pLB == &m_aHoriLB; @@ -1353,9 +1290,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) } return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) { sal_Int64 nWidth = m_aWidthMF.Denormalize(m_aWidthMF.GetValue(FUNIT_TWIP)); @@ -1377,17 +1312,13 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) UpdateExample(); return 0; } -/*-- 11.03.2004 15:40:17--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, ProtectHdl, TriStateBox *, EMPTYARG) { m_aSizeCB.Enable(m_aPositionCB.IsEnabled() && !m_aPositionCB.IsChecked()); return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) { short nRel = 0; @@ -1401,14 +1332,12 @@ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) return nRel; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &/*rAlignLB*/, ListBox &rRelationLB) { short nAlign = 0; - // OD 14.11.2003 #i22341# - special handling also for map <aVCharMap>, + // #i22341# - special handling also for map <aVCharMap>, // because it contains ambigous items for alignment if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap || pMap == aVCharMap ) @@ -1438,9 +1367,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo return nAlign; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) { sal_uInt16 nMapPos = 0; @@ -1472,9 +1399,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) return nMapPos; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::InitPos(short nAnchor, sal_uInt16 nH, sal_uInt16 nHRel, @@ -1515,7 +1440,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, } else if ( nAnchor == TextContentAnchorType_AT_FRAME ) { - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame + // #i18732# - own vertical alignment map for to frame // anchored objects. m_pVMap = m_bHtmlMode ? aVFlyHtmlMap : aVFrameMap; m_pHMap = m_bHtmlMode ? aHFlyHtmlMap : aHFrameMap; @@ -1562,7 +1487,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nH = m_nOldH; nHRel = m_nOldHRel; } - // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> sal_uInt16 nMapPos = FillPosLB(m_pHMap, nH, nHRel, m_aHoriLB); FillRelLB(m_pHMap, nMapPos, nH, nHRel, m_aHoriToLB, m_aHoriToFT); @@ -1572,7 +1497,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nV = m_nOldV; nVRel = m_nOldVRel; } - // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> nMapPos = FillPosLB(m_pVMap, nV, nVRel, m_aVertLB); FillRelLB(m_pVMap, nMapPos, nV, nVRel, m_aVertToLB, m_aVertToFT); @@ -1624,9 +1549,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, m_aVertByMF.Enable( bEnable ); UpdateExample(); } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::UpdateExample() { sal_uInt16 nPos = m_aHoriLB.GetSelectEntryPos(); @@ -1659,9 +1582,7 @@ void SvxSwPosSizeTabPage::UpdateExample() m_aExampleWN.SetAnchor( GetAnchorType() ); m_aExampleWN.Invalidate(); } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16 nAlign, sal_uInt16 nRel, ListBox &rLB, FixedText &rFT) { @@ -1676,7 +1597,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap) { String sOldEntry(rLB.GetSelectEntry()); - sal_uInt16 nRelCount = sizeof(aAsCharRelationMap) / sizeof(RelationMap); + sal_uInt16 nRelCount = SAL_N_ELEMENTS(aAsCharRelationMap); SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; for (std::size_t _nMapPos = 0; _nMapPos < nMapCount; _nMapPos++) @@ -1723,9 +1644,9 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u } else { - sal_uInt16 nRelCount = sizeof(aRelationMap) / sizeof(RelationMap); + sal_uInt16 nRelCount = SAL_N_ELEMENTS(aRelationMap); - // OD 14.11.2003 #i22341# - special handling for map <aVCharMap>, + // #i22341# - special handling for map <aVCharMap>, // because its ambigous in its <eStrId>/<eMirrorStrId>. if ( pMap == aVCharMap ) { @@ -1807,9 +1728,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u return nLBRelations; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, sal_uInt16 _nAlign, const sal_uInt16 _nRel, @@ -1820,7 +1739,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, _rLB.Clear(); - // OD 12.11.2003 #i22341# - determine all possible listbox relations for + // #i22341# - determine all possible listbox relations for // given relation for map <aVCharMap> const sal_uLong nLBRelations = (_pMap != aVCharMap) ? 0L @@ -1841,7 +1760,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen _rLB.InsertEntry(sEntry); } - // OD 12.11.2003 #i22341# - add condition to handle map <aVCharMap> + // #i22341# - add condition to handle map <aVCharMap> // that is ambigous in the alignment. if ( _pMap[i].nAlign == _nAlign && ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) ) @@ -1862,15 +1781,13 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, return GetMapPos(_pMap, _rLB); } -/*-- 09.03.2004 15:37:50--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) { m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set"); + OSL_FAIL("No SdrView* set"); return; } @@ -1930,7 +1847,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) } // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE - if( rMarkList.GetMarkCount() == 1 ) + if( rMarkList.GetMarkCount() != 1 ) + m_bIsMultiSelection = true; +#if OSL_DEBUG_LEVEL > 1 + else { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); @@ -1938,34 +1858,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled"); + OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } } - else - m_bIsMultiSelection = true; - - // use page offset and recalculate - Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() ); - - // Massstab - Fraction aUIScale = m_pSdrView->GetModel()->GetUIScale(); - -// lcl_ScaleRect( m_aWorkArea, aUIScale ); -// lcl_ScaleRect( m_aRect, aUIScale ); -// lcl_ScalePoint( aPt, aUIScale ); - - // Metrik konvertieren -// int nDigits = maMtrPosX.GetDecimalDigits(); - -// aPt = lcl_ConvertPoint( aPt, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aWorkArea = lcl_ConvertRect( m_aWorkArea, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aRect = lcl_ConvertRect( m_aRect, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); - - // use page offset -// aPt *= -1; -// aPt += m_aWorkArea.TopLeft(); -// m_aWorkArea.SetPos( aPt ); - - //SetMinMaxPosition(); +#endif } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index 518d02535d87..76a197705cff 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <svx/swframeposstrings.hxx> #include <svx/swframeexample.hxx> -/*-- 01.03.2004 15:45:01--------------------------------------------------- - SvxSwPosSizeTabPage - position and size page for Writer drawing objects - -----------------------------------------------------------------------*/ +// SvxSwPosSizeTabPage - position and size page for Writer drawing objects struct FrmMap; class SdrView; class SvxSwPosSizeTabPage : public SfxTabPage @@ -156,3 +155,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 4e873f4cb021..95491d5382ad 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - #include <tools/ref.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -50,7 +46,6 @@ #include "cuitabarea.hxx" #include "tabarea.hrc" #include "dlgname.hxx" -//#include "dlgname.hrc" #include <dialmgr.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -72,7 +67,6 @@ SvxAreaTabDialog::SvxAreaTabDialog SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ), mpDrawModel ( pModel ), -// mpView ( pSdrView ), mpColorTab ( pModel->GetColorTable() ), mpNewColorTab ( pModel->GetColorTable() ), mpGradientList ( pModel->GetGradientList() ), @@ -121,13 +115,6 @@ SvxAreaTabDialog::~SvxAreaTabDialog() void SvxAreaTabDialog::SavePalettes() { SfxObjectShell* pShell = SfxObjectShell::Current(); - /*uno::Reference< frame::XDispatchProvider > xDispatchProvider; - if ( !pShell ) - { - uno::Reference< frame::XModel> xModel = mpDrawModel->getUnoModel(); - if ( xModel.is() ) - xDispatchProvider.set(xModel->getCurrentController(),uno::UNO_QUERY); - }*/ if( mpNewColorTab != mpDrawModel->GetColorTable() ) { if(mbDeleteColorTable) @@ -280,12 +267,9 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList ); ( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList ); ( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList ); - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); //add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetDlgType( &mnDlgType ); - ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );//add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPos( &nPos ); - ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );//add CHINA001 + ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType ); + ( (SvxAreaTabPage&) rPage ).SetPos( mnPos ); ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); @@ -300,9 +284,8 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) case RID_SVXPAGE_SHADOW: { ( (SvxShadowTabPage&) rPage ).SetColorTable( mpColorTab ); - ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetDlgType( &mnDlgType ); - //( (SvxShadowTabPage&) rPage ).SetPos( &nPos ); + ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxShadowTabPage&) rPage ).Construct(); @@ -357,12 +340,12 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) break; case RID_SVXPAGE_TRANSPARENCE: - ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetDlgType( &mnDlgType ); + ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxTransparenceTabPage&) rPage ).Construct(); break; } } - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index 8303509d4c64..4fd3db7c8996 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1545,24 +1545,6 @@ TabDialog RID_SVXDLG_AREA }; }; -Image RID_SVXIMG_LOAD_H -{ - ImageBitmap = Bitmap - { - File = "sch05501.bmp" ; - }; - MASKCOLOR -}; - -Image RID_SVXIMG_SAVE_H -{ - ImageBitmap = Bitmap - { - File = "sch05502.bmp" ; - }; - MASKCOLOR -}; - String STR_LB_HATCHINGSTYLE { Text [ en-US ] = "Hatching Style" ; diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 8d0e287b86b5..edd5d339a5e3 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> @@ -39,7 +36,6 @@ #define _SVX_TABLINE_CXX #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "cuitabarea.hxx" #include "cuitabline.hxx" @@ -122,13 +118,11 @@ SvxLineTabDialog::SvxLineTabDialog AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0); AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0); -// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); -//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) ); } // ----------------------------------------------------------------------- @@ -236,8 +230,8 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxLineTabPage&) rPage ).SetColorTable( pColorTab ); ( (SvxLineTabPage&) rPage ).SetDashList( pDashList ); ( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList ); - ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxLineTabPage&) rPage ).SetPageType( nPageType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetPageType( &nPageType ); + ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType ); + ( (SvxLineTabPage&) rPage ).SetPageType( nPageType ); ( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb ); ( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb ); ( (SvxLineTabPage&) rPage ).SetDashChgd( &nDashListState ); @@ -280,19 +274,8 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxShadowTabPage&) rPage ).Construct(); } break; -/* - case RID_SVXPAGE_COLOR: - ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab ); - ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType ); - ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxColorTabPage&) rPage ).SetPos( &mnPos ); - ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP ); - ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState ); - ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable ); - ( (SvxColorTabPage&) rPage ).Construct(); - break; -*/ } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index bdda4ebd1e54..de03c1b0a803 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; MetricField MTR_FLD_LENGTH_2 @@ -545,7 +545,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; FixedText FT_DISTANCE @@ -569,7 +569,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 5000 ; SpinSize = 10 ; }; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index bc285bf18c31..e49a21fa33a1 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,16 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <tools/shl.hxx> #include <svtools/ruler.hxx> #include <svx/dialogs.hrc> -#include <svx/dialogs.hrc> #define _SVX_TABSTPGE_CXX @@ -48,8 +45,8 @@ #include <svl/cjkoptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <sfx2/request.hxx> //CHINA001 -#include <svl/intitem.hxx> //add CHINA001 +#include <sfx2/request.hxx> +#include <svl/intitem.hxx> // class TabWin_Impl ----------------------------------------------------- @@ -751,11 +748,12 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG ) aDelBtn.Disable(); return 0; } -//add CHINA001 Begin -void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) + +void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); if (pControlItem) DisableControls(pControlItem->GetValue()); } -//end of CHINA001 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e9a27adc2cd4..44051fcee53e 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -58,7 +56,7 @@ static sal_uInt16 pRanges[] = |* \************************************************************************/ -__EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, +SvxTextTabDialog::SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ), @@ -77,7 +75,7 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, |* \************************************************************************/ -void __EXPORT SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { @@ -194,7 +192,7 @@ SvxTextAnimationPage::~SvxTextAnimationPage() |* \************************************************************************/ -void __EXPORT SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) { const SfxItemPool* pPool = rAttrs.GetPool(); @@ -773,3 +771,4 @@ sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index 3ccd6987943f..4f2ffda07519 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -237,7 +237,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Spin = TRUE ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; Minimum = 1 ; First = 1 ; Maximum = 10000 ; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index aa2eb7f30573..ba83ce16c707 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -52,8 +50,8 @@ #include "textattr.hrc" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <sfx2/request.hxx> //add CHINA001 -#include <svx/ofaitem.hxx> //add CHINA001 +#include <sfx2/request.hxx> +#include <svx/ofaitem.hxx> #include <editeng/writingmodeitem.hxx> static sal_uInt16 pRanges[] = @@ -65,35 +63,6 @@ static sal_uInt16 pRanges[] = /************************************************************************* |* -|* Dialog zum Kopieren von Objekten -|* -\************************************************************************/ - -//CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs, -//CHINA001 const SdrView* pSdrView ) : -//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) -//CHINA001 { -//CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs ); -//CHINA001 -//CHINA001 pPage->SetView( pSdrView ); -//CHINA001 pPage->Construct(); -//CHINA001 -//CHINA001 SetTabPage( pPage ); -//CHINA001 SetText( pPage->GetText() ); -//CHINA001 } -//CHINA001 -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - -//CHINA001 SvxTextAttrDialog::~SvxTextAttrDialog() -//CHINA001 { -//CHINA001 } - -/************************************************************************* -|* |* Dialog (Seite) zum Kopieren von Objekten |* \************************************************************************/ @@ -164,7 +133,7 @@ SvxTextAttrPage::~SvxTextAttrPage() |* \************************************************************************/ -void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -451,10 +420,9 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) switch( eState ) { default: ; //prevent warning - DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); + OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break; - //case STATE_CHECK: eFTS = SDRTEXTFIT_RESIZEATTR; break; - case STATE_CHECK: eFTS = SDRTEXTFIT_PROPORTIONAL; break; + case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break; } rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) ); } @@ -786,7 +754,6 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const return bLeftToRightDirection; } -//add CHINA001 begin void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); @@ -797,4 +764,4 @@ void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) Construct(); } -//end of CHINA001 +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0cf286217982..074cac9c084d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <sfx2/app.hxx> @@ -37,7 +34,7 @@ #define _SVX_TPAREA_CXX -#if defined (UNX) || defined (WTC) || defined (ICC) || defined(WNT) +#if defined (UNX) || defined (ICC) || defined(WNT) #include <stdlib.h> #endif @@ -45,7 +42,6 @@ #include <svx/xpool.hxx> #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> #include <svx/xtable.hxx> @@ -55,8 +51,8 @@ #include "dlgname.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svl/intitem.hxx> //add CHINA001 -#include <sfx2/request.hxx>//add CHINA001 +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> #include "paragrph.hrc" #define DLGWIN this->GetParent()->GetParent() @@ -434,9 +430,7 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) rAttrs.Put(aShadowItem); bModified = sal_True; } - //add CHINA001 begin rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - //add CHINA001 end return bModified; } @@ -507,15 +501,12 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) { - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); - //add CHINA001 end - //CHINA001 if(*pDlgType == 0) // Flaechen-Dialog - //CHINA001 *pPageType = PT_TRANSPARENCE; - if(nDlgType == 0) //add CHINA001 // Flaechen-Dialog - nPageType = PT_TRANSPARENCE; //add CHINA001 + + if(nDlgType == 0) // Flaechen-Dialog + nPageType = PT_TRANSPARENCE; InitPreview ( rSet ); } @@ -603,7 +594,7 @@ void SvxTransparenceTabPage::InvalidatePreview (sal_Bool bEnable) } } -void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); @@ -803,22 +794,20 @@ void SvxAreaTabPage::Construct() void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { - sal_uInt16 _nPos = 0; sal_uInt16 nCount; - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pPosItem) SetPos(pPosItem->GetValue()); - //add CHINA001 end - if( nDlgType == 0 )//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { *pbAreaTP = sal_True; if( pColorTab ) { + USHORT _nPos = 0; // Bitmapliste if( *pnBitmapListState ) { @@ -919,35 +908,35 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) // evaluate if any other Tabpage set another filltype if( aTypeLB.GetSelectEntryPos() > XFILL_NONE) { - switch( nPageType )//CHINA001 switch( *pPageType ) + switch( nPageType ) { case PT_GRADIENT: aTypeLB.SelectEntryPos( XFILL_GRADIENT ); - aLbGradient.SelectEntryPos( _nPos );//CHINA001 aLbGradient.SelectEntryPos( *pPos ); + aLbGradient.SelectEntryPos( _nPos ); ClickGradientHdl_Impl( this ); break; case PT_HATCH: aTypeLB.SelectEntryPos( XFILL_HATCH ); - aLbHatching.SelectEntryPos( _nPos );//CHINA001 aLbHatching.SelectEntryPos( *pPos ); + aLbHatching.SelectEntryPos( _nPos ); ClickHatchingHdl_Impl( this ); break; case PT_BITMAP: aTypeLB.SelectEntryPos( XFILL_BITMAP ); - aLbBitmap.SelectEntryPos( _nPos );//CHINA001 aLbBitmap.SelectEntryPos( *pPos ); + aLbBitmap.SelectEntryPos( _nPos ); ClickBitmapHdl_Impl( this ); break; case PT_COLOR: aTypeLB.SelectEntryPos( XFILL_SOLID ); - aLbColor.SelectEntryPos( _nPos );//CHINA001 aLbColor.SelectEntryPos( *pPos ); - aLbHatchBckgrdColor.SelectEntryPos( _nPos ); //CHINA001 aLbHatchBckgrdColor.SelectEntryPos( *pPos ); + aLbColor.SelectEntryPos( _nPos ); + aLbHatchBckgrdColor.SelectEntryPos( _nPos ); ClickColorHdl_Impl( this ); break; } } - nPageType = PT_AREA;//CHINA001 *pPageType = PT_AREA; + nPageType = PT_AREA; } } } @@ -956,33 +945,33 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Flaechen-Dialog//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); switch( eStyle ) { case XFILL_GRADIENT: { - nPageType = PT_GRADIENT;//CHINA001 *pPageType = PT_GRADIENT; - nPos = aLbGradient.GetSelectEntryPos();//CHINA001 *pPos = aLbGradient.GetSelectEntryPos(); + nPageType = PT_GRADIENT; + nPos = aLbGradient.GetSelectEntryPos(); } break; case XFILL_HATCH: { - nPageType = PT_HATCH;//CHINA001 *pPageType = PT_HATCH; - nPos = aLbHatching.GetSelectEntryPos();//CHINA001 *pPos = aLbHatching.GetSelectEntryPos(); + nPageType = PT_HATCH; + nPos = aLbHatching.GetSelectEntryPos(); } break; case XFILL_BITMAP: { - nPageType = PT_BITMAP;//CHINA001 *pPageType = PT_BITMAP; - nPos = aLbBitmap.GetSelectEntryPos();//CHINA001 *pPos = aLbBitmap.GetSelectEntryPos(); + nPageType = PT_BITMAP; + nPos = aLbBitmap.GetSelectEntryPos(); } break; case XFILL_SOLID: { - nPageType = PT_COLOR;//CHINA001 *pPageType = PT_COLOR; - nPos = aLbColor.GetSelectEntryPos();//CHINA001 *pPos = aLbColor.GetSelectEntryPos(); + nPageType = PT_COLOR; + nPos = aLbColor.GetSelectEntryPos(); } break; default: ;//prevent warning @@ -1003,7 +992,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) sal_uInt16 _nPos; sal_Bool bModified = sal_False; - if( nDlgType != 0 || *pbAreaTP )//CHINA001 if( *pDlgType != 0 || *pbAreaTP ) + if( nDlgType != 0 || *pbAreaTP ) { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); XFillStyle eSavedStyle = (XFillStyle) aTypeLB.GetSavedValue(); @@ -1274,7 +1263,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese nicht skaliert werden; dieses wird - // im Item beruecksichtigt ( KA05.11.96 ) + // im Item beruecksichtigt pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) ); } } @@ -1311,7 +1300,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese vom MetricItem nicht skaliert werden; - // dieses wird im Item beruecksichtigt ( KA05.11.96 ) + // dieses wird im Item beruecksichtigt pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) ); } } @@ -1427,10 +1416,8 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - //add CHINA001 begin rAttrs.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); rAttrs.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); - //add CHINA001 end } return( bModified ); @@ -1440,8 +1427,6 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { - //const SfxPoolItem *pPoolItem = NULL; - XFillStyle eXFS; if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) { @@ -1455,7 +1440,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_SOLID: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLCOLOR ) ) { XFillColorItem aColorItem( ( const XFillColorItem& ) @@ -1469,7 +1453,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_GRADIENT: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLGRADIENT ) ) { XFillGradientItem aGradientItem( ( ( const XFillGradientItem& ) @@ -1483,7 +1466,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_HATCH: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLHATCH ) ) { aLbHatching.SelectEntry( ( ( const XFillHatchItem& ) @@ -1521,8 +1503,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; default: - //aLbColor.SelectEntryPos(0); - //aRbtColor.Check(); break; } } @@ -1736,10 +1716,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aLbColor.SaveValue(); aLbGradient.SaveValue(); aLbHatching.SaveValue(); - //aCbxHatchBckgrd.SaveValue(); aLbHatchBckgrdColor.SaveValue(); aLbBitmap.SaveValue(); -// aLbTransparent.SaveValue(); aTsbStepCount.SaveValue(); aNumFldStepCount.SaveValue(); aTsbTile.SaveValue(); @@ -1750,8 +1728,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aMtrFldOffset.SaveValue(); aMtrFldXOffset.SaveValue(); aMtrFldYOffset.SaveValue(); - //aMtrFldXSize.SaveValue(); <- wird oben behandelt - //aMtrFldYSize.SaveValue(); <- wird oben behandelt } // ----------------------------------------------------------------------- @@ -1997,7 +1973,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyGradientHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillGradientItem( String(), pEntry->GetGradient() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) ); @@ -2025,8 +2000,6 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) aCtlXRectPreview.Show(); aCtlBitmapPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2093,7 +2066,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchingHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); rXFSet.Put( XFillHatchItem( String(), pEntry->GetHatch() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); @@ -2117,14 +2089,11 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) aLbColor.SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); rXFSet.Put( XFillColorItem( String(), aLbHatchBckgrdColor.GetSelectEntryColor() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() ); rXFSet.Put( XFillColorItem( String(), aColor ) ); } @@ -2174,9 +2143,6 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) aCtlBitmapPreview.Enable(); aCtlBitmapPreview.Show(); aCtlXRectPreview.Hide(); -// aGrpPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2259,7 +2225,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); rXFSet.Put( XFillBitmapItem( String(), pEntry->GetXBitmap() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); @@ -2276,24 +2241,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -//IMPL_LINK( SvxAreaTabPage, ModifyTransparentHdl_Impl, void *, EMPTYARG ) -//{ -// sal_uInt16 nPos = aLbTransparent.GetSelectEntryPos(); -// if( nPos != LISTBOX_ENTRY_NOTFOUND ) -// { -// XFillTransparenceItem aItem( nPos * 25 ); -// -// rXFSet.Put( XFillTransparenceItem( aItem ) ); -// aCtlXRectPreview.SetAttributes( aXFillAttr ); -// -// aCtlXRectPreview.Invalidate(); -// } -// -// return( 0L ); -//} - -//------------------------------------------------------------------------ - IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) { if( p == &aTsbStepCount ) @@ -2428,15 +2375,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG ) { aMtrFldXSize.SetValue( aMtrFldXSize.GetValue() ); aMtrFldYSize.SetValue( aMtrFldYSize.GetValue() ); - /* - if( eState == STATE_CHECK ) - { - aFtXSize.Enable(); - aFtYSize.Enable(); - aMtrFldXSize.Enable(); - aMtrFldYSize.Enable(); - } - */ } rXFSet.Put( XFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ) ); @@ -2569,7 +2507,7 @@ void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) ModifyTileHdl_Impl( pWindow ); } -void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,sal_False); @@ -2596,3 +2534,4 @@ void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 131f6c5674f9..3deed69a50f1 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - //svdraw.hxx #define _SVDRAW_HXX #define _SDR_NOITEMS @@ -66,9 +62,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "sfx2/opengrf.hxx" #include "paragrph.hrc" @@ -120,8 +115,6 @@ SvxBitmapTabPage::SvxBitmapTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); FreeResource(); // diese Page braucht ExchangeSupport @@ -130,7 +123,6 @@ SvxBitmapTabPage::SvxBitmapTabPage // Setzen des Output-Devices rXFSet.Put( aXFStyleItem ); rXFSet.Put( aXBitmapItem ); - //aCtlPreview.SetAttributes( aXFillAttr ); aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) ); aBtnImport.SetClickHdl( @@ -372,14 +364,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //sal_uInt16 nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //sal_Bool bPixelColor = sal_False; - //sal_uInt16 nWidth = pBitmap->GetSizePixel().Width(); - //sal_uInt16 nHeight = pBitmap->GetSizePixel().Height(); - // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) { @@ -562,18 +546,18 @@ long SvxBitmapTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, String( SVX_RES( RID_SVXSTR_BITMAP ) ), String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -591,11 +575,9 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbBitmaps.GetSelectEntryPos(); @@ -630,9 +612,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -662,7 +644,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -760,9 +741,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) String aName; INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); nError = RID_SVXSTR_WARN_NAME_DUPLICATE; while( pDlg->Execute() == RET_OK ) @@ -793,7 +774,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -813,7 +793,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbBitmaps.Invalidate(); } #endif @@ -852,9 +831,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pBitmapList->Count(); sal_Bool bDifferent = sal_False; @@ -983,39 +962,36 @@ IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pBmpList->SetName( aURL.getName() ); if( pBmpList->Load() ) { - if( pBmpList ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() ) - delete pBitmapList; + // Pruefen, ob Tabelle geloescht werden darf: + if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() ) + delete pBitmapList; - pBitmapList = pBmpList; - ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList ); + pBitmapList = pBmpList; + ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList ); - aLbBitmaps.Clear(); - aLbBitmaps.Fill( pBitmapList ); - Reset( rOutAttrs ); + aLbBitmaps.Clear(); + aLbBitmaps.Fill( pBitmapList ); + Reset( rOutAttrs ); - pBitmapList->SetName( aURL.getName() ); + pBitmapList->SetName( aURL.getName() ); - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnBitmapListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnBitmapListState &= ~CT_MODIFIED; + if ( aURL.getBase().getLength() > 18 ) + { + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnBitmapListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnBitmapListState &= ~CT_MODIFIED; LeaveWait(); } else @@ -1170,3 +1146,5 @@ Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const else return SvxTabPage::GetParentLabeledBy (pLabeled); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 2a34f5beb702..5a71867ef587 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> @@ -49,9 +46,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <cuitabline.hxx> #include <svx/dialmgr.hxx> @@ -128,9 +124,6 @@ SvxColorTabPage::SvxColorTabPage eCM ( CM_RGB ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -308,18 +301,18 @@ long SvxColorTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_COLOR ), String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -339,11 +332,9 @@ long SvxColorTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } if( *pDlgType == 0 ) // Flaechen-Dialog @@ -367,8 +358,6 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) String aString; Color aColor; - // CheckChanges_Impl(); <-- doppelte Abfrage ? - sal_uInt16 nPos = aLbColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -469,10 +458,8 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { Window *pWindow = this; - bool bEnabled; while( pWindow ) { - bEnabled = pWindow->IsEnabled(); pWindow = pWindow->GetParent(); } @@ -497,9 +484,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -583,9 +570,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -772,78 +759,74 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pColTab->SetName( aURL.getName() ); // XXX if( pColTab->Load() ) { - if( pColTab ) + // Pruefen, ob Tabelle geloescht werden darf: + const XColorTable *pTempTable = 0; + SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); + SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); + if( pArea ) { - // Pruefen, ob Tabelle geloescht werden darf: - const XColorTable *pTempTable = 0; - SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); - SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); - if( pArea ) - { - pTempTable = pArea->GetColorTable(); - } - else if( pLine ) - { - pTempTable = pLine->GetColorTable(); - } - - if( pColorTab != pTempTable ) - { - if( bDeleteColorTable ) - delete pColorTab; - else - bDeleteColorTable = sal_True; - } - - pColorTab = pColTab; - if( pArea ) - { - pArea->SetNewColorTable( pColorTab ); - } - else if( pLine ) - { - pLine->SetNewColorTable( pColorTab ); - } - - aLbColor.Clear(); - aValSetColorTable.Clear(); - Construct(); - Reset( rOutAttrs ); - - pColorTab->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } + pTempTable = pArea->GetColorTable(); + } + else if( pLine ) + { + pTempTable = pLine->GetColorTable(); + } + + if( pColorTab != pTempTable ) + { + if( bDeleteColorTable ) + delete pColorTab; else - aString += String(aURL.getBase()); + bDeleteColorTable = sal_True; + } + + pColorTab = pColTab; + if( pArea ) + { + pArea->SetNewColorTable( pColorTab ); + } + else if( pLine ) + { + pLine->SetNewColorTable( pColorTab ); + } - aTableNameFT.SetText( aString ); + aLbColor.Clear(); + aValSetColorTable.Clear(); + Construct(); + Reset( rOutAttrs ); - // Flag fuer gewechselt setzen - *pnColorTableState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnColorTableState &= ~CT_MODIFIED; + pColorTab->SetName( aURL.getName() ); - if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) - aLbColor.SelectEntryPos( 0 ); - else - aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() ); + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - ChangeColorHdl_Impl( this ); - SelectColorLBHdl_Impl( this ); + if ( aURL.getBase().getLength() > 18 ) + { + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + aTableNameFT.SetText( aString ); + + // Flag fuer gewechselt setzen + *pnColorTableState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnColorTableState &= ~CT_MODIFIED; + + if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + aLbColor.SelectEntryPos( 0 ); + else + aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() ); + + ChangeColorHdl_Impl( this ); + SelectColorLBHdl_Impl( this ); } else { - //aIStream.Close(); ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ); aErrorBox.Execute(); @@ -1187,17 +1170,9 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ) { - sal_uInt16 nColor1, nColor2, nColor3; - sal_uInt16 nProzent; // nur temporaer !!! - - nColor1 = 255 - rColor.GetRed(); - nProzent = ColorToPercent_Impl( nColor1 ); - - nColor2 = 255 - rColor.GetGreen(); - nProzent = ColorToPercent_Impl( nColor2 ); - - nColor3 = 255 - rColor.GetBlue(); - nProzent = ColorToPercent_Impl( nColor3 ); + sal_uInt16 const nColor1 = 255 - rColor.GetRed(); + sal_uInt16 const nColor2 = 255 - rColor.GetGreen(); + sal_uInt16 const nColor3 = 255 - rColor.GetBlue(); rK = Min( Min( nColor1, nColor2 ), nColor3 ); @@ -1282,3 +1257,4 @@ void SvxColorTabPage::FillUserData() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3947a4d85aba..d762f74c70c6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -48,9 +45,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -110,9 +106,6 @@ SvxGradientTabPage::SvxGradientTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE))); @@ -124,9 +117,7 @@ SvxGradientTabPage::SvxGradientTabPage // Solange NICHT vom Item unterstuetzt - //aMtrColorTo.Disable(); aMtrColorTo.SetValue( 100 ); - //aMtrColorFrom.Disable(); aMtrColorFrom.SetValue( 100 ); // Setzen des Output-Devices @@ -295,18 +286,18 @@ long SvxGradientTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_GRADIENT ), CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -326,11 +317,9 @@ long SvxGradientTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbGradients.GetSelectEntryPos(); @@ -465,9 +454,9 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -498,7 +487,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -527,7 +515,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbGradients.Invalidate(); } #endif @@ -562,9 +549,9 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pGradientList->Count(); sal_Bool bDifferent = sal_False; @@ -696,47 +683,43 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) if ( pGrdList->Load() ) { - if ( pGrdList ) + // Pruefen, ob Tabelle geloescht werden darf: + if ( pGradientList != + ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() ) + delete pGradientList; + + pGradientList = pGrdList; + ( (SvxAreaTabDialog*) DLGWIN )-> + SetNewGradientList( pGradientList ); + + aLbGradients.Clear(); + aLbGradients.Fill( pGradientList ); + Reset( rOutAttrs ); + + pGradientList->SetName( aURL.getName() ); + + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + + if ( aURL.getBase().getLength() > 18 ) { - // Pruefen, ob Tabelle geloescht werden darf: - if ( pGradientList != - ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() ) - delete pGradientList; - - pGradientList = pGrdList; - ( (SvxAreaTabDialog*) DLGWIN )-> - SetNewGradientList( pGradientList ); - - aLbGradients.Clear(); - aLbGradients.Fill( pGradientList ); - Reset( rOutAttrs ); - - pGradientList->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnGradientListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnGradientListState &= ~CT_MODIFIED; + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnGradientListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnGradientListState &= ~CT_MODIFIED; LeaveWait(); } else { LeaveWait(); - //aIStream.Close(); ErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); } @@ -943,3 +926,4 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index b05d32fbec1a..de7365e54d20 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,15 +39,14 @@ #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include "svx/drawitem.hxx" #include "cuitabarea.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -106,9 +102,6 @@ SvxHatchTabPage::SvxHatchTabPage rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -271,18 +264,18 @@ long SvxHatchTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_HATCH ), CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -299,11 +292,9 @@ long SvxHatchTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos(); @@ -352,7 +343,6 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { - // aLbHatchings.SelectEntryPos( 0 ); ChangeHatchHdl_Impl( this ); // Status der Buttons ermitteln @@ -475,19 +465,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) default: aCtlAngle.SetActualRP( RP_MM ); break; } - // Backgroundcolor - /* - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), sal_True, &pPoolItem ) ) - { - rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) ); - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) - { - Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() ); - rXFSet.Put( XFillColorItem( String(), aColor ) ); - } - } - */ // ItemSet fuellen und an aCtlPreview weiterleiten rXFSet.Put( XFillHatchItem( String(), *pHatch ) ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); @@ -530,9 +507,9 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -562,7 +539,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -586,7 +562,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbHatchings.Invalidate(); } #endif @@ -621,9 +596,9 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pHatchingList->Count(); sal_Bool bDifferent = sal_False; @@ -752,39 +727,36 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pHatchList->SetName( aURL.getName() ); if( pHatchList->Load() ) { - if( pHatchList ) + // Pruefen, ob Tabelle geloescht werden darf: + if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() ) + delete pHatchingList; + + pHatchingList = pHatchList; + ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList ); + + aLbHatchings.Clear(); + aLbHatchings.Fill( pHatchingList ); + Reset( rOutAttrs ); + + pHatchingList->SetName( aURL.getName() ); + + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + + if ( aURL.getBase().getLength() > 18 ) { - // Pruefen, ob Tabelle geloescht werden darf: - if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() ) - delete pHatchingList; - - pHatchingList = pHatchList; - ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList ); - - aLbHatchings.Clear(); - aLbHatchings.Fill( pHatchingList ); - Reset( rOutAttrs ); - - pHatchingList->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnHatchingListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnHatchingListState &= ~CT_MODIFIED; + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnHatchingListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnHatchingListState &= ~CT_MODIFIED; } else ErrorBox( DLGWIN, WinBits( WB_OK ), @@ -901,3 +873,4 @@ void SvxHatchTabPage::DataChanged( const DataChangedEvent& rDCEvt ) SvxTabPage::DataChanged( rDCEvt ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 7c4eea588c86..b2e10d6210a2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,13 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - #ifndef _SVX_SIZEITEM_HXX //autogen - #include <editeng/sizeitem.hxx> #endif #include <tools/shl.hxx> @@ -51,9 +46,7 @@ #include "dlgname.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svx/svdmodel.hxx> #include "svx/svxgrahicitem.hxx" -//#include "linectrl.hrc" #include <sfx2/request.hxx> #include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> @@ -164,7 +157,7 @@ SvxLineTabPage::SvxLineTabPage pnLineEndListState( 0 ), pnDashListState( 0 ), pnColorTableState( 0 ), - nPageType ( 0 )//CHINA001 pPageType ( NULL ), + nPageType ( 0 ) { aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE))); aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) ); @@ -320,10 +313,10 @@ void SvxLineTabPage::FillListboxes() void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); //add CHINA001 begin + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) - SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end - if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog + SetPageType(pPageTypeItem->GetValue()); + if( nDlgType == 0 && pDashList ) { sal_uInt16 nPos; sal_uInt16 nCount; @@ -361,20 +354,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aDashURL.getBase().Len() > 18 ) - { - aString += aDashURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aDashURL.getBase(); - - aGrpLine.SetText( aString ); -*/ // LineEndliste if( ( *pnLineEndListState & CT_MODIFIED ) || ( *pnLineEndListState & CT_CHANGED ) ) @@ -415,29 +394,15 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aLineURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aLineURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - aString = String( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aLineURL.getBase().Len() > 18 ) - { - aString += aLineURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aLineURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ // Auswertung, ob von einer anderen TabPage ein anderer Fuelltyp gesetzt wurde if( aLbLineStyle.GetSelectEntryPos() != 0 ) { - if( nPageType == 2 ) // 1//CHINA001 if( *pPageType == 2 ) // 1 + if( nPageType == 2 ) // 1 { aLbLineStyle.SelectEntryPos( *pPosDashLb + 2 ); // +2 wegen SOLID und INVLISIBLE ChangePreviewHdl_Impl( this ); } - if( nPageType == 3 )//CHINA001 if( *pPageType == 3 ) + if( nPageType == 3 ) { aLbStartStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID aLbEndStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID @@ -466,12 +431,12 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) ChangePreviewHdl_Impl( this ); } - nPageType = 0;//CHINA001 *pPageType = 0; + nPageType = 0; } // Seite existiert im Ctor noch nicht, deswegen hier! - else if ( nDlgType == 1100 || // Chart-Dialog//CHINA001 else if ( *pDlgType == 1100 || // Chart-Dialog - nDlgType == 1101 )//CHINA001 *pDlgType == 1101 ) + else if ( nDlgType == 1100 || + nDlgType == 1101 ) { aFtLineEndsStyle.Hide(); aFtLineEndsWidth.Hide(); @@ -495,9 +460,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Linien-Dialog//CHINA001 if( *pDlgType == 0 ) // Linien-Dialog + if( nDlgType == 0 ) // Linien-Dialog { - nPageType = 1; // evtl. fuer Erweiterungen//CHINA001 *pPageType = 1; // evtl. fuer Erweiterungen + nPageType = 1; // evtl. fuer Erweiterungen *pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!! sal_uInt16 nPos = aLbStartStyle.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -521,7 +486,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // Um evtl. Modifikationen der Liste vorzubeugen // werden Items anderer Seiten nicht gesetzt - if( nDlgType != 0 || nPageType != 2 )//CHINA001 if( *pDlgType != 0 || *pPageType != 2 ) + if( nDlgType != 0 || nPageType != 2 ) { nPos = aLbLineStyle.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && @@ -607,7 +572,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } - if( nDlgType != 0 || nPageType != 3 )//CHINA001 if( *pDlgType != 0 || *pPageType != 3 ) + if( nDlgType != 0 || nPageType != 3 ) { // Linienanfang nPos = aLbStartStyle.GetSelectEntryPos(); @@ -791,7 +756,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));//add CHINA001 + rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return( bModified ); } @@ -803,7 +768,6 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl() if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { - //rXLSet.Put( XLineDashItem ( rOutAttrs.Get( GetWhich( XATTR_LINEDASH ) ) ) ); rXLSet.Put( XLineStyleItem( XLINE_NONE ) ); } else if( aLbLineStyle.IsEntryPosSelected( 0 ) ) @@ -906,13 +870,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH // Linienstil -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) == SFX_ITEM_DEFAULT ) - { - aLbLineStyle.Disable(); - } -*/ const SfxPoolItem *pPoolItem; long nSymType=SVX_SYMBOLTYPE_UNKNOWN; sal_Bool bPrevSym=sal_False; @@ -949,7 +906,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); SdrPageView* pPageView = pView->ShowSdrPage(pPage); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrObject *pObj=NULL; long nSymTmp=nSymType; if(pSymbolList) @@ -1056,13 +1012,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Linienstaerke -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINEWIDTH ) ) == SFX_ITEM_DEFAULT ) - { - aMtrLineWidth.Disable(); - } -*/ if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( aMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs. @@ -1072,13 +1021,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aMtrLineWidth.SetText( String() ); // Linienfarbe -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINECOLOR ) ) == SFX_ITEM_DEFAULT ) - { - aLbColor.Disable(); - } -*/ aLbColor.SetNoSelection(); if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) @@ -1279,15 +1221,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SetNoSelection(); } - /* - if( aLbStartStyle.GetSelectEntryPos() == aLbEndStyle.GetSelectEntryPos() && - aMtrStartWidth.GetValue() == aMtrEndWidth.GetValue() && - aTsbCenterStart.GetState() == aTsbCenterEnd.GetState() ) - { - aCbxSynchronize.Check(); - } - */ - // Werte sichern aLbLineStyle.SaveValue(); aMtrLineWidth.SaveValue(); @@ -1304,8 +1237,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SaveValue(); ClickInvisibleHdl_Impl( this ); - //ClickMeasuringHdl_Impl( this ); - //aCtlPosition.Reset(); ChangePreviewHdl_Impl( NULL ); } @@ -1497,26 +1428,6 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) } //------------------------------------------------------------------------ -/* - -long SvxLineTabPage::ClickMeasuringHdl_Impl( void* ) -{ - if( aTsbShowMeasuring.GetState() == STATE_NOCHECK ) - { - aFtPosition.Disable(); - aCtlPosition.Disable(); - } - else - { - aFtPosition.Enable(); - aCtlPosition.Enable(); - } - aCtlPosition.Invalidate(); - - return( 0L ); -} -*/ -//------------------------------------------------------------------------ IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG ) { @@ -1625,7 +1536,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // 3D View SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrPageView* pPageView = pView->ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; @@ -1636,10 +1546,8 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) if(pObj==NULL) break; pObj=pObj->Clone(); - //const String* pGrfName = (const String*)aGrfNames.GetObject(i); - String *pStr=new String();//String(i)); + String *pStr=new String(); aGrfNames.Insert(pStr,LIST_APPEND); - //Rectangle aRect(pObj->GetLogicRect()); pPage->NbcInsertObject(pObj); pView->MarkObj(pObj,pPageView); if(pSymbolAttr) @@ -1899,7 +1807,7 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } -void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,sal_False); @@ -1932,3 +1840,5 @@ void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 aAutoSymbolGraphic = pGraphicItem->GetGraphic(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 7c61d05ed8f4..41f7085c2934 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,7 +39,6 @@ #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" @@ -51,8 +47,8 @@ #include "svx/drawitem.hxx" #include "cuitabline.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -110,9 +106,6 @@ SvxLineDefTabPage::SvxLineDefTabPage aXLineAttr ( pXPool ), rXLSet ( aXLineAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - aLbType1.SetAccessibleName(String(CUI_RES( STR_START_TYPE ) ) ); aLbType2.SetAccessibleName(String(CUI_RES( STR_END_TYPE ) ) ); aNumFldNumber1.SetAccessibleName(String(CUI_RES( STR_START_NUM ) ) ); @@ -224,16 +217,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pDashList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aFTLinestyle.SetText( aString ); -*/ *pPageType = 0; // 2 *pPosDashLb = LISTBOX_ENTRY_NOTFOUND; } @@ -270,41 +253,37 @@ void SvxLineDefTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_LINESTYLE ), String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { case RET_BTN_1: // Aendern { ClickModifyHdl_Impl( this ); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_BTN_2: // Hinzufuegen { ClickAddHdl_Impl( this ); - //nPos = aLbLineStyles.GetSelectEntryPos(); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_CANCEL: break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } @@ -324,8 +303,6 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { if( *pPageType == 2 ) { - //CheckChanges_Impl(); - FillDash_Impl(); String aString( aLbLineStyles.GetSelectEntry() ); @@ -605,9 +582,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -683,9 +660,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pDashList->Count(); sal_Bool bDifferent = sal_False; @@ -819,41 +796,23 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) if( pDshLst->Load() ) { - if( pDshLst ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() ) - delete pDashList; - - pDashList = pDshLst; - ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList ); - - aLbLineStyles.Clear(); - aLbLineStyles.Fill( pDashList ); - Reset( rOutAttrs ); - - pDashList->SetName( aURL.getName() ); - -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ - // Flag fuer gewechselt setzen - *pnDashListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnDashListState &= ~CT_MODIFIED; - } + // Pruefen, ob Tabelle geloescht werden darf: + if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() ) + delete pDashList; + + pDashList = pDshLst; + ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList ); + + aLbLineStyles.Clear(); + aLbLineStyles.Fill( pDashList ); + Reset( rOutAttrs ); + + pDashList->SetName( aURL.getName() ); + + // Flag fuer gewechselt setzen + *pnDashListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnDashListState &= ~CT_MODIFIED; } else //aIStream.Close(); @@ -912,21 +871,6 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pDashList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnDashListState |= CT_SAVED; // Flag fuer modifiziert entfernen @@ -948,14 +892,6 @@ void SvxLineDefTabPage::FillDash_Impl() { XDashStyle eXDS; -/* Alle Stile werden z.Z. nicht benutzt - if( aRbtEnds1.IsChecked() ) - eXDS = XDASH_ROUND; - else if( aRbtEnds2.IsChecked() ) - eXDS = XDASH_RECT; - else - eXDS = XDASH_RECT; -*/ if( aCbxSynchronize.IsChecked() ) eXDS = XDASH_RECTRELATIVE; else @@ -987,14 +923,11 @@ void SvxLineDefTabPage::FillDialog_Impl() aCbxSynchronize.Check( sal_False ); aNumFldNumber1.SetValue( aDash.GetDots() ); - //aMtrLength1.SetValue( aDash.GetDotLen() ); SetMetricValue( aMtrLength1, aDash.GetDotLen(), ePoolUnit ); aLbType1.SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 ); aNumFldNumber2.SetValue( aDash.GetDashes() ); - //aMtrLength2.SetValue( aDash.GetDashLen() ); SetMetricValue( aMtrLength2, aDash.GetDashLen(), ePoolUnit ); aLbType2.SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 ); - //aMtrDistance.SetValue( aDash.GetDistance() ); SetMetricValue( aMtrDistance, aDash.GetDistance(), ePoolUnit ); ChangeMetricHdl_Impl( NULL ); @@ -1023,3 +956,4 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 4de0960a5610..30b94a0759ad 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -49,7 +47,7 @@ #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include "cuitabline.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <basegfx/range/b2drange.hxx> @@ -104,9 +102,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage rXLSet ( aXLineAttr.GetItemSet() ), pLineEndList( NULL ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -192,20 +187,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ *pPageType = 0; // 3 *pPosLineEndLb = LISTBOX_ENTRY_NOTFOUND; } @@ -379,9 +360,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -486,9 +467,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -617,39 +598,22 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pLeList->SetName( aURL.getName() ); if( pLeList->Load() ) { - if( pLeList ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() ) - delete pLineEndList; - - pLineEndList = pLeList; - ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList ); - aLbLineEnds.Clear(); - aLbLineEnds.Fill( pLineEndList ); - Reset( rOutAttrs ); - - pLineEndList->SetName( aURL.getName() ); - -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - if( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ - // Flag fuer gewechselt setzen - *pnLineEndListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnLineEndListState &= ~CT_MODIFIED; - } + // Pruefen, ob Tabelle geloescht werden darf: + if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() ) + delete pLineEndList; + + pLineEndList = pLeList; + ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList ); + aLbLineEnds.Clear(); + aLbLineEnds.Fill( pLineEndList ); + Reset( rOutAttrs ); + + pLineEndList->SetName( aURL.getName() ); + + // Flag fuer gewechselt setzen + *pnLineEndListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnLineEndListState &= ~CT_MODIFIED; } else ErrorBox( DLGWIN, WinBits( WB_OK ), @@ -707,20 +671,6 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pLineEndList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - aGrpLineEnds.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnLineEndListState |= CT_SAVED; // Flag fuer modifiziert entfernen @@ -748,3 +698,4 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index b4ed21ef0aad..a7109fadb3b3 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> @@ -48,7 +46,7 @@ #include <cuitabline.hxx> #include "paragrph.hrc" #include <svx/xlineit0.hxx> -#include <sfx2/request.hxx> //add CHINA001 +#include <sfx2/request.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -219,12 +217,12 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_uInt16 nPos; sal_uInt16 nCount; - //add CHINA001 Begin + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); - //add CHINA001 end - if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog + + if( nDlgType == 0 ) { if( pColorTab ) { @@ -261,7 +259,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) ModifyShadowHdl_Impl( this ); } - nPageType = PT_SHADOW;//CHINA001 *pPageType = PT_SHADOW; + nPageType = PT_SHADOW; } } } @@ -381,9 +379,9 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - //add CHINA001 begin + rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - //add CHINA001 end + return( bModified ); } @@ -595,7 +593,7 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) ModifyShadowHdl_Impl( pWindow ); } -void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); @@ -610,3 +608,5 @@ void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 SetDlgType(pDlgTypeItem->GetValue()); Construct(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 3d8deb015039..3b75b322b828 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -562,7 +560,6 @@ void SvxSlantTabPage::Construct() sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; - sal_Int32 nValue = 0L; String aStr = aMtrRadius.GetText(); if( aStr != aMtrRadius.GetSavedValue() ) @@ -579,7 +576,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) if( aStr != aMtrAngle.GetSavedValue() ) { - nValue = static_cast<sal_Int32>(aMtrAngle.GetValue()); + sal_Int32 nValue = static_cast<sal_Int32>(aMtrAngle.GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = sal_True; } @@ -1704,3 +1701,5 @@ void SvxPositionSizeTabPage::FillUserData() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |