diff options
Diffstat (limited to 'cui')
400 files changed, 9112 insertions, 9112 deletions
diff --git a/cui/inc/pch/precompiled_cui.cxx b/cui/inc/pch/precompiled_cui.cxx index 4d85e0351431..6fc161f77e6c 100644 --- a/cui/inc/pch/precompiled_cui.cxx +++ b/cui/inc/pch/precompiled_cui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index d55bb7b5afaf..2b361fbb3e38 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 8a3b81562bd2..6e9377ed64df 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,18 +142,18 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_INSERT , KEY_DELETE , - KEY_OPEN , - KEY_CUT , - KEY_COPY , - KEY_PASTE , - KEY_UNDO , - KEY_REPEAT , - KEY_FIND , - KEY_PROPERTIES , - KEY_FRONT , + KEY_OPEN , + KEY_CUT , + KEY_COPY , + KEY_PASTE , + KEY_UNDO , + KEY_REPEAT , + KEY_FIND , + KEY_PROPERTIES , + KEY_FRONT , KEY_CONTEXTMENU , - KEY_MENU , - KEY_HELP , + KEY_MENU , + KEY_HELP , KEY_F1 | KEY_SHIFT, KEY_F2 | KEY_SHIFT, @@ -733,12 +733,12 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt , aKeyBox (this , CUI_RES(BOX_ACC_KEY )) , aFunctionsGroup (this , CUI_RES(GRP_ACC_FUNCTIONS )) , aLoadButton (this , CUI_RES(BTN_LOAD )) - , aSaveButton (this , CUI_RES(BTN_SAVE )) - , aResetButton (this , CUI_RES(BTN_RESET )) - , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) ) - , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) ) - , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) ) - , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) ) + , aSaveButton (this , CUI_RES(BTN_SAVE )) + , aResetButton (this , CUI_RES(BTN_RESET )) + , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) ) + , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) ) + , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) ) + , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) ) , m_bStylesInfoInitialized(sal_False) , m_xGlobal () , m_xModule () @@ -1437,7 +1437,7 @@ String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const case KEYFUNC_OPEN : sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) ); break; - + case KEYFUNC_SAVE : sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) ); break; @@ -1521,7 +1521,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi m_pFileDlg->SetTitle( rTitle ); // m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD ); - m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); + m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) ); Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl ) diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc index be0771b83fc8..483d3ddb5733 100644 --- a/cui/source/customize/acccfg.hrc +++ b/cui/source/customize/acccfg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #define TXT_ACC_KEY 13 #define BOX_ACC_KEY 14 #define GRP_ACC_FUNCTIONS 15 -#define BTN_RESET 20 +#define BTN_RESET 20 #define BTN_LOAD 40 #define BTN_SAVE 41 #define RB_OFFICE 44 diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 74188426a787..abbe08d84ce7 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 46296a3f6f1f..e48f65087a08 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; static const char ITEM_DESCRIPTOR_ISVISIBLE[] = "IsVisible"; static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; -static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; +static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; @@ -116,7 +116,7 @@ static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; static const char __FAR_DATA pSeparatorStr[] = "----------------------------------"; -static const char __FAR_DATA pMenuSeparatorStr[] = " | "; +static const char __FAR_DATA pMenuSeparatorStr[] = " | "; #ifdef _MSC_VER #pragma warning (disable:4355) @@ -1169,14 +1169,14 @@ bool MenuSaveInData::LoadSubMenus( // Don't access non existing menu configuration! if ( !xMenuSettings.is() ) return true; - + for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ ) { - uno::Reference< container::XIndexAccess > xSubMenu; - OUString aCommandURL; - OUString aHelpURL; - OUString aLabel; - bool bIsUserDefined = TRUE; + uno::Reference< container::XIndexAccess > xSubMenu; + OUString aCommandURL; + OUString aHelpURL; + OUString aLabel; + bool bIsUserDefined = TRUE; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); @@ -1488,8 +1488,8 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox( SetHighlightRange(); SetSelectionMode(SINGLE_SELECTION); - SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | - SV_DRAGDROP_APP_COPY | + SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | + SV_DRAGDROP_APP_COPY | SV_DRAGDROP_ENABLE_TOP | SV_DRAGDROP_APP_DROP); } @@ -2398,12 +2398,12 @@ SvxMenuConfigPage::SvxMenuConfigPage( LINK( this, SvxMenuConfigPage, SelectMenuEntry ) ); aMoveUpButton.SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) ); - aMoveDownButton.SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) ); + aMoveDownButton.SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) ); - aNewTopLevelButton.SetClickHdl ( + aNewTopLevelButton.SetClickHdl ( LINK( this, SvxMenuConfigPage, NewMenuHdl ) ); - aAddCommandsButton.SetClickHdl ( + aAddCommandsButton.SetClickHdl ( LINK( this, SvxMenuConfigPage, AddCommandsHdl ) ); PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_MENU ) ); @@ -2938,7 +2938,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( aMoveUpButton.SetClickHdl ( LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); - aMoveDownButton.SetClickHdl ( + aMoveDownButton.SetClickHdl ( LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); } @@ -3364,14 +3364,14 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( aContentsListBox->SetSelectHdl( LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) ); - aNewTopLevelButton.SetClickHdl ( + aNewTopLevelButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, NewToolbarHdl ) ); - aAddCommandsButton.SetClickHdl ( + aAddCommandsButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, AddCommandsHdl ) ); aMoveUpButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) ); - aMoveDownButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) ); + aMoveDownButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) ); // Always enable Up and Down buttons // added for issue i53677 by shizhoubo aMoveDownButton.Enable( TRUE ); @@ -4187,7 +4187,7 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) return a->GetName().compareTo( b->GetName() ) < 0; } -SvxEntries* ToolbarSaveInData::GetEntries() +SvxEntries* ToolbarSaveInData::GetEntries() { typedef ::std::hash_map< ::rtl::OUString, bool, @@ -4738,17 +4738,17 @@ bool ToolbarSaveInData::LoadToolbar( const uno::Reference< container::XIndexAccess >& xToolbarSettings, SvxConfigEntry* pParentData ) { - SvxEntries* pEntries = pParentData->GetEntries(); + SvxEntries* pEntries = pParentData->GetEntries(); for ( sal_Int32 nIndex = 0; nIndex < xToolbarSettings->getCount(); nIndex++ ) { - uno::Reference< container::XIndexAccess > xSubMenu; - OUString aCommandURL; - OUString aHelpURL; - OUString aLabel; - bool bIsUserDefined = TRUE; - sal_Bool bIsVisible; - sal_Int32 nStyle; + uno::Reference< container::XIndexAccess > xSubMenu; + OUString aCommandURL; + OUString aHelpURL; + OUString aLabel; + bool bIsUserDefined = TRUE; + sal_Bool bIsVisible; + sal_Int32 nStyle; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); @@ -5124,8 +5124,8 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat // in all color modes, like high contrast. const AllSettings& rSettings = Application::GetSettings(); - VirtualDevice aDev; - Size aSize( 26, 20 ); + VirtualDevice aDev; + Size aSize( 26, 20 ); aDev.SetOutputSizePixel( aSize ); @@ -5133,12 +5133,12 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT )); // Fill button data struct with new images - pData->aBmps[SV_BMP_UNCHECKED] = aImage; - pData->aBmps[SV_BMP_CHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED )); - pData->aBmps[SV_BMP_HICHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED )); - pData->aBmps[SV_BMP_HIUNCHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED)); - pData->aBmps[SV_BMP_TRISTATE] = GetSizedImage( aDev, aSize, Image() ); // Use tristate bitmaps to have no checkbox for separator entries - pData->aBmps[SV_BMP_HITRISTATE] = GetSizedImage( aDev, aSize, Image() ); + pData->aBmps[SV_BMP_UNCHECKED] = aImage; + pData->aBmps[SV_BMP_CHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED )); + pData->aBmps[SV_BMP_HICHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED )); + pData->aBmps[SV_BMP_HIUNCHECKED] = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED)); + pData->aBmps[SV_BMP_TRISTATE] = GetSizedImage( aDev, aSize, Image() ); // Use tristate bitmaps to have no checkbox for separator entries + pData->aBmps[SV_BMP_HITRISTATE] = GetSizedImage( aDev, aSize, Image() ); // Get image size m_aCheckBoxImageSizePixel = aImage.GetSizePixel(); @@ -5152,13 +5152,13 @@ Image SvxToolbarEntriesListBox::GetSizedImage( // Standard transparent color is light magenta as is won't be // used for other things - Color aFillColor( COL_LIGHTMAGENTA ); + Color aFillColor( COL_LIGHTMAGENTA ); // Position image at the center of (width-2),(height) rectangle. // We need 2 pixels to have a bigger border to the next button image - USHORT nPosX = std::max( (USHORT) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (USHORT) 0 ); - USHORT nPosY = std::max( (USHORT) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (USHORT) 0 ); - Point aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 ); + USHORT nPosX = std::max( (USHORT) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (USHORT) 0 ); + USHORT nPosY = std::max( (USHORT) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (USHORT) 0 ); + Point aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 ); aDev.SetFillColor( aFillColor ); aDev.SetLineColor( aFillColor ); aDev.DrawRect( Rectangle( Point(), aNewSize )); @@ -5291,14 +5291,14 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying( SvxNewToolbarDialog::SvxNewToolbarDialog( Window* pWindow, const String& rName ) : - ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ), - aFtDescription ( this, CUI_RES( FT_NAME ) ), - aEdtName ( this, CUI_RES( EDT_STRING ) ), - aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ), - aBtnOK ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aBtnHelp ( this, CUI_RES( BTN_HELP ) ), - aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) ) + ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ), + aFtDescription ( this, CUI_RES( FT_NAME ) ), + aEdtName ( this, CUI_RES( EDT_STRING ) ), + aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ), + aBtnOK ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aBtnHelp ( this, CUI_RES( BTN_HELP ) ), + aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) ) { FreeResource(); @@ -5327,18 +5327,18 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, const uno::Reference< css::ui::XImageManager >& rXImageManager, const uno::Reference< css::ui::XImageManager >& rXParentImageManager ) : - ModalDialog ( pWindow, CUI_RES( MD_ICONSELECTOR ) ), - aFtDescription ( this, CUI_RES( FT_SYMBOLS ) ), - aTbSymbol ( this, CUI_RES( TB_SYMBOLS ) ), - aFtNote ( this, CUI_RES( FT_NOTE ) ), - aBtnOK ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aBtnHelp ( this, CUI_RES( BTN_HELP ) ), - aBtnImport ( this, CUI_RES( BTN_IMPORT ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), + ModalDialog ( pWindow, CUI_RES( MD_ICONSELECTOR ) ), + aFtDescription ( this, CUI_RES( FT_SYMBOLS ) ), + aTbSymbol ( this, CUI_RES( TB_SYMBOLS ) ), + aFtNote ( this, CUI_RES( FT_NOTE ) ), + aBtnOK ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aBtnHelp ( this, CUI_RES( BTN_HELP ) ), + aBtnImport ( this, CUI_RES( BTN_IMPORT ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), m_nNextId ( 0 ), - m_xImageManager ( rXImageManager ), + m_xImageManager ( rXImageManager ), m_xParentImageManager( rXParentImageManager ) { FreeResource(); @@ -5976,7 +5976,7 @@ USHORT SvxIconReplacementDialog :: ShowDialog() SvxIconChangeDialog::SvxIconChangeDialog( Window *pWindow, const rtl::OUString& aMessage) : - ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ), + ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ), aFImageInfo (this, CUI_RES( FI_INFO ) ), aBtnOK (this, CUI_RES(MD_BTN_OK)), aDescriptionLabel (this, CUI_RES(FTCHGE_DESCRIPTION)), diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc index 74d7804dce8e..ff7d25e249e0 100644 --- a/cui/source/customize/cfg.hrc +++ b/cui/source/customize/cfg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,6 +100,6 @@ //added for issue83555 #define MD_ICONCHANGE (119 + CFG_OFFSET) #define FTCHGE_DESCRIPTION (120 + CFG_OFFSET) -#define EDT_ADDR (121 + CFG_OFFSET) +#define EDT_ADDR (121 + CFG_OFFSET) #define MD_BTN_OK (122 + CFG_OFFSET) #define FI_INFO (123 + CFG_OFFSET) diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index 0b2489557053..c6d7f7ab1c9b 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -632,10 +632,10 @@ ModalDialog MD_ICONSELECTOR Scroll = TRUE ; LineSpacing = TRUE ; Customize = FALSE ; - }; + }; OKButton BTN_OK { - Pos = MAP_APPFONT ( 60 , 130 ) ; + Pos = MAP_APPFONT ( 60 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; DefButton = TRUE ; @@ -669,14 +669,14 @@ ModalDialog MD_ICONSELECTOR }; FixedText FT_NOTE { - Pos = MAP_APPFONT ( 12 , 95 ) ; + Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 200 , 24 ) ; Text [ de ] = "Hinweis:\nBitte beachten Sie das für einen erfolgreichen Import die Symbole eine Größe von 16x16 Pixel haben müssen." ; Text [ en-US ] = "Note:\nThe size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically." ; Left = TRUE ; WordBreak = TRUE; }; - FixedLine FL_SEPARATOR + FixedLine FL_SEPARATOR { Pos = MAP_APPFONT ( 0, 120 ); Size = MAP_APPFONT ( 240, 8 ); @@ -702,7 +702,7 @@ ModalDialog MD_ICONCHANGE Size = MAP_APPFONT ( 24 , 24 ) ; Fixed = Image { - + }; }; FixedText FTCHGE_DESCRIPTION @@ -711,7 +711,7 @@ ModalDialog MD_ICONCHANGE Size = MAP_APPFONT ( 200 , 50 ) ; Text [ en-US ] = "The files listed below could not be imported.\nThe file format could not be interpreted." ; }; - + MultiLineEdit EDT_ADDR { Pos = MAP_APPFONT ( 30 , 38) ; @@ -723,7 +723,7 @@ ModalDialog MD_ICONCHANGE }; OKButton MD_BTN_OK { - Pos = MAP_APPFONT ( 68 , 131 ) ; + Pos = MAP_APPFONT ( 68 , 131 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; DefButton = TRUE ; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 46f9576058e0..911892383d64 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -341,7 +341,7 @@ IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer) } void SfxConfigFunctionListBox_Impl::ClearAll() -/* Beschreibung +/* Beschreibung L"oscht alle Eintr"age in der FunctionListBox, alle UserDaten und alle evtl. vorhandenen MacroInfos. */ @@ -378,7 +378,7 @@ void SfxConfigFunctionListBox_Impl::ClearAll() } SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) -/* Beschreibung +/* Beschreibung Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s die Namen eindeutig sind. */ @@ -395,7 +395,7 @@ SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) } SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) -/* Beschreibung +/* Beschreibung Ermittelt den SvLBoxEntry zu einer "ubergebenen Id. */ { @@ -412,7 +412,7 @@ SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) } SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo() -/* Beschreibung +/* Beschreibung Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ). */ { @@ -453,7 +453,7 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel() } USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry ) -/* Beschreibung +/* Beschreibung Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck. */ { @@ -507,7 +507,7 @@ String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) }*/ void SfxConfigFunctionListBox_Impl::FunctionSelected() -/* Beschreibung +/* Beschreibung Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten Entry anzeigen soll. */ @@ -673,7 +673,7 @@ void SfxConfigGroupListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles) } String SfxConfigGroupListBox_Impl::GetGroup() -/* Beschreibung +/* Beschreibung Gibt den Namen der selektierten Funktionsgruppe bzw. des selektierten Basics zur"uck. */ @@ -789,7 +789,7 @@ namespace if ( xContext.is() ) xScripts.set( xContext->getScriptContainer(), UNO_QUERY ); } - + return Reference< XModel >( xScripts, UNO_QUERY ); } @@ -923,10 +923,10 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul aAppBasTitle += aMacroName; SvLBoxEntry *pEntry = InsertEntry( aAppBasTitle, 0 ); SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICMGR, 0, pAppBasicMgr ); - // aArr.Insert( pInfo, aArr.Count() ); + // aArr.Insert( pInfo, aArr.Count() ); pEntry->SetUserData( pInfo ); pEntry->EnableChildsOnDemand( TRUE ); - // Expand( pEntry ); + // Expand( pEntry ); } } @@ -1053,8 +1053,8 @@ 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 = @@ -1109,7 +1109,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul pEntry->EnableChildsOnDemand( TRUE ); } -/* { +/* { String sSymbols( String::CreateFromAscii("Symbols") ); SvLBoxEntry *pEntry = InsertEntry( sSymbols, 0 ); SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 ); // TODO last parameter should contain user data @@ -1306,7 +1306,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC //----------------------------------------------- void SfxConfigGroupListBox_Impl::GroupSelected() -/* Beschreibung +/* Beschreibung Eine Funktionsgruppe oder eine Basicmodul wurde selektiert. Alle Funktionen bzw. Macros werden in der Functionlistbox anzeigt. */ @@ -1374,7 +1374,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() pInf->SetHelpText( pMeth->GetInfo()->GetComment() ); USHORT nId = SFX_APP()->GetMacroConfig()->GetSlotId( pInf ); if ( !nId ) - break; // Kein Slot mehr frei + break; // Kein Slot mehr frei SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry( pMeth->GetName(), NULL ); @@ -1522,7 +1522,7 @@ BOOL SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent ) } void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) -/* Beschreibung +/* Beschreibung Ein Basic oder eine Bibliothek werden ge"offnet */ { @@ -1610,7 +1610,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) { bIsRootNode = TRUE; } - + /* To mimic current starbasic behaviour we need to make sure that only the current document is displayed in the config tree. Tests below @@ -1633,7 +1633,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) if ( bIsRootNode ) { if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) ) - bDisplay=FALSE; + bDisplay=FALSE; } if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay ) { @@ -1723,7 +1723,7 @@ void SfxConfigGroupListBox_Impl::AddAndSelect( const SfxStringItem* , const SfxS String aCommand = String::CreateFromAscii(".uno:InsertSymbol?Symbols:string="); aCommand += pText->GetValue(); pFunctionListBox->aArr.Insert( pGrpInfo, pFunctionListBox->aArr.Count() ); - pGrpInfo->sCommand = aCommand; + pGrpInfo->sCommand = aCommand; pGrpInfo->sLabel = String::CreateFromAscii("Symbols: "); pGrpInfo->sLabel += pText->GetValue(); pFuncEntry->SetUserData( pGrpInfo ); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 8a5d00fa6216..60219ef67409 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,18 +72,18 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, _SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ), aSaveInText( this, CUI_RES( TXT_SAVEIN ) ), aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ), - bAppConfig ( TRUE ) + bAppConfig ( TRUE ) { - mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT )); - mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO )); - mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT )); - mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN )); - mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN )); - 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) ); + mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT )); + mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO )); + mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT )); + mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN )); + mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN )); + 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(); diff --git a/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc index 8e482d83b97f..b75c0477687c 100644 --- a/cui/source/customize/eventdlg.hrc +++ b/cui/source/customize/eventdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,12 +32,12 @@ #include <cuires.hrc> #include "macropg.hrc" -#define TXT_SAVEIN 10 -#define LB_SAVEIN 11 +#define TXT_SAVEIN 10 +#define LB_SAVEIN 11 -#define MB_CONFIG 17 -#define CB_WARNING 18 +#define MB_CONFIG 17 +#define CB_WARNING 18 #define CB_WARNING_ALWAYS 19 -#define GB_SAFETY 20 -#define ID_APP 21 -#define ID_DOC 22 +#define GB_SAFETY 20 +#define ID_APP 21 +#define ID_DOC 22 diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index c25fe2ae8d74..c5f32906ad3f 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,16 +42,16 @@ class SvxMacroItem; class SvxEventConfigPage : public _SvxMacroTabPage { - FixedText aSaveInText; - ListBox aSaveInListBox; + FixedText aSaveInText; + ListBox aSaveInListBox; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xDocumentModifiable; - BOOL bAppConfig; + BOOL bAppConfig; - DECL_LINK( SelectHdl_Impl, ListBox* ); + DECL_LINK( SelectHdl_Impl, ListBox* ); // Forbidden and not implemented. SvxEventConfigPage (const SvxEventConfigPage &); @@ -66,8 +66,8 @@ public: void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); protected: - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); using _SvxMacroTabPage::Reset; private: diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src index e8c0e21677ac..9bb68d6948b2 100644 --- a/cui/source/customize/eventdlg.src +++ b/cui/source/customize/eventdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ TabPage RID_SVXPAGE_EVENTS Pos = MAP_APPFONT ( 217, ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Assign:" ; - }; + }; PushButton PB_ASSIGN { Pos = MAP_APPFONT ( 217 , ROW0A ) ; @@ -92,20 +92,20 @@ TabPage RID_SVXPAGE_EVENTS { ImageBitmap = Bitmap { File = "id018.png"; }; MASKCOLOR - }; + }; Image IMG_COMPONENT { 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 5cb41f93a829..91aa5239a976 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -296,7 +296,7 @@ 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( "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 ) ); @@ -844,17 +844,17 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex ) : _SvxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_MACROASSIGN ), rSet ) { - mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); - mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); - mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); - mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ) ); - mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); - mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); - 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) ); + mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); + mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); + mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); + mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ) ); + mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); + mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); + 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(); diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc index a7387e410432..dedb2db025c2 100644 --- a/cui/source/customize/macropg.hrc +++ b/cui/source/customize/macropg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,70 +32,70 @@ #include <svtools/controldims.hrc> #endif -#define LB_EVENT 1 -#define PB_ASSIGN 2 -#define PB_DELETE 3 -#define STR_EVENT 4 -#define STR_ASSMACRO 5 -#define FT_ASSIGN 6 -#define PB_ASSIGN_COMPONENT 7 +#define LB_EVENT 1 +#define PB_ASSIGN 2 +#define PB_DELETE 3 +#define STR_EVENT 4 +#define STR_ASSMACRO 5 +#define FT_ASSIGN 6 +#define PB_ASSIGN_COMPONENT 7 // 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 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 -#define RID_PB_HELP 43 -#define FT_METHOD 44 -#define EDIT_METHOD 45 +#define RID_PB_OK 41 +#define RID_PB_CANCEL 42 +#define RID_PB_HELP 43 +#define FT_METHOD 44 +#define EDIT_METHOD 45 // COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5 // <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2-> -#define WIDTH_TP 260 // of whole tabpage -#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) -#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) -#define COL3 (COL4-RSC_SP_CTRL_X) -#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) -#define WIDTH1_2 (COL3-COL0) // width of upper listbox -#define SPACE1 4 // space between lower listboxes -#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox -#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox -#define COL1 (COL0+WIDTH1) -#define COL2 (COL1+SPACE1) +#define WIDTH_TP 260 // of whole tabpage +#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) +#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) +#define COL3 (COL4-RSC_SP_CTRL_X) +#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) +#define WIDTH1_2 (COL3-COL0) // width of upper listbox +#define SPACE1 4 // space between lower listboxes +#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox +#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox +#define COL1 (COL0+WIDTH1) +#define COL2 (COL1+SPACE1) -#define HEIGHT0 158 // of upper listbox -#define HEIGHT_TP (HEIGHT0+6) // of whole tabpage -#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design -#define ROW0A (ROW0+RSC_CD_FIXEDTEXT_HEIGHT+SPACE1) -#define ROW1 (ROW0A+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button -#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) -#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Assign component button -#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) -#define ROW5_REMOVE (ROW4+RSC_SP_CTRL_GROUP_Y) // Remove button -#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) -#define ROW6 (ROW0+HEIGHT0) -#define ROW7 (ROW6+RSC_SP_CTRL_Y) -#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS -#define ROW7A (ROW7+HEIGHT_EXTRA7) -#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) -#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) -#define HEIGHT8 (ROW9-ROW8) // of lower listboxes +#define HEIGHT0 158 // of upper listbox +#define HEIGHT_TP (HEIGHT0+6) // of whole tabpage +#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design +#define ROW0A (ROW0+RSC_CD_FIXEDTEXT_HEIGHT+SPACE1) +#define ROW1 (ROW0A+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button +#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) +#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Assign component button +#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) +#define ROW5_REMOVE (ROW4+RSC_SP_CTRL_GROUP_Y) // Remove button +#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) +#define ROW6 (ROW0+HEIGHT0) +#define ROW7 (ROW6+RSC_SP_CTRL_Y) +#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS +#define ROW7A (ROW7+HEIGHT_EXTRA7) +#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) +#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) +#define HEIGHT8 (ROW9-ROW8) // of lower listboxes -#define COMP_EDIT_WIDTH 100 -#define COMP_DIST_Y 6 -#define COMP_WIDTH (COMP_EDIT_WIDTH+RSC_CD_PUSHBUTTON_WIDTH+3*COMP_DIST_Y) -#define COMP_COL0 COMP_DIST_Y -#define COMP_COL1 (COMP_COL0+COMP_EDIT_WIDTH+COMP_DIST_Y) -#define COMP_ROW0 6 -#define COMP_ROW1 (COMP_ROW0+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define COMP_ROW2 (COMP_ROW1+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y) -#define COMP_ROWEDIT (COMP_ROW0+RSC_CD_FIXEDTEXT_HEIGHT+2) -#define COMP_HEIGHT (COMP_ROW2+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y) +#define COMP_EDIT_WIDTH 100 +#define COMP_DIST_Y 6 +#define COMP_WIDTH (COMP_EDIT_WIDTH+RSC_CD_PUSHBUTTON_WIDTH+3*COMP_DIST_Y) +#define COMP_COL0 COMP_DIST_Y +#define COMP_COL1 (COMP_COL0+COMP_EDIT_WIDTH+COMP_DIST_Y) +#define COMP_ROW0 6 +#define COMP_ROW1 (COMP_ROW0+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define COMP_ROW2 (COMP_ROW1+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y) +#define COMP_ROWEDIT (COMP_ROW0+RSC_CD_FIXEDTEXT_HEIGHT+2) +#define COMP_HEIGHT (COMP_ROW2+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y) #endif diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 10d9149233e0..6402587dc913 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_MACROASSIGN { - // HelpID = HID_MACROASSIGN ; + // HelpID = HID_MACROASSIGN ; Hide = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 0e527e5a7623..3701d5fc3175 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,29 +35,29 @@ public: _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ); ~_SvxMacroTabPage_Impl(); - FixedText* pAssignFT; - PushButton* pAssignPB; - PushButton* pAssignComponentPB; - PushButton* pDeletePB; - Image* pMacroImg; - Image* pComponentImg; - Image* pMacroImg_h; - Image* pComponentImg_h; - String* pStrEvent; - String* pAssignedMacro; - _HeaderTabListBox* pEventLB; - BOOL bReadOnly; - BOOL bIDEDialogMode; + FixedText* pAssignFT; + PushButton* pAssignPB; + PushButton* pAssignComponentPB; + PushButton* pDeletePB; + Image* pMacroImg; + Image* pComponentImg; + Image* pMacroImg_h; + Image* pComponentImg_h; + String* pStrEvent; + String* pAssignedMacro; + _HeaderTabListBox* pEventLB; + BOOL bReadOnly; + BOOL bIDEDialogMode; }; class AssignComponentDialog : public ModalDialog { private: - FixedText maMethodLabel; - Edit maMethodEdit; - OKButton maOKButton; - CancelButton maCancelButton; - HelpButton maHelpButton; + FixedText maMethodLabel; + Edit maMethodEdit; + OKButton maOKButton; + CancelButton maCancelButton; + HelpButton maHelpButton; ::rtl::OUString maURL; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index b52f8c29a6f3..d04aa0470738 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include "selector.hxx" #include <dialmgr.hxx> #include "selector.hrc" -#include <svx/fmresids.hrc> // for RID_SVXIMG_... +#include <svx/fmresids.hrc> // for RID_SVXIMG_... #include <svx/dialmgr.hxx> // for RID_SVXIMG_... #include <cuires.hrc> #include <sfx2/app.hxx> @@ -316,7 +316,7 @@ namespace if ( xContext.is() ) xScripts.set( xContext->getScriptContainer(), UNO_QUERY ); } - + return Reference< XModel >( xScripts, UNO_QUERY ); } diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc index 78929c8c9de5..cfa1ff21f82b 100644 --- a/cui/source/customize/selector.hrc +++ b/cui/source/customize/selector.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,13 +35,13 @@ #define BTN_SELECTOR_HELP 8 #define GRP_SELECTOR_DESCRIPTION 9 #define TXT_SELECTOR_DESCRIPTION 10 -#define IMG_HARDDISK 1 +#define IMG_HARDDISK 1 #define IMG_HARDDISK_HC 2 -#define IMG_LIB 3 +#define IMG_LIB 3 #define IMG_LIB_HC 4 -#define IMG_MACRO 5 +#define IMG_MACRO 5 #define IMG_MACRO_HC 6 -#define IMG_DOC 7 +#define IMG_DOC 7 #define IMG_DOC_HC 8 #define STR_SELECTOR_ADD 310 diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src index cd4ea9dd5d12..f09f95661a5a 100644 --- a/cui/source/customize/selector.src +++ b/cui/source/customize/selector.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR String STR_PRODMACROS { Text [ en-US ] = "%PRODUCTNAME Macros"; - }; + }; Image IMG_HARDDISK { ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; }; @@ -132,7 +132,7 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR { ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; }; MASKCOLOR - }; + }; Image IMG_LIB { ImageBitmap = Bitmap { File = "im30820.png"; }; diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index c4c55b9ebe1b..61f8f82a9547 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ TextAttrib* SpellErrorAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } /*-- 10.09.2003 14:27:43--------------------------------------------------- @@ -123,13 +123,13 @@ TextAttrib* SpellLanguageAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } /*-- 31.10.2003 16:07:45--------------------------------------------------- -----------------------------------------------------------------------*/ -SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : +SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { @@ -167,7 +167,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const -----------------------------------------------------------------------*/ int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor; } diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 72e69270239a..29bd5265c667 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #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) @@ -58,8 +58,8 @@ struct SpellErrorDescription SpellErrorDescription() : bIsGrammarError( false ){} - - SpellErrorDescription( bool bGrammar, + + SpellErrorDescription( bool bGrammar, const ::rtl::OUString& rText, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSuggestions, @@ -75,7 +75,7 @@ struct SpellErrorDescription sServiceName( rServiceName ), aSuggestions( rSuggestions ) { - if( pDialogTitle ) + if( pDialogTitle ) sDialogTitle = *pDialogTitle; if( pExplanation ) sExplanation = *pExplanation; @@ -85,16 +85,16 @@ struct SpellErrorDescription int operator==( const SpellErrorDescription& rDesc ) const { - return bIsGrammarError == rDesc.bIsGrammarError && - sErrorText.equals( rDesc.sErrorText ) && + return bIsGrammarError == rDesc.bIsGrammarError && + sErrorText.equals( rDesc.sErrorText ) && aLocale.Language.equals( rDesc.aLocale.Language ) && aLocale.Country.equals( rDesc.aLocale.Country ) && aLocale.Variant.equals( rDesc.aLocale.Variant ) && - aSuggestions == rDesc.aSuggestions && + aSuggestions == rDesc.aSuggestions && xGrammarChecker == rDesc.xGrammarChecker && sDialogTitle.equals( rDesc.sDialogTitle ) && - sExplanation.equals( rDesc.sExplanation ) && - sRuleId == rDesc.sRuleId; + sExplanation.equals( rDesc.sExplanation ) && + sRuleId == rDesc.sRuleId; } }; /* -----------------10.09.2003 14:23----------------- @@ -104,10 +104,10 @@ class SpellErrorAttrib : public TextAttrib { public: -private: +private: //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives; SpellErrorDescription m_aSpellErrorDescription; - + //not accessible SpellErrorAttrib(); public: @@ -118,7 +118,7 @@ public: const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } - + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; @@ -139,10 +139,10 @@ public: ~SpellLanguageAttrib(); LanguageType GetLanguage() const {return m_eLanguage;} - void SetLanguage(LanguageType eLang) + void SetLanguage(LanguageType eLang) {m_eLanguage = eLang;} - - + + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; @@ -164,8 +164,8 @@ public: const Color& GetColor() const { return m_aBackgroundColor;} void SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;} - - + + virtual void SetFont( Font& rFont ) const; virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 304407cdba07..e93307901f26 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,12 +77,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) +#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) // struct SpellDialog_Impl --------------------------------------------- struct SpellDialog_Impl { - Sequence< Reference< XDictionary > > aDics; + Sequence< Reference< XDictionary > > aDics; }; // ----------------------------------------------------------------------- //#define VENDOR_IMAGE_HEIGHT 44 //as specified @@ -329,7 +329,7 @@ void SpellDialog::UpdateBoxes_Impl() LanguageType nAltLanguage = LANGUAGE_NONE; //String aAltWord; - Sequence< ::rtl::OUString > aNewWords; + Sequence< ::rtl::OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { @@ -861,7 +861,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) void SpellDialog::SetLanguage( sal_uInt16 nLang ) -/* [Beschreibung] +/* [Beschreibung] wenn die Sprache im Thesaurus umgestellt wurde, muss auch hier die Sprache umgestellt werden. @@ -899,7 +899,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) { bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ::rtl::OUString sSuggestionImageUrl = + ::rtl::OUString sSuggestionImageUrl = SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast ); aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) ); uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); @@ -908,7 +908,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage ); } @@ -1159,7 +1159,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) bool bRet = false; if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/) { - //apply changes and ignored text parts + //apply changes and ignored text parts rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck); } aSentenceED.ResetIgnoreErrorsAt(); @@ -1845,15 +1845,15 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA DBG_ASSERT(static_cast<const SpellErrorAttrib*>( GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); - ::rtl::OUString aWord; - lang::Locale aLocale; - uno::Sequence< ::rtl::OUString > aAlts; + ::rtl::OUString aWord; + lang::Locale aLocale; + uno::Sequence< ::rtl::OUString > aAlts; ::rtl::OUString sServiceName; if (xAlt.is()) { - aWord = xAlt->getWord(); - aLocale = xAlt->getLocale(); - aAlts = xAlt->getAlternatives(); + aWord = xAlt->getWord(); + aLocale = xAlt->getLocale(); + aAlts = xAlt->getAlternatives(); uno::Reference< container::XNamed > xNamed( xAlt, uno::UNO_QUERY ); if (xNamed.is()) sServiceName = xNamed->getName(); @@ -2002,18 +2002,18 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore String aLeftOverText; for (ULONG i = 1; i < nPara; ++i) { - aLeftOverText.AppendAscii( "\x0a" ); // the manual line break... + aLeftOverText.AppendAscii( "\x0a" ); // the manual line break... aLeftOverText += pTextEngine->GetText(i); } if (pError) - { // we need to add a new portion containing the left-over text + { // we need to add a new portion containing the left-over text svx::SpellPortion aPortion2; aPortion2.eLanguage = eLang; aPortion2.sText = aLeftOverText; aRet.push_back( aPortion2 ); } else - { // we just need to append the left-over text to the last portion (which had no errors) + { // we just need to append the left-over text to the last portion (which had no errors) aRet[ aRet.size() - 1 ].sText += aLeftOverText; } } diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc index 5c9a82ffef0e..8cac9b8b3cc3 100644 --- a/cui/source/dialogs/SpellDialog.hrc +++ b/cui/source/dialogs/SpellDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 5a97025f02af..b91bea09861f 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK Size = MAP_APPFONT ( 270, 21 ) ; Hide = TRUE; }; - + FixedText FT_LANGUAGE { Pos = MAP_APPFONT( 6, 8 ); diff --git a/cui/source/dialogs/charmap.hrc b/cui/source/dialogs/charmap.hrc index 0b3aa3e09b49..644ea47b3a2b 100644 --- a/cui/source/dialogs/charmap.hrc +++ b/cui/source/dialogs/charmap.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,23 +29,23 @@ // defines ------------------------------------------------------------------ -#define CT_SHOWSET 10 -#define FT_FONT 11 -#define LB_FONT 12 -#define CT_SHOWTEXT 13 -#define FT_SYMBOLE 14 -#define CT_SHOWCHAR 15 -#define FT_CHARCODE 16 -#define BTN_CHAR_OK 17 -#define BTN_CHAR_CANCEL 18 -#define BTN_CHAR_HELP 19 -#define BTN_DELETE 20 -#define FT_SUBSET 30 -#define LB_SUBSET 31 -#define ED_SHORTCUT 32 -#define BT_ASSIGN 33 -#define FT_ASSIGN 34 -#define CT_ASSIGN 35 +#define CT_SHOWSET 10 +#define FT_FONT 11 +#define LB_FONT 12 +#define CT_SHOWTEXT 13 +#define FT_SYMBOLE 14 +#define CT_SHOWCHAR 15 +#define FT_CHARCODE 16 +#define BTN_CHAR_OK 17 +#define BTN_CHAR_CANCEL 18 +#define BTN_CHAR_HELP 19 +#define BTN_DELETE 20 +#define FT_SUBSET 30 +#define LB_SUBSET 31 +#define ED_SHORTCUT 32 +#define BT_ASSIGN 33 +#define FT_ASSIGN 34 +#define CT_ASSIGN 35 #endif diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 02e2e728f412..835ab608aa87 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ ModalDialog RID_SVXDLG_CHARMAP HelpId = SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ +/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -92,7 +92,7 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ +/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -134,7 +134,7 @@ ModalDialog RID_SVXDLG_CHARMAP Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* +/* PushButton BT_ASSIGN { Pos = MAP_APPFONT ( 242 , 140 ) ; @@ -153,7 +153,7 @@ ModalDialog RID_SVXDLG_CHARMAP Pos = MAP_APPFONT ( 60 , 156 ) ; Size = MAP_APPFONT ( 160 , 8 ) ; }; -*/ +*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 9b23a1386963..949b62f558c2 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,17 +90,17 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr() //----------------------------------------------------------------------------- SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) ) - ,aWordText ( this, CUI_RES( FT_WORD ) ) - ,aAktWord ( this, CUI_RES( FT_AKTWORD ) ) - ,aNewWord ( this, CUI_RES( FT_NEWWORD ) ) - ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) ) - ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ) + ,aWordText ( this, CUI_RES( FT_WORD ) ) + ,aAktWord ( this, CUI_RES( FT_AKTWORD ) ) + ,aNewWord ( this, CUI_RES( FT_NEWWORD ) ) + ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) ) + ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ) ,aIgnoreBtn ( this, CUI_RES( BTN_IGNORE ) ) - ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) ) - ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) ) - ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) ) - ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) ) - ,aStatusText ( this, CUI_RES( FT_STATUS ) ) + ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) ) + ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) ) + ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) ) + ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) ) + ,aStatusText ( this, CUI_RES( FT_STATUS ) ) ,aHelpBtn ( this, CUI_RES( BTN_SPL_HELP ) ) ,aCancelBtn ( this, CUI_RES( BTN_SPL_CANCEL ) ) ,aAuditBox ( this, CUI_RES( GB_AUDIT ) ) @@ -116,7 +116,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) } // ----------------------------------------------------------------------- -PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) const +PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType ) const { const PushButton* pButton = NULL; switch ( _eType ) @@ -150,13 +150,13 @@ void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEna // ----------------------------------------------------------------------- void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ) { - Window* pInsertAfter = NULL; // will be the last window of our own "undividable" group, after which we insert the foreign group + Window* pInsertAfter = NULL; // will be the last window of our own "undividable" group, after which we insert the foreign group switch ( _eInsertAfter ) { - case eLeftRightWords : pInsertAfter = &aNewWordED; break; - case eSuggestionLabel : pInsertAfter = &aSuggestionFT; break; - case eActionButtons : pInsertAfter = &aChangeAllBtn; break; - case eDialogButtons : pInsertAfter = &aCancelBtn; break; + case eLeftRightWords : pInsertAfter = &aNewWordED; break; + case eSuggestionLabel : pInsertAfter = &aSuggestionFT; break; + case eActionButtons : pInsertAfter = &aChangeAllBtn; break; + case eDialogButtons : pInsertAfter = &aCancelBtn; break; } // now loop through the remaining windows of the foreign group diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 80edc1b73475..dee44a2f45a4 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,22 +44,22 @@ class SvxClickInfoCtr: public Control { private: - FixedInfo aFixedInfo; - Link aActivateLink; + FixedInfo aFixedInfo; + Link aActivateLink; public: SvxClickInfoCtr( Window* pParent, const ResId& rResId ); ~SvxClickInfoCtr(); - virtual void SetText( const XubString& rStr ); - virtual XubString GetText() const; + virtual void SetText( const XubString& rStr ); + virtual XubString GetText() const; - void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; } - const Link& GetActivateHdl() const { return aActivateLink; } + void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; } + const Link& GetActivateHdl() const { return aActivateLink; } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; @@ -86,13 +86,13 @@ protected: FixedText aNewWord; Edit aNewWordED; - FixedText aSuggestionFT; + FixedText aSuggestionFT; PushButton aIgnoreBtn; PushButton aIgnoreAllBtn; PushButton aChangeBtn; PushButton aChangeAllBtn; - PushButton aOptionsBtn; + PushButton aOptionsBtn; FixedInfo aStatusText; HelpButton aHelpBtn; @@ -101,35 +101,35 @@ protected: GroupBox aAuditBox; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); private: - PushButton* implGetButton( ButtonType _eType ) const; + PushButton* implGetButton( ButtonType _eType ) const; public: SvxCommonLinguisticControl( ModalDialog* _pParent ); // handlers - inline void SetResetWordHdl( const Link& _rLink ) { aAktWord.SetActivateHdl( _rLink ); } - inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } + inline void SetResetWordHdl( const Link& _rLink ) { aAktWord.SetActivateHdl( _rLink ); } + inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } - void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); - void EnableButton( ButtonType _eType, sal_Bool _bEnable ); + void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); + void EnableButton( ButtonType _eType, sal_Bool _bEnable ); - inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } - inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } + inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } + inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } // users of this class may want to insert own controls in some places, where the ordinary // Z-Order determined by construction time is not sufficient // Use the following methods for this enum ControlGroup // control groups in this window which cannot be devided (e.g. are adjacent in the Z order) { - eLeftRightWords, // the controls for the two words (original and suggestion), including the labels - eSuggestionLabel, // the label for the suggestion - eActionButtons, // the group of "ignore(all)" / "change(all)" buttons - eDialogButtons // the group of dialog control buttons (help and close) + eLeftRightWords, // the controls for the two words (original and suggestion), including the labels + eSuggestionLabel, // the label for the suggestion + eActionButtons, // the group of "ignore(all)" / "change(all)" buttons + eDialogButtons // the group of dialog control buttons (help and close) }; - void InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ); + void InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter ); /** enlarges the window @@ -137,32 +137,32 @@ public: to the right, the dictionary list as well as the close/help buttons stick to the bottom of the window. */ - void Enlarge( sal_Int32 _nX, sal_Int32 _nY ); + void Enlarge( sal_Int32 _nX, sal_Int32 _nY ); // control access methods - inline void SetCurrentText( const String& _rText ) { aAktWord.SetText( _rText ); } - inline String GetCurrentText( ) const { return aAktWord.GetText(); } + inline void SetCurrentText( const String& _rText ) { aAktWord.SetText( _rText ); } + inline String GetCurrentText( ) const { return aAktWord.GetText(); } - inline void SetStatusText( const String& _rText ) { aStatusText.SetText( _rText ); } - inline String GetStatusText( ) const { return aStatusText.GetText(); } + inline void SetStatusText( const String& _rText ) { aStatusText.SetText( _rText ); } + inline String GetStatusText( ) const { return aStatusText.GetText(); } - inline Edit& GetWordInputControl() { return aNewWordED; } - inline const Edit& GetWordInputControl() const { return aNewWordED; } + inline Edit& GetWordInputControl() { return aNewWordED; } + inline const Edit& GetWordInputControl() const { return aNewWordED; } // returns the location (upper-left corner) of the group of action buttons - inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } + inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } // updates the help texts for the "change" and "change all" buttons according to the currently // entered texts void UpdateChangesHelp( const String& _rNewText ); - inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } + inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } // updates the help texts for the "ignore" and "always ignore" buttons according to the currently // entered texts void UpdateIgnoreHelp( ); - String GetNewEditWord(); - void SetNewEditWord( const String& _rNew ); + String GetNewEditWord(); + void SetNewEditWord( const String& _rNew ); }; diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src index 60a1eff0e14f..1fb25d8e4009 100644 --- a/cui/source/dialogs/commonlingui.src +++ b/cui/source/dialogs/commonlingui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ Window RID_SVX_WND_COMMON_LINGU { - DialogControl = TRUE; // we want to tab out of this + DialogControl = TRUE; // we want to tab out of this Hide = TRUE; FixedText FT_WORD diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6348b73d4e14..a2794ad2a52d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* bOne = pItem->GetValue(); mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() ); - + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7cf48b0c1821..11b21f02a7df 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <sal/macros.h> using namespace ::com::sun::star::uno; @@ -56,7 +56,7 @@ using namespace ::svxform; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::util; -#define MAX_HISTORY_ENTRIES 50 +#define MAX_HISTORY_ENTRIES 50 //------------------------------------------------------------------------ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) @@ -132,9 +132,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c ,m_pbHelp (this, CUI_RES(1)) ,m_sSearch ( m_pbSearchAgain.GetText() ) ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) - ,m_pPreSearchFocus( NULL ) + ,m_pPreSearchFocus( NULL ) ,m_lnkContextSupplier(lnkContextSupplier) - ,m_pConfig( NULL ) + ,m_pConfig( NULL ) { DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !"); @@ -163,7 +163,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c m_lbForm.SetSelectHdl(LINK(this, FmSearchDialog, OnContextSelection)); if (m_arrContextFields.size() == 1) - { // remove the context selection listbox and rearrange the controls accordingly + { // remove the context selection listbox and rearrange the controls accordingly sal_Int32 nUpper = m_lbForm.GetPosPixel().Y(); sal_Int32 nDifference = m_rbAllFields.GetPosPixel().Y() - nUpper; @@ -192,7 +192,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c initCommon( fmscInitial.xCursor ); if (fmscInitial.sFieldDisplayNames.Len() != 0) - { // use the display names if supplied + { // use the display names if supplied DBG_ASSERT(fmscInitial.sFieldDisplayNames.GetTokenCount() == fmscInitial.strUsedFields.GetTokenCount(), "FmSearchDialog::FmSearchDialog : invalid initial context description !"); Init(fmscInitial.sFieldDisplayNames, sInitialText); @@ -203,9 +203,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c //------------------------------------------------------------------------ void FmSearchDialog::implMoveControls( - Control** _ppControls, - sal_Int32 _nControls, - sal_Int32 _nUp, + Control** _ppControls, + sal_Int32 _nControls, + sal_Int32 _nUp, Control* /*_pToResize*/) { for (sal_Int32 i=0; i<_nControls; ++i) @@ -345,7 +345,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG) { if (m_pbClose.IsEnabled()) - { // der Button hat die Funktion 'Suchen' + { // der Button hat die Funktion 'Suchen' UniString strThisRoundText = m_cmbSearchText.GetText(); // zur History dazu m_cmbSearchText.RemoveEntry(strThisRoundText); @@ -379,7 +379,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG) } } else - { // der Button hat die Fukntion 'Abbrechen' + { // der Button hat die Fukntion 'Abbrechen' DBG_ASSERT(m_pSearchEngine->GetSearchMode() != SM_BRUTE, "FmSearchDialog, OnClickedSearchAgain : falscher Modus !"); // der CancelButton wird normalerweise nur disabled, wenn ich in einem Thread oder mit Reschedule arbeite m_pSearchEngine->CancelSearch(); @@ -544,10 +544,10 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) m_aSoundsLikeCJKSettings.Enable(bChecked); // two other buttons which depend on this one - sal_Bool bEnable = ( m_rbSearchForText.IsChecked() - && !m_aSoundsLikeCJK.IsChecked() + sal_Bool bEnable = ( m_rbSearchForText.IsChecked() + && !m_aSoundsLikeCJK.IsChecked() ) - || !SvtCJKOptions().IsJapaneseFindEnabled(); + || !SvtCJKOptions().IsJapaneseFindEnabled(); m_cbCase.Enable(bEnable); m_aHalfFullFormsCJK.Enable(bEnable); @@ -565,7 +565,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) fmscContext.nContext = nContext; #ifdef DBG_UTIL - sal_uInt32 nResult = + sal_uInt32 nResult = #endif m_lnkContextSupplier.Call(&fmscContext); DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !"); @@ -619,7 +619,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (!bEnable) EnableControlPaint(sal_False); else - { // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig + { // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig if (m_aDelayedPaint.IsActive()) m_aDelayedPaint.Stop(); } @@ -629,7 +629,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( !bEnable ) { - // if one of my children has the focus, remember it + // 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 ) ) @@ -646,23 +646,23 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (m_pSearchEngine->GetSearchMode() != SM_BRUTE) { m_flSearchFor.Enable (bEnable); - m_rbSearchForText.Enable (bEnable); - m_rbSearchForNull.Enable (bEnable); - m_rbSearchForNotNull.Enable (bEnable); + m_rbSearchForText.Enable (bEnable); + m_rbSearchForNull.Enable (bEnable); + m_rbSearchForNotNull.Enable (bEnable); m_flWhere.Enable (bEnable); - m_ftForm.Enable (bEnable); - m_lbForm.Enable (bEnable); - m_rbAllFields.Enable (bEnable); - m_rbSingleField.Enable (bEnable); - m_lbField.Enable (bEnable && m_rbSingleField.IsChecked()); + m_ftForm.Enable (bEnable); + m_lbForm.Enable (bEnable); + m_rbAllFields.Enable (bEnable); + m_rbSingleField.Enable (bEnable); + m_lbField.Enable (bEnable && m_rbSingleField.IsChecked()); m_flOptions.Enable (bEnable); - m_cbBackwards.Enable (bEnable); - m_cbStartOver.Enable (bEnable); - m_pbClose.Enable (bEnable); - EnableSearchForDependees (bEnable); + m_cbBackwards.Enable (bEnable); + m_cbStartOver.Enable (bEnable); + m_pbClose.Enable (bEnable); + EnableSearchForDependees (bEnable); if ( !bEnable ) - { // this means we're preparing for starting a search + { // 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 @@ -677,7 +677,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) EnableControlPaint(sal_True); if ( bEnable ) - { // restore focus + { // restore focus // 104332 - 2002-10-17 - fs@openoffice.org if ( m_pPreSearchFocus ) { @@ -703,18 +703,18 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) sal_Bool bEnableRedundants = !m_aSoundsLikeCJK.IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); - m_cmbSearchText.Enable (bEnable); - m_ftPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); - m_cbWildCard.Enable (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked()); - m_cbRegular.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked()); - m_cbApprox.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked()); - m_pbApproxSettings.Enable (bEnable && m_cbApprox.IsChecked()); - m_aHalfFullFormsCJK.Enable (bEnable && bEnableRedundants); - m_aSoundsLikeCJK.Enable (bEnable); - m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked()); - m_lbPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); - m_cbUseFormat.Enable (bEnable); - m_cbCase.Enable (bEnable && bEnableRedundants); + m_cmbSearchText.Enable (bEnable); + m_ftPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); + m_cbWildCard.Enable (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked()); + m_cbRegular.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked()); + m_cbApprox.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked()); + m_pbApproxSettings.Enable (bEnable && m_cbApprox.IsChecked()); + m_aHalfFullFormsCJK.Enable (bEnable && bEnableRedundants); + m_aSoundsLikeCJK.Enable (bEnable); + m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked()); + m_lbPosition.Enable (bEnable && !m_cbWildCard.IsChecked()); + m_cbUseFormat.Enable (bEnable); + m_cbCase.Enable (bEnable && bEnableRedundants); } //------------------------------------------------------------------------ @@ -833,8 +833,8 @@ void FmSearchDialog::LoadParams() { FmSearchParams aParams(m_pConfig->getParams()); - const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); - const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); + const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); + const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); for (; pHistory != pHistoryEnd; ++pHistory) m_cmbSearchText.InsertEntry( *pHistory ); @@ -874,7 +874,7 @@ void FmSearchDialog::LoadParams() LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbCase); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbBackwards); - m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics! + m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics! m_aSoundsLikeCJK.Check( aParams.bSoundsLikeCJK ); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aHalfFullFormsCJK); LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aSoundsLikeCJK); @@ -937,22 +937,22 @@ void FmSearchDialog::SaveParams() const for (sal_uInt16 i=0; i<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory) *pHistory = m_cmbSearchText.GetEntry(i); - aCurrentSettings.sSingleSearchField = m_lbField.GetSelectEntry(); - aCurrentSettings.bAllFields = m_rbAllFields.IsChecked(); - aCurrentSettings.nPosition = m_pSearchEngine->GetPosition(); - aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing(); - aCurrentSettings.setCaseSensitive ( m_pSearchEngine->GetCaseSensitive() ); - aCurrentSettings.bBackwards = !m_pSearchEngine->GetDirection(); - aCurrentSettings.bWildcard = m_pSearchEngine->GetWildcard(); - aCurrentSettings.bRegular = m_pSearchEngine->GetRegular(); - aCurrentSettings.bApproxSearch = m_pSearchEngine->GetLevenshtein(); - aCurrentSettings.bLevRelaxed = m_pSearchEngine->GetLevRelaxed(); - aCurrentSettings.nLevOther = m_pSearchEngine->GetLevOther(); - aCurrentSettings.nLevShorter = m_pSearchEngine->GetLevShorter(); - aCurrentSettings.nLevLonger = m_pSearchEngine->GetLevLonger(); - - aCurrentSettings.bSoundsLikeCJK = m_pSearchEngine->GetTransliteration(); - aCurrentSettings.setTransliterationFlags ( m_pSearchEngine->GetTransliterationFlags() ); + aCurrentSettings.sSingleSearchField = m_lbField.GetSelectEntry(); + aCurrentSettings.bAllFields = m_rbAllFields.IsChecked(); + aCurrentSettings.nPosition = m_pSearchEngine->GetPosition(); + aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing(); + aCurrentSettings.setCaseSensitive ( m_pSearchEngine->GetCaseSensitive() ); + aCurrentSettings.bBackwards = !m_pSearchEngine->GetDirection(); + aCurrentSettings.bWildcard = m_pSearchEngine->GetWildcard(); + aCurrentSettings.bRegular = m_pSearchEngine->GetRegular(); + aCurrentSettings.bApproxSearch = m_pSearchEngine->GetLevenshtein(); + aCurrentSettings.bLevRelaxed = m_pSearchEngine->GetLevRelaxed(); + aCurrentSettings.nLevOther = m_pSearchEngine->GetLevOther(); + aCurrentSettings.nLevShorter = m_pSearchEngine->GetLevShorter(); + aCurrentSettings.nLevLonger = m_pSearchEngine->GetLevLonger(); + + aCurrentSettings.bSoundsLikeCJK = m_pSearchEngine->GetTransliteration(); + aCurrentSettings.setTransliterationFlags ( m_pSearchEngine->GetTransliterationFlags() ); if (m_rbSearchForNull.IsChecked()) aCurrentSettings.nSearchForType = 1; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 26c13ee9fbfa..d1ff4513df3b 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,8 +84,8 @@ using namespace ::com::sun::star::uno; SearchThread::SearchThread( SearchProgress* pProgess, TPGalleryThemeProperties* pBrowser, const INetURLObject& rStartURL ) : - mpProgress ( pProgess ), - mpBrowser ( pBrowser ), + mpProgress ( pProgess ), + mpBrowser ( pBrowser ), maStartURL ( rStartURL ) { } @@ -145,8 +145,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, try { - ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv; - Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); + ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv; + Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); Sequence< OUString > aProps( 2 ); aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" ); @@ -228,7 +228,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL aFtSearchType ( this, CUI_RES( FT_SEARCH_TYPE ) ), aFLSearchType ( this, CUI_RES( FL_SEARCH_TYPE ) ), aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL ) + maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL ) { FreeResource(); aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) ); @@ -281,8 +281,8 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl ) // -------------- TakeThread::TakeThread( TakeProgress* pProgess, TPGalleryThemeProperties* pBrowser, List& rTakenList ) : - mpProgress ( pProgess ), - mpBrowser ( pBrowser ), + mpProgress ( pProgess ), + mpBrowser ( pBrowser ), mrTakenList ( rTakenList ) { } @@ -297,12 +297,12 @@ TakeThread::~TakeThread() void SAL_CALL TakeThread::run() { - String aName; - INetURLObject aURL; - USHORT nEntries; - GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; - USHORT nPos; - GalleryProgress* pStatusProgress; + String aName; + INetURLObject aURL; + USHORT nEntries; + GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; + USHORT nPos; + GalleryProgress* pStatusProgress; { SolarMutexGuard aGuard; @@ -383,7 +383,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) { - TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); + TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); ::std::bit_vector aRemoveEntries( mpBrowser->aFoundList.Count(), false ); ::std::vector< String > aRemainingVector; sal_uInt32 i, nCount; @@ -457,11 +457,11 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) // --------------------- ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ), - aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ), + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ), + aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ), aFLActualizeProgress ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - pTheme ( pThm ) + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + pTheme ( pThm ) { FreeResource(); aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) ); @@ -538,12 +538,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL ) // --------------- TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) : - ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ), - maOk ( this, CUI_RES( BTN_OK ) ), - maCancel ( this, CUI_RES( BTN_CANCEL ) ), - maHelp ( this, CUI_RES( BTN_HELP ) ), + ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ), + maOk ( this, CUI_RES( BTN_OK ) ), + maCancel ( this, CUI_RES( BTN_CANCEL ) ), + maHelp ( this, CUI_RES( BTN_HELP ) ), maFL ( this, CUI_RES( FL_TITLE ) ), - maEdit ( this, CUI_RES( EDT_TITLE ) ) + maEdit ( this, CUI_RES( EDT_TITLE ) ) { FreeResource(); maEdit.SetText( rOldTitle ); @@ -555,12 +555,12 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) : // ------------------- GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : - ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ), - aBtnOk ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ), + aBtnOk ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), aFLId ( this, CUI_RES( FL_ID ) ), - aLbResName ( this, CUI_RES( LB_RESNAME ) ), - pThm ( _pThm ) + aLbResName ( this, CUI_RES( LB_RESNAME ) ), + pThm ( _pThm ) { FreeResource(); @@ -578,9 +578,9 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) : IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) { - Gallery* pGal = pThm->GetParent(); - const ULONG nId = GetId(); - BOOL bDifferentThemeExists = FALSE; + Gallery* pGal = pThm->GetParent(); + const ULONG nId = GetId(); + BOOL bDifferentThemeExists = FALSE; for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) { @@ -614,7 +614,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG ) GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ), - pData ( _pData ) + pData ( _pData ) { FreeResource(); @@ -672,12 +672,12 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) { pData = _pData; - GalleryTheme* pThm = pData->pTheme; + GalleryTheme* pThm = pData->pTheme; String aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) ); String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); String aAccess; - String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); + String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); + BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); @@ -750,7 +750,7 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS // ---------------------------- TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ), aBtnSearch ( this, CUI_RES(BTN_SEARCH ) ), aBtnTake ( this, CUI_RES(BTN_TAKE ) ), aBtnTakeAll ( this, CUI_RES(BTN_TAKEALL ) ), @@ -855,13 +855,13 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& void TPGalleryThemeProperties::FillFilterList() { - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - String aExt; - String aName; - FilterEntry* pFilterEntry; - FilterEntry* pTestEntry; - sal_uInt16 i, nKeyCount; - BOOL bInList; + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); + String aExt; + String aName; + FilterEntry* pFilterEntry; + FilterEntry* pTestEntry; + sal_uInt16 i, nKeyCount; + BOOL bInList; // graphic filters for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ ) @@ -906,10 +906,10 @@ void TPGalleryThemeProperties::FillFilterList() } // media filters - static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); - ::avmedia::FilterNameVector aFilters; - const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); - ::rtl::OUString aAllTypes; + static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) ); + ::avmedia::FilterNameVector aFilters; + const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); + ::rtl::OUString aAllTypes; ::avmedia::MediaWindow::getMediaFilters( aFilters ); @@ -995,7 +995,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG ) void TPGalleryThemeProperties::SearchFiles() { - SearchProgress* pProgress = new SearchProgress( this, aURL ); + SearchProgress* pProgress = new SearchProgress( this, aURL ); for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) delete pStr; @@ -1038,7 +1038,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if ( xFolderPicker.is() ) { // svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES ); - String aDlgPathName( SvtPathOptions().GetGraphicPath() ); + String aDlgPathName( SvtPathOptions().GetGraphicPath() ); xFolderPicker->setDisplayDirectory(aDlgPathName); aPreviewTimer.Stop(); @@ -1148,7 +1148,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound ) { SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) ); -// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); +// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); aDlg.EnableLink(sal_False); aDlg.AsLink(sal_False); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index beb0774c7bd0..566ddd099992 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect ) { Control::Paint( rRect ); - const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); - const Size aOutSize( GetOutputSizePixel() ); - const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, + const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); + const Size aOutSize( GetOutputSizePixel() ); + const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, ( aOutSize.Height() - aGrfSize.Height() ) >> 1 ); if( maGraphic.IsAnimated() ) @@ -90,22 +90,22 @@ void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic ) // ----------------------- GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) : - ModalDialog ( pParent, rResId ), + ModalDialog ( pParent, rResId ), maModifyHdl ( LINK( this, GraphicFilterDialog, ImplModifyHdl ) ), mfScaleX ( 0.0 ), - mfScaleY ( 0.0 ), - maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), + mfScaleY ( 0.0 ), + maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), maPreview ( this, CUI_RES( CTL_PREVIEW ) ), - maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), - maBtnOK ( this, CUI_RES( BTN_OK ) ), - maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - maBtnHelp ( this, CUI_RES( BTN_HELP ) ) + maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), + maBtnOK ( this, CUI_RES( BTN_OK ) ), + maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + maBtnHelp ( this, CUI_RES( BTN_HELP ) ) { - const Size aPreviewSize( maPreview.GetOutputSizePixel() ); - Size aGrfSize( maSizePixel ); + const Size aPreviewSize( maPreview.GetOutputSizePixel() ); + Size aGrfSize( maSizePixel ); if( rGraphic.GetType() == GRAPHIC_BITMAP && - aPreviewSize.Width() && aPreviewSize.Height() && + aPreviewSize.Width() && aPreviewSize.Height() && aGrfSize.Width() && aGrfSize.Height() ) { const double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); @@ -175,11 +175,11 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG ) GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) : GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), - maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), - maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), - maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), + maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), + maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), + maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ), - maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) + maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) { FreeResource(); @@ -205,13 +205,13 @@ GraphicFilterMosaic::~GraphicFilterMosaic() // ----------------------------------------------------------------------------- -Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) { - Graphic aRet; - const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), + Graphic aRet; + const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), Max( FRound( GetTileHeight() * fScaleY ), 1L ) ); - BmpFilterParam aParam( aSize ); + BmpFilterParam aParam( aSize ); if( rGraphic.IsAnimated() ) { @@ -247,10 +247,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, BYTE cGreyThreshold, BOOL bInvert ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), - maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), - maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), - maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), + maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), + maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), + maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) { FreeResource(); @@ -271,11 +271,11 @@ GraphicFilterSolarize::~GraphicFilterSolarize() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - BmpFilterParam aParam( GetGreyThreshold() ); + Graphic aRet; + BmpFilterParam aParam( GetGreyThreshold() ); if( rGraphic.IsAnimated() ) { @@ -311,9 +311,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, USHORT nSepiaPercent ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), - maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), - maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), + maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), + maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) { FreeResource(); @@ -331,11 +331,11 @@ GraphicFilterSepia::~GraphicFilterSepia() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - BmpFilterParam aParam( GetSepiaPercent() ); + Graphic aRet; + BmpFilterParam aParam( GetSepiaPercent() ); if( rGraphic.IsAnimated() ) { @@ -361,9 +361,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, USHORT nPosterCount ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), - maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), - maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), + maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), + maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) { FreeResource(); @@ -382,11 +382,11 @@ GraphicFilterPoster::~GraphicFilterPoster() // ----------------------------------------------------------------------------- -Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - const USHORT nPosterCount = GetPosterColorCount(); + Graphic aRet; + const USHORT nPosterCount = GetPosterColorCount(); if( rGraphic.IsAnimated() ) { @@ -424,9 +424,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ) : - GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), - maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), - maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), + maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), + maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) { FreeResource(); @@ -442,24 +442,24 @@ GraphicFilterEmboss::~GraphicFilterEmboss() // ----------------------------------------------------------------------------- -Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { - Graphic aRet; - USHORT nAzim, nElev; + Graphic aRet; + USHORT nAzim, nElev; switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("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; - case( RP_LM ): nAzim = 0, nElev = 4500; break; - case( RP_MM ): nAzim = 0, nElev = 9000; break; - case( RP_RM ): nAzim = 18000, nElev = 4500; break; - case( RP_LB ): nAzim = 31500, nElev = 4500; break; - case( RP_MB ): nAzim = 27000, nElev = 4500; break; - case( RP_RB ): nAzim = 22500, nElev = 4500; break; + default: DBG_ERROR("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; + case( RP_LM ): nAzim = 0, nElev = 4500; break; + case( RP_MM ): nAzim = 0, nElev = 9000; break; + case( RP_RM ): nAzim = 18000, nElev = 4500; break; + case( RP_LB ): nAzim = 31500, nElev = 4500; break; + case( RP_MB ): nAzim = 27000, nElev = 4500; break; + case( RP_RB ): nAzim = 22500, nElev = 4500; break; } BmpFilterParam aParam( nAzim, nElev ); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index ba85929192f4..2359a4d2a2c4 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,9 +102,9 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState, |************************************************************************/ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) -: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), - maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), - mpBindings ( pBindings ), +: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), + maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), + mpBindings ( pBindings ), mbReadOnly ( sal_False ), mbIsHTMLDoc ( sal_False ) { @@ -138,7 +138,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // all tab pages set -> create mnemonics - // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages + // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages // create itemset for tabpages mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, @@ -201,7 +201,7 @@ void SvxHpLinkDlg::Move() { // Pos&Size of this dialog-window Point aDlgPos ( GetPosPixel () ); - Size aDlgSize ( GetSizePixel () ); + Size aDlgSize ( GetSizePixel () ); // Size of Office-Main-Window Size aWindowSize( SFX_APP()->GetTopWindow()->GetSizePixel() ); diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc index 5be30abc13a7..8635f1bafde3 100644 --- a/cui/source/dialogs/cuiimapdlg.hrc +++ b/cui/source/dialogs/cuiimapdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,17 +28,17 @@ // ImapDlg-Dialoge -#define FT_URLDESCRIPTION 1 -#define FT_URL1 2 -#define FT_TARGET 3 -#define FT_NAME 4 -#define FT_DESCRIPTION 5 -#define EDT_URLDESCRIPTION 1 -#define EDT_URL 2 -#define EDT_NAME 3 -#define EDT_DESCRIPTION 4 -#define BTN_HELP1 1 -#define BTN_OK1 2 +#define FT_URLDESCRIPTION 1 +#define FT_URL1 2 +#define FT_TARGET 3 +#define FT_NAME 4 +#define FT_DESCRIPTION 5 +#define EDT_URLDESCRIPTION 1 +#define EDT_URL 2 +#define EDT_NAME 3 +#define EDT_DESCRIPTION 4 +#define BTN_HELP1 1 +#define BTN_OK1 2 #define BTN_CANCEL1 3 #define FL_URL 1 -#define CBB_TARGETS 1 +#define CBB_TARGETS 1 diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index 9b60adf854ca..a7550bcf125e 100644 --- a/cui/source/dialogs/cuiimapdlg.src +++ b/cui/source/dialogs/cuiimapdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ ModalDialog RID_SVXDLG_IMAPURL DropDown = TRUE ; HScroll = TRUE ; }; - + FixedText FT_NAME { Pos = MAP_APPFONT ( 6 , 59 ) ; @@ -122,7 +122,7 @@ ModalDialog RID_SVXDLG_IMAPURL Pos = MAP_APPFONT ( 0 , 160 ) ; Size = MAP_APPFONT ( 214 , 4 ) ; }; - + // Buttons HelpButton BTN_HELP1 { diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 2da453213f5d..5ce727d08f36 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> -#include <sfx2/sfxsids.hrc> +#include <sfx2/sfxsids.hrc> #define _ANIMATION #include "macroass.hxx" #include <svtools/imaprect.hxx> @@ -60,7 +60,7 @@ /************************************************************************* |* -|* URLDlg +|* URLDlg |* \************************************************************************/ diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 4d0f2d91d12f..9e0b89ffc9e6 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index ac6cdd178eae..d1f43b143a6e 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ \************************************************************************/ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ), - aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), - aEdtName ( this, CUI_RES( EDT_STRING ) ), - aBtnOK ( this, CUI_RES( BTN_OK ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aBtnHelp ( this, CUI_RES( BTN_HELP ) ) + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aEdtName ( this, CUI_RES( EDT_STRING ) ), + aBtnOK ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aBtnHelp ( this, CUI_RES( BTN_HELP ) ) { FreeResource(); @@ -93,10 +93,10 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) // Dialog for editing Object Name // plus uniqueness-callback-linkHandler -SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, +SvxObjectNameDialog::SvxObjectNameDialog( + Window* pWindow, const String& rName) -: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), aFtName(this, CUI_RES(NTD_FT_NAME)), aEdtName(this, CUI_RES(NTD_EDT_NAME)), aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)), @@ -129,11 +129,11 @@ IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG) // #i68101# // Dialog for editing Object Title and Description -SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( - Window* pWindow, - const String& rTitle, +SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( + Window* pWindow, + const String& rTitle, const String& rDescription) -: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), aFtTitle(this, CUI_RES(NTD_FT_TITLE)), aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)), aFtDescription(this, CUI_RES(NTD_FT_DESC)), @@ -162,12 +162,12 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( \************************************************************************/ SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ), - aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), - aBtn1 ( this, CUI_RES( BTN_1 ) ), - aBtn2 ( this, CUI_RES( BTN_2 ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - aFtImage ( this ) + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aBtn1 ( this, CUI_RES( BTN_1 ) ), + aBtn2 ( this, CUI_RES( BTN_2 ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aFtImage ( this ) { FreeResource(); diff --git a/cui/source/dialogs/dlgname.hrc b/cui/source/dialogs/dlgname.hrc index 04e9377be619..be0f2ad84c6d 100644 --- a/cui/source/dialogs/dlgname.hrc +++ b/cui/source/dialogs/dlgname.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,13 +34,13 @@ #define BTN_2 2 // #i68101# -#define NTD_FT_NAME 2 -#define NTD_EDT_NAME 2 -#define NTD_FT_TITLE 3 -#define NTD_EDT_TITLE 3 -#define NTD_FT_DESC 4 -#define NTD_EDT_DESC 4 -#define FL_SEPARATOR_A 1 -#define FL_SEPARATOR_B 2 +#define NTD_FT_NAME 2 +#define NTD_EDT_NAME 2 +#define NTD_FT_TITLE 3 +#define NTD_EDT_TITLE 3 +#define NTD_FT_DESC 4 +#define NTD_EDT_DESC 4 +#define FL_SEPARATOR_A 1 +#define FL_SEPARATOR_B 2 // eof diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index e3e961880dfc..ee29629dc054 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME Size = MAP_APPFONT ( 168 , 12 ) ; TabStop = TRUE ; }; - + // divider FixedLine FL_SEPARATOR_A { diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc index cfad011101c2..16936f81f9f6 100644 --- a/cui/source/dialogs/fmsearch.hrc +++ b/cui/source/dialogs/fmsearch.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,58 +29,58 @@ #include "svl/solar.hrc" -#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10) -#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11) -#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7) +#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10) +#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11) +#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7) #define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85) #define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86) #define RID_STR_SEARCH_END (RID_FORMS_START + 87) #define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88) #define RID_STR_FROM_TOP (RID_FORMS_START + 74) #define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75) -#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8) -#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) +#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8) +#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) #define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34) #define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35) #define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76) -#define FT_SEARCHTEXT 1 -#define FT_FORM 2 -#define FT_POSITION 3 -#define FT_RECORDLABEL 4 -#define FT_RECORD 5 -#define FT_HINT 6 +#define FT_SEARCHTEXT 1 +#define FT_FORM 2 +#define FT_POSITION 3 +#define FT_RECORDLABEL 4 +#define FT_RECORD 5 +#define FT_HINT 6 -#define CMB_SEARCHTEXT 1 +#define CMB_SEARCHTEXT 1 -#define RB_ALLFIELDS 1 -#define RB_SINGLEFIELD 2 -#define RB_SEARCHFORTEXT 3 -#define RB_SEARCHFORNULL 4 -#define RB_SEARCHFORNOTNULL 5 +#define RB_ALLFIELDS 1 +#define RB_SINGLEFIELD 2 +#define RB_SEARCHFORTEXT 3 +#define RB_SEARCHFORNULL 4 +#define RB_SEARCHFORNOTNULL 5 -#define LB_FORM 1 -#define LB_FIELD 2 -#define LB_POSITION 3 +#define LB_FORM 1 +#define LB_FIELD 2 +#define LB_POSITION 3 -#define PB_APPROXSETTINGS 1 -#define PB_SEARCH 2 -#define PB_SOUNDSLIKESETTINGS 3 +#define PB_APPROXSETTINGS 1 +#define PB_SEARCH 2 +#define PB_SOUNDSLIKESETTINGS 3 #define FL_SEARCHFOR 1 #define FL_WHERE 2 #define FL_OPTIONS 3 #define FL_STATE 4 -#define CB_USEFORMATTER 1 -#define CB_BACKWARD 2 -#define CB_STARTOVER 3 -#define CB_CASE 4 -#define CB_WILDCARD 5 -#define CB_REGULAR 6 -#define CB_APPROX 7 -#define CB_HALFFULLFORMS 8 -#define CB_SOUNDSLIKECJK 9 +#define CB_USEFORMATTER 1 +#define CB_BACKWARD 2 +#define CB_STARTOVER 3 +#define CB_CASE 4 +#define CB_WILDCARD 5 +#define CB_REGULAR 6 +#define CB_APPROX 7 +#define CB_HALFFULLFORMS 8 +#define CB_SOUNDSLIKECJK 9 #endif // _FMSEARCH_HRC diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src index 186db5a48735..1b56c1634501 100644 --- a/cui/source/dialogs/fmsearch.src +++ b/cui/source/dialogs/fmsearch.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index db0d4bbf3973..0b7601d5343f 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/grfflt.hrc b/cui/source/dialogs/grfflt.hrc index 94d7f8fe392f..eaafe3818c70 100644 --- a/cui/source/dialogs/grfflt.hrc +++ b/cui/source/dialogs/grfflt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,49 +32,49 @@ // - Common - // ---------- -#define BTN_OK 101 -#define BTN_CANCEL 102 -#define BTN_HELP 103 -#define CTL_PREVIEW 105 -#define FL_PARAMETER 106 - -// -------------------- -// - DLG_FILTERMOSAIC - -// -------------------- - -#define DLG_FILTERMOSAIC_FT_WIDTH 1 -#define DLG_FILTERMOSAIC_MTR_WIDTH 2 -#define DLG_FILTERMOSAIC_FT_HEIGHT 3 -#define DLG_FILTERMOSAIC_MTR_HEIGHT 4 -#define DLG_FILTERMOSAIC_CBX_EDGES 5 +#define BTN_OK 101 +#define BTN_CANCEL 102 +#define BTN_HELP 103 +#define CTL_PREVIEW 105 +#define FL_PARAMETER 106 + +// -------------------- +// - DLG_FILTERMOSAIC - +// -------------------- + +#define DLG_FILTERMOSAIC_FT_WIDTH 1 +#define DLG_FILTERMOSAIC_MTR_WIDTH 2 +#define DLG_FILTERMOSAIC_FT_HEIGHT 3 +#define DLG_FILTERMOSAIC_MTR_HEIGHT 4 +#define DLG_FILTERMOSAIC_CBX_EDGES 5 -// ---------------------- -// - DLG_FILTERSOLARIZE - -// ---------------------- - -#define DLG_FILTERSOLARIZE_FT_THRESHOLD 1 -#define DLG_FILTERSOLARIZE_MTR_THRESHOLD 2 -#define DLG_FILTERSOLARIZE_CBX_INVERT 3 +// ---------------------- +// - DLG_FILTERSOLARIZE - +// ---------------------- + +#define DLG_FILTERSOLARIZE_FT_THRESHOLD 1 +#define DLG_FILTERSOLARIZE_MTR_THRESHOLD 2 +#define DLG_FILTERSOLARIZE_CBX_INVERT 3 // ------------------- -// - DLG_FILTERSEPIA - +// - DLG_FILTERSEPIA - // ------------------- - -#define DLG_FILTERSEPIA_FT_SEPIA 1 -#define DLG_FILTERSEPIA_MTR_SEPIA 2 + +#define DLG_FILTERSEPIA_FT_SEPIA 1 +#define DLG_FILTERSEPIA_MTR_SEPIA 2 // -------------------- -// - DLG_FILTERPOSTER - +// - DLG_FILTERPOSTER - // -------------------- - -#define DLG_FILTERPOSTER_FT_POSTER 1 -#define DLG_FILTERPOSTER_NUM_POSTER 2 + +#define DLG_FILTERPOSTER_FT_POSTER 1 +#define DLG_FILTERPOSTER_NUM_POSTER 2 // -------------------- -// - DLG_FILTEREMBOSS - +// - DLG_FILTEREMBOSS - // -------------------- - -#define DLG_FILTEREMBOSS_FT_LIGHT 1 -#define DLG_FILTEREMBOSS_CTL_LIGHT 2 + +#define DLG_FILTEREMBOSS_FT_LIGHT 1 +#define DLG_FILTEREMBOSS_CTL_LIGHT 2 #endif diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index fc1921b47cce..2c49939bcf41 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y0 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y0 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERMOSAIC_FT_WIDTH { Pos = MAP_APPFONT ( 12, MA_Y0 ) ; Size = MAP_APPFONT ( 77, 10 ) ; Text [ en-US ] = "~Width" ; }; -#define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_WIDTH { Border = TRUE ; @@ -81,14 +81,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Last = 999 ; SpinSize = 1 ; }; -#define MA_Y2 MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_Y2 MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText DLG_FILTERMOSAIC_FT_HEIGHT { Pos = MAP_APPFONT ( 12, MA_Y2 ) ; Size = MAP_APPFONT ( 77, 10 ) ; Text [ en-US ] = "H~eight" ; }; -#define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_HEIGHT { Border = TRUE ; @@ -106,12 +106,12 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Last = 999 ; SpinSize = 1 ; }; -#define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y +#define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y CheckBox DLG_FILTERMOSAIC_CBX_EDGES - { - Pos = MAP_APPFONT ( 12, MA_Y4 ) ; - Size = MAP_APPFONT ( 91, 12 ) ; - TabStop = TRUE ; + { + Pos = MAP_APPFONT ( 12, MA_Y4 ) ; + Size = MAP_APPFONT ( 91, 12 ) ; + TabStop = TRUE ; Text [ en-US ] = "E~nhance edges" ; }; OKButton BTN_OK @@ -160,35 +160,35 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y5 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y5 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERSOLARIZE_FT_THRESHOLD { Pos = MAP_APPFONT ( 12, MA_Y5 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Threshold ~value" ; }; -#define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y6 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Maximum = 100 ; - StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Maximum = 100 ; + StrictFormat = TRUE ; + Unit = FUNIT_CUSTOM ; CustomUnitText = "%" ; - Last = 100 ; - SpinSize = 1 ; + Last = 100 ; + SpinSize = 1 ; }; -#define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y CheckBox DLG_FILTERSOLARIZE_CBX_INVERT - { - Pos = MAP_APPFONT ( 12, 46 ) ; - Size = MAP_APPFONT ( 77, 12 ) ; - TabStop = TRUE ; + { + Pos = MAP_APPFONT ( 12, 46 ) ; + Size = MAP_APPFONT ( 77, 12 ) ; + TabStop = TRUE ; Text [ en-US ] = "~Invert" ; }; OKButton BTN_OK @@ -237,31 +237,31 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y8 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y8 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERSEPIA_FT_SEPIA { Pos = MAP_APPFONT ( 12 , MA_Y8 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Aging degree" ; }; -#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSEPIA_MTR_SEPIA { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y9 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Right = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 100 ; - StrictFormat = TRUE ; - Unit = FUNIT_CUSTOM ; + TabStop = TRUE ; + Right = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 1 ; + Maximum = 100 ; + StrictFormat = TRUE ; + Unit = FUNIT_CUSTOM ; CustomUnitText = "%" ; - First = 1 ; - Last = 100 ; - SpinSize = 1 ; + First = 1 ; + Last = 100 ; + SpinSize = 1 ; }; OKButton BTN_OK { @@ -295,7 +295,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER Moveable = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 250, 100 ) ; - + Text [ en-US ] = "Posterize" ; FixedLine FL_PARAMETER @@ -309,28 +309,28 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y10 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y10 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTERPOSTER_FT_POSTER { Pos = MAP_APPFONT ( 12 , MA_Y10 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Poster colors" ; }; -#define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y NumericField DLG_FILTERPOSTER_NUM_POSTER { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y11 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 2 ; - Maximum = 64 ; - StrictFormat = TRUE ; - First = 2 ; - Last = 64 ; - SpinSize = 1 ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 2 ; + Maximum = 64 ; + StrictFormat = TRUE ; + First = 2 ; + Last = 64 ; + SpinSize = 1 ; }; OKButton BTN_OK { @@ -359,8 +359,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB { - Pos = MAP_APPFONT ( 0, 0 ) ; - Size = MAP_APPFONT ( 0, 0 ) ; + Pos = MAP_APPFONT ( 0, 0 ) ; + Size = MAP_APPFONT ( 0, 0 ) ; }; ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS @@ -372,7 +372,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS Size = MAP_APPFONT ( 250, 100 ) ; Text [ en-US ] = "Relief" ; - + FixedLine FL_PARAMETER { Pos = MAP_APPFONT ( 6 , 3 ) ; @@ -384,21 +384,21 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 81, 73 ) ; }; -#define MA_Y12 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_Y12 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP FixedText DLG_FILTEREMBOSS_FT_LIGHT { Pos = MAP_APPFONT ( 12 , MA_Y12 ) ; Size = MAP_APPFONT ( 77 , 10 ) ; Text [ en-US ] = "Light source" ; }; -#define MA_Y13 MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +#define MA_Y13 MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y Control DLG_FILTEREMBOSS_CTL_LIGHT { HelpID = HID_GRFFILTER_EMBOSS_LIGHT ; - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y13 ) ; Size = MAP_APPFONT ( 77 , 60 ) ; - TabStop = TRUE ; + TabStop = TRUE ; }; OKButton BTN_OK { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index cb986f6dd1dd..2bd8dcd039be 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,9 +111,9 @@ namespace svx }; protected: - const String m_sPrimaryText; - const String m_sSecondaryText; - const RubyPosition m_ePosition; + const String m_sPrimaryText; + const String m_sSecondaryText; + const RubyPosition m_ePosition; public: PseudoRubyText( const String& _rPrimary, const String& _rSecondary, const RubyPosition _ePosition ); @@ -136,9 +136,9 @@ namespace svx void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle, Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData ) { - bool bLayoutOnly = NULL != _pLayoutData; - MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL; - String* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : NULL; + bool bLayoutOnly = NULL != _pLayoutData; + MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL; + String* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : NULL; Size aPlaygroundSize( _rRect.GetSize() ); @@ -225,7 +225,7 @@ namespace svx //========================================================================= //= RubyRadioButton //========================================================================= - class RubyRadioButton :public RadioButton + class RubyRadioButton :public RadioButton ,protected PseudoRubyText { using svx::PseudoRubyText::Paint; @@ -233,12 +233,12 @@ namespace svx public: RubyRadioButton( Window* _pParent, - const ResId& _rId, // the text in the resource will be taken as primary text - const String& _rSecondary, // this will be the secondary text which will be printed somewhat smaller + const ResId& _rId, // the text in the resource will be taken as primary text + const String& _rSecondary, // this will be the secondary text which will be printed somewhat smaller const PseudoRubyText::RubyPosition _ePosition ); protected: - virtual void Paint( const Rectangle& _rRect ); + virtual void Paint( const Rectangle& _rRect ); }; //------------------------------------------------------------------------- @@ -261,7 +261,7 @@ namespace svx aImageSize.Height() = CalcZoom( aImageSize.Height() ); Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() ); - aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text + aOverallRect.Left() += aImageSize.Width() + 4; // 4 is the separator between the image and the text // inflate the rect a little bit (because the VCL radio button does the same) Rectangle aTextRect( aOverallRect ); ++aTextRect.Left(); --aTextRect.Right(); @@ -524,16 +524,16 @@ namespace svx HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) ) ,m_pPlayground( new SvxCommonLinguisticControl( this ) ) - ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) ) - ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) ) - ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) ) + ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) ) + ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) ) + ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) ) ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) ) - ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) ) - ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) ) - ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) ) - ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) ) - ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) ) - ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) ) + ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) ) + ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) ) + ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) ) + ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) ) + ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) ) + ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) ) ,m_pIgnoreNonPrimary( NULL ) ,m_bDocumentMode( true ) { @@ -561,13 +561,13 @@ namespace svx Point aDistance = LogicToPixel( Point( 3, 0 ), MAP_APPFONT ); sal_Int32 nTooLargeByPixels = // right margin of the word input control - ( m_pPlayground->GetWordInputControl().GetPosPixel().X() - + m_pPlayground->GetWordInputControl().GetSizePixel().Width() + ( m_pPlayground->GetWordInputControl().GetPosPixel().X() + + m_pPlayground->GetWordInputControl().GetSizePixel().Width() ) // minus left margin of the find button - - m_aFind.GetPosPixel().X() + - m_aFind.GetPosPixel().X() // plus desired distance between the both - + aDistance.X(); + + aDistance.X(); // make the word input control smaller Size aSize = m_pPlayground->GetWordInputControl().GetSizePixel(); aSize.Width() -= nTooLargeByPixels; @@ -600,16 +600,16 @@ namespace svx m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, LINK( this, HangulHanjaConversionDialog, OnOption ) ); m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); -// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); +// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { -// m_aHanjaOnly.Enable( sal_False ); +// m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; } else { -// m_aHangulOnly.Enable( sal_False ); +// m_aHangulOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHanjaOnly; } // m_pIgnoreNonPrimary->Check(); @@ -779,7 +779,7 @@ namespace svx IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG ) { - HangulHanjaOptionsDialog aOptDlg( this ); + HangulHanjaOptionsDialog aOptDlg( this ); aOptDlg.Execute(); m_aOptionsChangedLink.Call(this); return 0L; @@ -815,7 +815,7 @@ namespace svx m_pPlayground->SetCurrentText( _rNewString ); bool bOldDocumentMode = m_bDocumentMode; - m_bDocumentMode = _bOriginatesFromDocument; // before FillSuggestions! + m_bDocumentMode = _bOriginatesFromDocument; // before FillSuggestions! FillSuggestions( _rSuggestions ); m_pPlayground->EnableButton( SvxCommonLinguisticControl::eIgnoreAll, m_bDocumentMode ); @@ -894,8 +894,8 @@ 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; +// 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(); } @@ -983,20 +983,20 @@ namespace svx if( m_xConversionDictionaryList.is() ) { - Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); - Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); + Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); + Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); + Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); - const ::rtl::OUString* pDic = aDictNames.getConstArray(); - sal_Int32 nCount = aDictNames.getLength(); + const ::rtl::OUString* pDic = aDictNames.getConstArray(); + sal_Int32 nCount = aDictNames.getLength(); - sal_Int32 i; + sal_Int32 i; for( i = 0 ; i < nCount ; ++i ) { - Any aAny( xNameAccess->getByName( pDic[ i ] ) ); - Reference< XConversionDictionary > xDic; + Any aAny( xNameAccess->getByName( pDic[ i ] ) ); + Reference< XConversionDictionary > xDic; if( ( aAny >>= xDic ) && xDic.is() ) { if( LANGUAGE_KOREAN == SvxLocaleToLanguage( xDic->getLocale() ) ) @@ -1012,23 +1012,23 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG ) { - sal_uInt32 nCnt = m_aDictList.size(); - sal_uInt32 n = 0; - sal_uInt32 nActiveDics = 0; - Sequence< OUString > aActiveDics; + sal_uInt32 nCnt = m_aDictList.size(); + sal_uInt32 n = 0; + sal_uInt32 nActiveDics = 0; + Sequence< OUString > aActiveDics; aActiveDics.realloc( nCnt ); - OUString* pActActiveDic = aActiveDics.getArray(); + OUString* pActActiveDic = aActiveDics.getArray(); while( nCnt ) { - Reference< XConversionDictionary > xDict = m_aDictList[ n ]; - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); + Reference< XConversionDictionary > xDict = m_aDictList[ n ]; + SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n ); DBG_ASSERT( xDict.is(), "-HangulHanjaOptionsDialog::OkHdl(): someone is evaporated..." ); DBG_ASSERT( pEntry, "-HangulHanjaOptionsDialog::OkHdl(): no one there in list?" ); - bool bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; + bool bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; xDict->setActive( bActive ); Reference< util::XFlushable > xFlush( xDict, uno::UNO_QUERY ); if( xFlush.is() ) @@ -1046,8 +1046,8 @@ namespace svx // save configuration aActiveDics.realloc( nActiveDics ); - Any aTmp; - SvtLinguConfig aLngCfg; + Any aTmp; + SvtLinguConfig aLngCfg; aTmp <<= aActiveDics; aLngCfg.SetProperty( UPH_ACTIVE_CONVERSION_DICTIONARIES, aTmp ); @@ -1066,7 +1066,7 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG ) { - bool bSel = m_aDictsLB.FirstSelected() != NULL; + bool bSel = m_aDictsLB.FirstSelected() != NULL; m_aEditPB.Enable( bSel ); m_aDeletePB.Enable( bSel ); @@ -1076,8 +1076,8 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG ) { - String aName; - HangulHanjaNewDictDialog aNewDlg( this ); + String aName; + HangulHanjaNewDictDialog aNewDlg( this ); aNewDlg.Execute(); if( aNewDlg.GetName( aName ) ) { @@ -1085,7 +1085,7 @@ namespace svx { try { - Reference< XConversionDictionary > xDic = + Reference< XConversionDictionary > xDic = m_xConversionDictionaryList->addNewDictionary( aName, SvxCreateLocale( LANGUAGE_KOREAN ), ConversionDictionaryType::HANGUL_HANJA ); if( xDic.is() ) @@ -1109,11 +1109,11 @@ namespace svx IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG ) { - SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); + SvLBoxEntry* pEntry = m_aDictsLB.FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); if( pEntry ) { - HangulHanjaEditDictDialog aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() ); + HangulHanjaEditDictDialog aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() ); aEdDlg.Execute(); } return 0L; @@ -1124,10 +1124,10 @@ namespace svx USHORT nSelPos = m_aDictsLB.GetSelectEntryPos(); if( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { - Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); + Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); if( m_xConversionDictionaryList.is() && xDic.is() ) { - Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); + Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); if( xNameCont.is() ) { try @@ -1153,27 +1153,27 @@ namespace svx } HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) - ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) ) - ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) ) - ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) - ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) ) - ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) ) - ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) ) - ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) ) - ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) ) - ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) ) - ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) ) - ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) ) - ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) ) - - ,m_pCheckButtonData ( NULL ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) + ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) ) + ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) ) + ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) + ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) ) + ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) ) + ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) ) + ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) ) + ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) ) + ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) ) + + ,m_pCheckButtonData ( NULL ) ,m_xConversionDictionaryList( NULL ) { m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); m_aDictsLB.SetSelectionMode( SINGLE_SELECTION ); m_aDictsLB.SetHighlightRange(); -// m_aDictsLB.SetHelpId( xxx ); +// m_aDictsLB.SetHelpId( xxx ); m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); @@ -1184,9 +1184,9 @@ namespace svx FreeResource(); - SvtLinguConfig aLngCfg; - Any aTmp; - bool bVal = bool(); + SvtLinguConfig aLngCfg; + Any aTmp; + bool bVal = bool(); aTmp = aLngCfg.GetProperty( UPH_IS_IGNORE_POST_POSITIONAL_WORD ); if( aTmp >>= bVal ) m_aIgnorepostCB.Check( bVal ); @@ -1204,8 +1204,8 @@ namespace svx HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog() { - SvLBoxEntry* pEntry = m_aDictsLB.First(); - String* pDel; + SvLBoxEntry* pEntry = m_aDictsLB.First(); + String* pDel; while( pEntry ) { pDel = ( String* ) pEntry->GetUserData(); @@ -1220,7 +1220,7 @@ namespace svx void HangulHanjaOptionsDialog::AddDict( const String& _rName, bool _bChecked ) { - SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); + SvLBoxEntry* pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName ); m_aDictsLB.SetCheckButtonState( pEntry, _bChecked? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED ); pEntry->SetUserData( new String( _rName ) ); } @@ -1232,12 +1232,12 @@ namespace svx IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG ) { - String aName( m_aDictNameED.GetText() ); + String aName( m_aDictNameED.GetText() ); aName.EraseTrailingChars(); m_bEntered = aName.Len() > 0; if( m_bEntered ) - m_aDictNameED.SetText( aName ); // do this in case of trailing chars have been deleted + m_aDictNameED.SetText( aName ); // do this in case of trailing chars have been deleted EndDialog( RET_OK ); return 0; @@ -1245,7 +1245,7 @@ namespace svx IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG ) { - String aName( m_aDictNameED.GetText() ); + String aName( m_aDictNameED.GetText() ); aName.EraseTrailingChars(); m_aOkBtn.Enable( aName.Len() > 0 ); @@ -1254,15 +1254,15 @@ namespace svx } HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) - ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) ) - ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) ) - ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) ) - ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) ) - ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) ) - ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) + ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) ) + ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) ) + ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) ) + ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) ) + ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) ) + ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) ) - ,m_bEntered ( false ) + ,m_bEntered ( false ) { m_aOkBtn.SetClickHdl( LINK( this, HangulHanjaNewDictDialog, OKHdl ) ); @@ -1295,25 +1295,25 @@ namespace svx { private: protected: - sal_uInt16 m_nSize; - String** m_ppElements; - sal_uInt16 m_nNumOfEntries; - sal_uInt16 m_nAct; + sal_uInt16 m_nSize; + String** m_ppElements; + sal_uInt16 m_nNumOfEntries; + sal_uInt16 m_nAct; - const String* _Next( void ); + const String* _Next( void ); public: SuggestionList( sal_uInt16 _nNumOfElements ); - virtual ~SuggestionList(); + virtual ~SuggestionList(); - bool Set( const String& _rElement, sal_uInt16 _nNumOfElement ); - bool Reset( sal_uInt16 _nNumOfElement ); - const String* Get( sal_uInt16 _nNumOfElement ) const; - void Clear( void ); + bool Set( const String& _rElement, sal_uInt16 _nNumOfElement ); + bool Reset( sal_uInt16 _nNumOfElement ); + const String* Get( sal_uInt16 _nNumOfElement ) const; + void Clear( void ); - const String* First( void ); - const String* Next( void ); + const String* First( void ); + const String* Next( void ); - inline sal_uInt16 GetCount( void ) const; + inline sal_uInt16 GetCount( void ) const; }; inline sal_uInt16 SuggestionList::GetCount( void ) const @@ -1331,8 +1331,8 @@ namespace svx m_ppElements = new String*[ m_nSize ]; m_nAct = m_nNumOfEntries = 0; - String** ppNull = m_ppElements; - sal_uInt16 n = _nNumOfElements; + String** ppNull = m_ppElements; + sal_uInt16 n = _nNumOfElements; while( n ) { *ppNull = NULL; @@ -1348,10 +1348,10 @@ namespace svx bool SuggestionList::Set( const String& _rElement, sal_uInt16 _nNumOfElement ) { - bool bRet = _nNumOfElement < m_nSize; + bool bRet = _nNumOfElement < m_nSize; if( bRet ) { - String** ppElem = m_ppElements + _nNumOfElement; + String** ppElem = m_ppElements + _nNumOfElement; if( *ppElem ) **ppElem = _rElement; else @@ -1366,10 +1366,10 @@ namespace svx bool SuggestionList::Reset( sal_uInt16 _nNumOfElement ) { - bool bRet = _nNumOfElement < m_nSize; + bool bRet = _nNumOfElement < m_nSize; if( bRet ) { - String** ppElem = m_ppElements + _nNumOfElement; + String** ppElem = m_ppElements + _nNumOfElement; if( *ppElem ) { delete *ppElem; @@ -1383,7 +1383,7 @@ namespace svx const String* SuggestionList::Get( sal_uInt16 _nNumOfElement ) const { - const String* pRet; + const String* pRet; if( _nNumOfElement < m_nSize ) pRet = m_ppElements[ _nNumOfElement ]; @@ -1397,8 +1397,8 @@ namespace svx { if( m_nNumOfEntries ) { - String** ppDel = m_ppElements; - sal_uInt16 nCnt = m_nSize; + String** ppDel = m_ppElements; + sal_uInt16 nCnt = m_nSize; while( nCnt ) { if( *ppDel ) @@ -1417,7 +1417,7 @@ namespace svx const String* SuggestionList::_Next( void ) { - const String* pRet = NULL; + const String* pRet = NULL; while( m_nAct < m_nSize && !pRet ) { pRet = m_ppElements[ m_nAct ]; @@ -1436,7 +1436,7 @@ namespace svx const String* SuggestionList::Next( void ) { - const String* pRet; + const String* pRet; if( m_nAct < m_nNumOfEntries ) { @@ -1452,7 +1452,7 @@ namespace svx bool SuggestionEdit::ShouldScroll( bool _bUp ) const { - bool bRet = false; + bool bRet = false; if( _bUp ) { @@ -1470,7 +1470,7 @@ namespace svx void SuggestionEdit::DoJump( bool _bUp ) { - const Link& rLoseFocusHdl = GetLoseFocusHdl(); + const Link& rLoseFocusHdl = GetLoseFocusHdl(); if( rLoseFocusHdl.IsSet() ) rLoseFocusHdl.Call( this ); m_rScrollBar.SetThumbPos( m_rScrollBar.GetThumbPos() + ( _bUp? -1 : 1 ) ); @@ -1493,16 +1493,16 @@ namespace svx long SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + long nHandled = 0; if( rNEvt.GetType() == EVENT_KEYINPUT ) { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode& rKeyCode = pKEvt->GetKeyCode(); - USHORT nMod = rKeyCode.GetModifier(); - USHORT nCode = rKeyCode.GetCode(); + const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); + const KeyCode& rKeyCode = pKEvt->GetKeyCode(); + USHORT nMod = rKeyCode.GetModifier(); + USHORT nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) ) { - bool bUp = KEY_SHIFT == nMod; + bool bUp = KEY_SHIFT == nMod; if( ShouldScroll( bUp ) ) { DoJump( bUp ); @@ -1513,7 +1513,7 @@ namespace svx } else if( KEY_UP == nCode || KEY_DOWN == nCode ) { - bool bUp = KEY_UP == nCode; + bool bUp = KEY_UP == nCode; if( ShouldScroll( bUp ) ) { DoJump( bUp ); @@ -1543,16 +1543,16 @@ namespace svx namespace { - bool GetConversions( Reference< XConversionDictionary > _xDict, + bool GetConversions( Reference< XConversionDictionary > _xDict, const OUString& _rOrg, Sequence< OUString >& _rEntries ) { - bool bRet = false; + bool bRet = false; if( _xDict.is() && _rOrg.getLength() ) { try { - _rEntries = _xDict->getConversions( _rOrg, + _rEntries = _xDict->getConversions( _rOrg, 0, _rOrg.getLength(), ConversionDirection_FROM_LEFT, @@ -1621,14 +1621,14 @@ namespace svx IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG ) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); - Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; + Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; if( xDict.is() && m_pSuggestions ) { //delete old entry bool bRemovedSomething = DeleteEntryFromDictionary( m_aOriginal, xDict ); - OUString aLeft( m_aOriginal ); - const String* pRight = m_pSuggestions->First(); + OUString aLeft( m_aOriginal ); + const String* pRight = m_pSuggestions->First(); bool bAddedSomething = false; while( pRight ) { @@ -1663,12 +1663,12 @@ namespace svx bool bRemovedSomething = false; if( xDict.is() ) { - OUString aOrg( m_aOriginal ); - Sequence< OUString > aEntries; + OUString aOrg( m_aOriginal ); + Sequence< OUString > aEntries; GetConversions( xDict, m_aOriginal, aEntries ); - sal_uInt32 n = aEntries.getLength(); - OUString* pEntry = aEntries.getArray(); + sal_uInt32 n = aEntries.getLength(); + OUString* pEntry = aEntries.getArray(); while( n ) { try @@ -1677,7 +1677,7 @@ namespace svx bRemovedSomething = true; } catch( const NoSuchElementException& ) - { // can not be... + { // can not be... } ++pEntry; @@ -1722,12 +1722,12 @@ namespace svx void HangulHanjaEditDictDialog::UpdateOriginalLB( void ) { m_aOriginalLB.Clear(); - Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; + Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; if( xDict.is() ) { - Sequence< OUString > aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT ); - sal_uInt32 n = aEntries.getLength(); - OUString* pEntry = aEntries.getArray(); + Sequence< OUString > aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT ); + sal_uInt32 n = aEntries.getLength(); + OUString* pEntry = aEntries.getArray(); while( n ) { m_aOriginalLB.InsertEntry( *pEntry ); @@ -1783,15 +1783,15 @@ namespace svx } m_aScrollSB.SetThumbPos( 0 ); - UpdateScrollbar(); // will force edits to be filled new + UpdateScrollbar(); // will force edits to be filled new } void HangulHanjaEditDictDialog::SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ) { - String aStr; + String aStr; if( m_pSuggestions ) { - const String* p = m_pSuggestions->Get( _nEntryNum ); + const String* p = m_pSuggestions->Get( _nEntryNum ); if( p ) aStr = *p; } @@ -1803,7 +1803,7 @@ namespace svx { m_bModifiedSuggestions = true; - String aTxt( _pEdit->GetText() ); + String aTxt( _pEdit->GetText() ); sal_uInt16 nEntryNum = m_nTopPos + _nEntryOffset; if( aTxt.Len() == 0 ) { @@ -1823,26 +1823,26 @@ namespace svx } HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) - :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) - ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) ) - ,m_rDictList ( _rDictList ) - ,m_nCurrentDict ( 0xFFFFFFFF ) - ,m_pSuggestions ( NULL ) - ,m_aBookFT ( this, CUI_RES( FT_BOOK ) ) - ,m_aBookLB ( this, CUI_RES( LB_BOOK ) ) - ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) ) - ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) ) - ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) ) - ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) - ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) - ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) - ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) - ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) ) - ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) ) - ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) ) - ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) ) - ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) ) - ,m_nTopPos ( 0 ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) + ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) ) + ,m_rDictList ( _rDictList ) + ,m_nCurrentDict ( 0xFFFFFFFF ) + ,m_pSuggestions ( NULL ) + ,m_aBookFT ( this, CUI_RES( FT_BOOK ) ) + ,m_aBookLB ( this, CUI_RES( LB_BOOK ) ) + ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) ) + ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) ) + ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) ) + ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) + ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) + ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) + ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) + ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) ) + ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) ) + ,m_nTopPos ( 0 ) ,m_bModifiedSuggestions ( false ) ,m_bModifiedOriginal ( false ) { @@ -1859,12 +1859,12 @@ namespace svx #error number of suggestions should not under-run the value of 5 #endif - Link aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); + Link aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) ); m_aScrollSB.SetScrollHdl( aScrLk ); m_aScrollSB.SetEndScrollHdl( aScrLk ); m_aScrollSB.SetRangeMin( 0 ); m_aScrollSB.SetRangeMax( MAXNUM_SUGGESTIONS ); - m_aScrollSB.SetPageSize( 4 ); // because we have 4 edits / page + m_aScrollSB.SetPageSize( 4 ); // because we have 4 edits / page m_aScrollSB.SetVisibleSize( 4 ); m_aEdit1.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl1 ) ); @@ -1873,10 +1873,10 @@ namespace svx m_aEdit4.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl4 ) ); m_aBookLB.SetSelectHdl( LINK( this, HangulHanjaEditDictDialog, BookLBSelectHdl ) ); - sal_uInt32 nDictCnt = m_rDictList.size(); + sal_uInt32 nDictCnt = m_rDictList.size(); for( sal_uInt32 n = 0 ; n < nDictCnt ; ++n ) { - Reference< XConversionDictionary > xDic( m_rDictList[n] ); + Reference< XConversionDictionary > xDic( m_rDictList[n] ); String aName; if(xDic.is()) aName = xDic->getName(); @@ -1897,7 +1897,7 @@ namespace svx void HangulHanjaEditDictDialog::UpdateScrollbar( void ) { - sal_uInt16 nPos = sal_uInt16( m_aScrollSB.GetThumbPos() ); + sal_uInt16 nPos = sal_uInt16( m_aScrollSB.GetThumbPos() ); m_nTopPos = nPos; SetEditText( m_aEdit1, nPos++ ); @@ -1907,7 +1907,7 @@ namespace svx } //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index 817e3a17264a..d8ad70b21af0 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,33 +32,33 @@ #endif // PushButton -#define PB_FIND 1 +#define PB_FIND 1 // Control -#define CTL_SUGGESTIONS 1 +#define CTL_SUGGESTIONS 1 // FixedText -#define FT_FORMAT 1 -#define FT_RESIZE_ANCHOR 2 -#define FT_CONVERSION 3 +#define FT_FORMAT 1 +#define FT_RESIZE_ANCHOR 2 +#define FT_CONVERSION 3 // RadioButton -#define RB_SIMPLE_CONVERSION 1 -#define RB_HANJA_HANGUL_BRACKETED 2 -#define RB_HANGUL_HANJA_BRACKETED 3 -#define RB_HANGUL_HANJA_ABOVE 4 -#define RB_HANGUL_HANJA_BELOW 5 -#define RB_HANJA_HANGUL_ABOVE 6 -#define RB_HANJA_HANGUL_BELOW 7 +#define RB_SIMPLE_CONVERSION 1 +#define RB_HANJA_HANGUL_BRACKETED 2 +#define RB_HANGUL_HANJA_BRACKETED 3 +#define RB_HANGUL_HANJA_ABOVE 4 +#define RB_HANGUL_HANJA_BELOW 5 +#define RB_HANJA_HANGUL_ABOVE 6 +#define RB_HANJA_HANGUL_BELOW 7 // CheckBox -#define CB_REPLACE_BY_CHARACTER 1 -#define CB_HANGUL_ONLY 2 -#define CB_HANJA_ONLY 3 +#define CB_REPLACE_BY_CHARACTER 1 +#define CB_HANGUL_ONLY 2 +#define CB_HANJA_ONLY 3 // String -#define STR_HANGUL 1 -#define STR_HANJA 2 +#define STR_HANGUL 1 +#define STR_HANJA 2 #define FT_WORD 10 #define FT_AKTWORD 11 @@ -78,120 +78,120 @@ // Hangul / Hanja Options Dialog -#define FT_USERDEFDICT 1 -#define FL_OPTIONS 2 +#define FT_USERDEFDICT 1 +#define FL_OPTIONS 2 #define BTN_OPTIONS 10 -#define LB_DICTS 1 +#define LB_DICTS 1 -#define CB_IGNOREPOST 1 -#define CB_SHOWRECENTLYFIRST 3 -#define CB_AUTOREPLACEUNIQUE 4 +#define CB_IGNOREPOST 1 +#define CB_SHOWRECENTLYFIRST 3 +#define CB_AUTOREPLACEUNIQUE 4 -#define PB_HHO_NEW 1 -#define PB_HHO_EDIT 2 -#define PB_HHO_DELETE 3 -#define PB_HHO_OK 4 -#define PB_HHO_CANCEL 5 -#define PB_HHO_HELP 6 +#define PB_HHO_NEW 1 +#define PB_HHO_EDIT 2 +#define PB_HHO_DELETE 3 +#define PB_HHO_OK 4 +#define PB_HHO_CANCEL 5 +#define PB_HHO_HELP 6 // metrics -#define HHO_DLGWIDTH 287 -#define HHx_DLGHIGHT 175 -#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT -#define HHO_COL_1a (HHO_COL_1+3) -#define HHO_COL_6 (HHO_DLGWIDTH-6) -#define HHO_COL_5 (HHO_COL_6-50) -#define HHO_COL_4 (HHO_COL_5-12) -#define HHO_COL_3 (HHO_COL_4-50) -#define HHO_COL_2 (HHO_COL_3-6) - -#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP -#define HHO_ROW_2 (HHO_ROW_1+8+2) -#define HHO_ROW_3 (HHO_ROW_2+14) -#define HHO_ROW_4 (HHO_ROW_3+2) -#define HHO_ROW_5 (HHO_ROW_4+14) -#define HHO_ROW_6 (HHO_ROW_5+2) -#define HHO_ROW_7 (HHO_ROW_6+14) -#define HHO_ROW_8 (HHO_ROW_7+4) -#define HHO_ROW_9 (HHO_ROW_8+8+4) -#define HHO_ROW_11 (HHO_ROW_9+8+4) -#define HHO_ROW_12 (HHO_ROW_11+8+4) - -#define HHO_ROW_a1 HHO_ROW_1 -#define HHO_ROW_a2 (HHO_ROW_a1+14) -#define HHO_ROW_a3 (HHO_ROW_a2+2) -#define HHO_ROW_a4 (HHO_ROW_a3+14) -#define HHO_ROW_a5 (HHO_ROW_a4+4) -#define HHO_ROW_a6 (HHO_ROW_a5+14) +#define HHO_DLGWIDTH 287 +#define HHx_DLGHIGHT 175 +#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT +#define HHO_COL_1a (HHO_COL_1+3) +#define HHO_COL_6 (HHO_DLGWIDTH-6) +#define HHO_COL_5 (HHO_COL_6-50) +#define HHO_COL_4 (HHO_COL_5-12) +#define HHO_COL_3 (HHO_COL_4-50) +#define HHO_COL_2 (HHO_COL_3-6) + +#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP +#define HHO_ROW_2 (HHO_ROW_1+8+2) +#define HHO_ROW_3 (HHO_ROW_2+14) +#define HHO_ROW_4 (HHO_ROW_3+2) +#define HHO_ROW_5 (HHO_ROW_4+14) +#define HHO_ROW_6 (HHO_ROW_5+2) +#define HHO_ROW_7 (HHO_ROW_6+14) +#define HHO_ROW_8 (HHO_ROW_7+4) +#define HHO_ROW_9 (HHO_ROW_8+8+4) +#define HHO_ROW_11 (HHO_ROW_9+8+4) +#define HHO_ROW_12 (HHO_ROW_11+8+4) + +#define HHO_ROW_a1 HHO_ROW_1 +#define HHO_ROW_a2 (HHO_ROW_a1+14) +#define HHO_ROW_a3 (HHO_ROW_a2+2) +#define HHO_ROW_a4 (HHO_ROW_a3+14) +#define HHO_ROW_a5 (HHO_ROW_a4+4) +#define HHO_ROW_a6 (HHO_ROW_a5+14) // Hangul / Hanja New Dictonary Dialog -#define FL_NEWDICT 1 +#define FL_NEWDICT 1 -#define FT_DICTNAME 1 +#define FT_DICTNAME 1 -#define ED_DICTNAME 1 +#define ED_DICTNAME 1 -#define PB_NEWDICT_OK 1 -#define PB_NEWDICT_ESC 2 -#define PB_NEWDICT_HLP 3 +#define PB_NEWDICT_OK 1 +#define PB_NEWDICT_ESC 2 +#define PB_NEWDICT_HLP 3 // Hangul Hanja Edit Custom Dictionary Dialog -#define MAXNUM_SUGGESTIONS 50 +#define MAXNUM_SUGGESTIONS 50 -#define STR_EDITHINT 1 +#define STR_EDITHINT 1 -#define FT_BOOK 1 -#define FT_ORIGINAL 2 -#define FT_SUGGESTIONS 3 +#define FT_BOOK 1 +#define FT_ORIGINAL 2 +#define FT_SUGGESTIONS 3 -#define LB_BOOK 1 -#define LB_ORIGINAL 2 +#define LB_BOOK 1 +#define LB_ORIGINAL 2 -#define PB_HHE_NEW 1 -#define PB_HHE_DELETE 2 -#define PB_HHE_HELP 3 -#define PB_HHE_CLOSE 4 +#define PB_HHE_NEW 1 +#define PB_HHE_DELETE 2 +#define PB_HHE_HELP 3 +#define PB_HHE_CLOSE 4 -#define SB_SCROLL 1 +#define SB_SCROLL 1 -#define ED_1 1 -#define ED_2 2 -#define ED_3 3 -#define ED_4 4 +#define ED_1 1 +#define ED_2 2 +#define ED_3 3 +#define ED_4 4 // metrics -#define RSC_CD_VSCRLWIDTH 8 // vertical scroll bar width -#define HHE_DLGWIDTH HHO_DLGWIDTH -#define HHE_COL_1 RSC_SP_DLG_INNERBORDER_LEFT -#define HHE_COL_6 (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define HHE_COL_5 (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH) -#define HHE_COL_4 (HHE_COL_5-6) -#define HHE_COL_3_2 (HHE_COL_4-RSC_CD_VSCRLWIDTH) -#define HHE_COL_3_1 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X) -#define HHE_COL_3_0 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH) -#define HHE_COL_2 (HHE_COL_1+50) -#define HHE_COL_3 (HHE_COL_2+1) - -#define HHE_ROW_1 RSC_SP_DLG_INNERBORDER_TOP -#define HHE_ROW_2 (HHE_ROW_1+2) -#define HHE_ROW_3 (HHE_ROW_2+12) -#define HHE_ROW_4 (HHE_ROW_3+12) -#define HHE_ROW_5 (HHE_ROW_4+8+2) -#define HHE_ROW_6 (HHE_ROW_5+12) -#define HHE_ROW_7 (HHE_ROW_6+2) -#define HHE_ROW_8 (HHE_ROW_7+2) -#define HHE_ROW_9 (HHE_ROW_6+12) -#define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y) -#define HHE_ROW_11 (HHE_ROW_10+8+2) -#define HHE_ROW_12 (HHE_ROW_11+4*12) -#define HHE_ROW_14 (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM) -#define HHE_ROW_13 (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT) -#define HHE_ROW_a1 (HHE_ROW_5) -#define HHE_ROW_a3 (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2) +#define RSC_CD_VSCRLWIDTH 8 // vertical scroll bar width +#define HHE_DLGWIDTH HHO_DLGWIDTH +#define HHE_COL_1 RSC_SP_DLG_INNERBORDER_LEFT +#define HHE_COL_6 (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) +#define HHE_COL_5 (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH) +#define HHE_COL_4 (HHE_COL_5-6) +#define HHE_COL_3_2 (HHE_COL_4-RSC_CD_VSCRLWIDTH) +#define HHE_COL_3_1 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X) +#define HHE_COL_3_0 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH) +#define HHE_COL_2 (HHE_COL_1+50) +#define HHE_COL_3 (HHE_COL_2+1) + +#define HHE_ROW_1 RSC_SP_DLG_INNERBORDER_TOP +#define HHE_ROW_2 (HHE_ROW_1+2) +#define HHE_ROW_3 (HHE_ROW_2+12) +#define HHE_ROW_4 (HHE_ROW_3+12) +#define HHE_ROW_5 (HHE_ROW_4+8+2) +#define HHE_ROW_6 (HHE_ROW_5+12) +#define HHE_ROW_7 (HHE_ROW_6+2) +#define HHE_ROW_8 (HHE_ROW_7+2) +#define HHE_ROW_9 (HHE_ROW_6+12) +#define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y) +#define HHE_ROW_11 (HHE_ROW_10+8+2) +#define HHE_ROW_12 (HHE_ROW_11+4*12) +#define HHE_ROW_14 (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM) +#define HHE_ROW_13 (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT) +#define HHE_ROW_a1 (HHE_ROW_5) +#define HHE_ROW_a3 (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2) #endif // SVX_HANGUL_HANJA_DLG_HRC diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 11e2fe415c38..46f52601f0e9 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT Text [ en-US ] = "Hangul/Hanja Options" ; Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_USERDEFDICT { Pos = MAP_APPFONT ( HHO_COL_1 , HHO_ROW_1 ) ; @@ -327,7 +327,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT Text [ en-US ] = "Edit Custom Dictionary" ; Moveable = TRUE ; Closeable = TRUE ; - + String STR_EDITHINT { Text [ en-US ] = "[Enter text here]"; @@ -395,7 +395,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT ScrollBar SB_SCROLL { Pos = MAP_APPFONT ( HHE_COL_3_2 , HHE_ROW_11 ) ; - Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ; // height = 48 + Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ; // height = 48 VScroll = TRUE ; Drag = TRUE ; }; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index db9ab3647e41..b47d675ff67b 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,15 +113,15 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri |************************************************************************/ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet) -: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), - maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ), - maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ), - maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ), - maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ), - maCbbPath ( this, INET_PROT_FILE ), - maBtCreate ( this, CUI_RES (BTN_CREATE) ), - maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ), - maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) +: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), + maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ), + maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ), + maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ), + maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ), + maCbbPath ( this, INET_PROT_FILE ), + maBtCreate ( this, CUI_RES (BTN_CREATE) ), + maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ), + 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 ); @@ -136,12 +136,12 @@ 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 ); +// maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); // set defaults maRbtEditNow.Check(); - maBtCreate.SetClickHdl ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) ); + maBtCreate.SetClickHdl ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) ); FillDocumentList (); } @@ -172,7 +172,7 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ ) #define INTERNETSHORTCUT_TARGET_TAG "Target" #define INTERNETSHORTCUT_FOLDER_TAG "Folder" #define INTERNETSHORTCUT_URL_TAG "URL" -#define INTERNETSHORTCUT_ICONID_TAG "IconIndex" +#define INTERNETSHORTCUT_ICONID_TAG "IconIndex" void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder ) { @@ -239,8 +239,8 @@ void SvxHyperlinkNewDocTp::FillDocumentList () // Insert into listbox if ( aDocumentUrl.getLength() ) { - if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) ) // SJ: #106216# do not start - aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress + if ( aDocumentUrl.equalsAscii( "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 const SfxFilter* pFilter = SfxFilter::GetDefaultFilterFromFactory( aDocumentUrl ); @@ -407,8 +407,8 @@ void SvxHyperlinkNewDocTp::DoApply () &aFrame, &aReferer, 0L ); // save new doc - const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); // SJ: pReturn is NULL if the Hyperlink - if ( pItem ) // creation is cancelled #106216# + const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn ); // SJ: pReturn is NULL if the Hyperlink + if ( pItem ) // creation is cancelled #106216# { pViewFrame = pItem->GetFrame(); if (pViewFrame) @@ -452,18 +452,18 @@ void SvxHyperlinkNewDocTp::DoApply () IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) { - rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); - uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - uno::Reference < XFolderPicker > xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY ); + rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) ); + uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); + uno::Reference < XFolderPicker > xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY ); - String aStrURL; - String aTempStrURL( maCbbPath.GetText() ); + String aStrURL; + String aTempStrURL( maCbbPath.GetText() ); utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); - String aStrPath = aStrURL; - BOOL bZeroPath = ( aStrPath.Len() == 0 ); - BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled - // as file name, otherwise we do not yet know + String aStrPath = aStrURL; + BOOL bZeroPath = ( aStrPath.Len() == 0 ); + BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + // as file name, otherwise we do not yet know if( bZeroPath ) aStrPath = SvtPathOptions().GetWorkPath(); @@ -476,15 +476,15 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) DisableClose( sal_False ); if( ExecutableDialogResults::OK == nResult ) { - sal_Char const sSlash[] = "/"; + sal_Char const sSlash[] = "/"; - INetURLObject aURL( aStrURL, INET_PROT_FILE ); - String aStrName; + INetURLObject aURL( aStrURL, INET_PROT_FILE ); + String aStrName; if( bHandleFileName ) aStrName = bZeroPath? aTempStrURL : String(aURL.getName()); maCbbPath.SetBaseURL( xFolderPicker->getDirectory() ); - String aStrTmp( xFolderPicker->getDirectory() ); + String aStrTmp( xFolderPicker->getDirectory() ); if( aStrTmp.GetChar( aStrTmp.Len() - 1 ) != sSlash[0] ) aStrTmp.AppendAscii( sSlash ); @@ -493,7 +493,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG ) if( bHandleFileName ) aStrTmp += aStrName; - INetURLObject aNewURL( aStrTmp ); + INetURLObject aNewURL( aStrTmp ); if( aStrName.Len() > 0 && aNewURL.getExtension().getLength() > 0 && maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 095e959cdca6..85298cac627b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ #include "hyperdlg.hrc" #include "hlmarkwn_def.hxx" -sal_Char __READONLY_DATA sHash[] = "#"; -sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; +sal_Char __READONLY_DATA sHash[] = "#"; +sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://"; // TODO news:// is nonsense sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; @@ -53,15 +53,15 @@ sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ), maGrpDocument ( this, CUI_RES (GRP_DOCUMENT) ), - maFtPath ( this, CUI_RES (FT_PATH_DOC) ), - maCbbPath ( this, INET_PROT_FILE ), - maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ), - maGrpTarget ( this, CUI_RES (GRP_TARGET) ), - maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ), - maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ), - maFtURL ( this, CUI_RES (FT_URL) ), - maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), - maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), + maFtPath ( this, CUI_RES (FT_PATH_DOC) ), + maCbbPath ( this, INET_PROT_FILE ), + maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ), + maGrpTarget ( this, CUI_RES (GRP_TARGET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ), + maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ), + maFtURL ( this, CUI_RES (FT_URL) ), + maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and disable display of bitmap names. diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index f0d3cf1878e8..0fb46b07dc01 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include "hyperdlg.hrc" #include "hlmarkwn_def.hxx" -#define STD_DOC_SUBPATH "internal" -#define STD_DOC_NAME "url_transfer.htm" +#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; @@ -57,18 +57,18 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ), rItemSet ) , maGrpLinkTyp ( this, CUI_RES (GRP_LINKTYPE) ), - maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ), - maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ), - maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), - maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), - maCbbTarget ( this, INET_PROT_HTTP ), - maFtLogin ( this, CUI_RES (FT_LOGIN) ), - maEdLogin ( this, CUI_RES (ED_LOGIN) ), - maFtPassword ( this, CUI_RES (FT_PASSWD) ), - maEdPassword ( this, CUI_RES (ED_PASSWD) ), - maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), - maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - maBtTarget ( this, CUI_RES (BTN_TARGET) ), + maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ), + maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ), + maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), + maCbbTarget ( this, INET_PROT_HTTP ), + maFtLogin ( this, CUI_RES (FT_LOGIN) ), + maEdLogin ( this, CUI_RES (ED_LOGIN) ), + maFtPassword ( this, CUI_RES (FT_PASSWD) ), + maEdPassword ( this, CUI_RES (ED_PASSWD) ), + maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), + maBtTarget ( this, CUI_RES (BTN_TARGET) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and display display of bitmap names. @@ -121,10 +121,10 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbAnonymous.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) ); maBtBrowse.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) ); maBtTarget.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickTargetHdl_Impl ) ); - maEdLogin.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) ); - maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); - maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); - maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); + maEdLogin.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) ); + maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); + maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); + maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) ); } SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp () diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index b7d26c2cb378..034e19e4a4b7 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ), rItemSet ), maGrpMailNews ( this, CUI_RES (GRP_MAILNEWS) ), - maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ), - maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ), - maFtReceiver ( this, CUI_RES (FT_RECEIVER) ), - maCbbReceiver ( this, INET_PROT_MAILTO ), + maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ), + maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ), + maFtReceiver ( this, CUI_RES (FT_RECEIVER) ), + maCbbReceiver ( this, INET_PROT_MAILTO ), maBtAdrBook ( this, CUI_RES (BTN_ADRESSBOOK) ), maFtSubject ( this, CUI_RES (FT_SUBJECT) ), maEdSubject ( this, CUI_RES (ED_SUBJECT) ) @@ -83,10 +83,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte maRbtMail.Check (); // overload handlers - maRbtMail.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); - maRbtNews.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); - maBtAdrBook.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); - maCbbReceiver.SetModifyHdl ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); + maRbtMail.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); + maRbtNews.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) ); + maBtAdrBook.SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); + maCbbReceiver.SetModifyHdl ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) maBtAdrBook.Hide(); @@ -311,7 +311,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG ) } -/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); +/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); if ( xProv.is() ) { !!! (pb) we need a new config item here diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 99b18e053783..30a6a9f959c0 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ using namespace ::rtl; struct TargetData { - OUString aUStrLinkname; - BOOL bIsTarget; + OUString aUStrLinkname; + BOOL bIsTarget; TargetData ( OUString aUStrLName, BOOL bTarget ) - : bIsTarget ( bTarget ) + : bIsTarget ( bTarget ) { if ( bIsTarget ) aUStrLinkname = aUStrLName; @@ -77,13 +77,13 @@ struct TargetData //######################################################################## //# # -//# Tree-Window # +//# Tree-Window # //# # //######################################################################## SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId ) -: SvTreeListBox ( pParent, rResId ), - mpParentWnd ( (SvxHlinkDlgMarkWnd*) pParent ) +: SvTreeListBox ( pParent, rResId ), + mpParentWnd ( (SvxHlinkDlgMarkWnd*) pParent ) { SetNodeDefaultImages(); } @@ -119,7 +119,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) //######################################################################## //# # -//# Window-Class # +//# Window-Class # //# # //######################################################################## @@ -130,20 +130,20 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) |************************************************************************/ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) -: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), +: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), maBtApply( this, CUI_RES (BT_APPLY) ), maBtClose( this, CUI_RES (BT_CLOSE) ), maLbTree ( this, CUI_RES (TLB_MARK) ), mbUserMoved ( FALSE ), - mbFirst ( TRUE ), - mpParent ( pParent ), - mnError ( LERR_NOERROR ) + mbFirst ( TRUE ), + mpParent ( pParent ), + mnError ( LERR_NOERROR ) { FreeResource(); - maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); - maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) ); - maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); + maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); + maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) ); + maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); // Tree-ListBox mit Linien versehen maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc index 1ac36dafa099..81222451262e 100644 --- a/cui/source/dialogs/hlmarkwn.hrc +++ b/cui/source/dialogs/hlmarkwn.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,10 +25,10 @@ * ************************************************************************/ -#define BT_APPLY 1 -#define BT_CLOSE 2 -#define TLB_MARK 3 +#define BT_APPLY 1 +#define BT_CLOSE 2 +#define TLB_MARK 3 -//#define HYPERLINK_BMP_EXPAND 301 -//#define HYPERLINK_BMP_COLLAPSE 302 +//#define HYPERLINK_BMP_EXPAND 301 +//#define HYPERLINK_BMP_COLLAPSE 302 diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src index 396e8cd573e0..5454312bf1b4 100644 --- a/cui/source/dialogs/hlmarkwn.src +++ b/cui/source/dialogs/hlmarkwn.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cc09d911be0c..bbe131c7c33f 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ using namespace ::ucbhelper; SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId, SfxDispatcher* pDispatch ) -: ComboBox (pParent, rResId) +: ComboBox (pParent, rResId) { TargetList* pList = new TargetList; SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0; @@ -88,9 +88,9 @@ SvxFramesComboBox::~SvxFramesComboBox () { } //######################################################################## -//# # -//# ComboBox-Control for URL's with History and Autocompletion # -//# # +//# # +//# ComboBox-Control for URL's with History and Autocompletion # +//# # //######################################################################## /************************************************************************* @@ -100,9 +100,9 @@ SvxFramesComboBox::~SvxFramesComboBox () |************************************************************************/ SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses ) -: SvtURLBox ( pParent, eSmart ), +: SvtURLBox ( pParent, eSmart ), DropTargetHelper ( this ), - mbAccessAddress (bAddresses) + mbAccessAddress (bAddresses) { } @@ -113,7 +113,7 @@ sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ ) sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); String aString; sal_Int8 nRet = DND_ACTION_NONE; @@ -158,19 +158,19 @@ long SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, const ResId &rResId, const SfxItemSet& rItemSet ) -: IconChoicePage ( pParent, rResId, rItemSet ), - mpGrpMore ( NULL ), - mpFtFrame ( NULL ), - mpCbbFrame ( NULL ), - mpFtForm ( NULL ), - mpLbForm ( NULL ), - mpFtIndication ( NULL ), - mpEdIndication ( NULL ), - mpFtText ( NULL ), - mpEdText ( NULL ), - mpBtScript ( NULL ), +: IconChoicePage ( pParent, rResId, rItemSet ), + mpGrpMore ( NULL ), + mpFtFrame ( NULL ), + mpCbbFrame ( NULL ), + mpFtForm ( NULL ), + mpLbForm ( NULL ), + mpFtIndication ( NULL ), + mpEdIndication ( NULL ), + mpFtText ( NULL ), + mpEdText ( NULL ), + mpBtScript ( NULL ), mbIsCloseDisabled ( sal_False ), - mpDialog ( pParent ), + mpDialog ( pParent ), mbStdControlsInit ( FALSE ), aEmptyStr() { @@ -192,7 +192,7 @@ SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase () delete mpFtIndication; delete mpEdIndication; delete mpFtText; - delete mpEdText ; + delete mpEdText ; delete mpBtScript; } @@ -218,16 +218,16 @@ void SvxHyperlinkTabPageBase::InitStdControls () { if ( !mbStdControlsInit ) { - mpGrpMore = new FixedLine ( this, ResId (GRP_MORE, *m_pResMgr) ); - mpFtFrame = new FixedText ( this, ResId (FT_FRAME, *m_pResMgr) ); + mpGrpMore = new FixedLine ( this, ResId (GRP_MORE, *m_pResMgr) ); + mpFtFrame = new FixedText ( this, ResId (FT_FRAME, *m_pResMgr) ); mpCbbFrame = new SvxFramesComboBox ( this, ResId (CB_FRAME, *m_pResMgr), GetDispatcher() ); - mpFtForm = new FixedText ( this, ResId (FT_FORM, *m_pResMgr) ); - mpLbForm = new ListBox ( this, ResId (LB_FORM, *m_pResMgr) ); - mpFtIndication= new FixedText ( this, ResId (FT_INDICATION, *m_pResMgr) ); - mpEdIndication= new Edit ( this, ResId (ED_INDICATION, *m_pResMgr) ); - mpFtText = new FixedText ( this, ResId (FT_TEXT, *m_pResMgr) ); - mpEdText = new Edit ( this, ResId (ED_TEXT, *m_pResMgr) ); - mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); + mpFtForm = new FixedText ( this, ResId (FT_FORM, *m_pResMgr) ); + mpLbForm = new ListBox ( this, ResId (LB_FORM, *m_pResMgr) ); + mpFtIndication= new FixedText ( this, ResId (FT_INDICATION, *m_pResMgr) ); + mpEdIndication= new Edit ( this, ResId (ED_INDICATION, *m_pResMgr) ); + mpFtText = new FixedText ( this, ResId (FT_TEXT, *m_pResMgr) ); + mpEdText = new Edit ( this, ResId (ED_TEXT, *m_pResMgr) ); + mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); @@ -246,7 +246,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg ) { - BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos ); + BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos ); if( bDisConnectDlg ) mpMarkWnd->ConnectToDialog( FALSE ); @@ -267,7 +267,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () // Size of dialog-window in screen pixels Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) ); Point aDlgPos ( aDlgRect.TopLeft() ); - Size aDlgSize ( mpDialog->GetSizePixel () ); + Size aDlgSize ( mpDialog->GetSizePixel () ); // Absolute size of the screen Rectangle aScreen( mpDialog->GetDesktopRectPixel() ); @@ -531,8 +531,8 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) { try { - Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - ::rtl::OUString aTitle; + 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; bRet = ( aTitle.getLength() > 0 ); @@ -599,10 +599,10 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ) { - aStrIntName = mpEdText->GetText(); - aStrName = mpEdIndication->GetText(); - aStrFrame = mpCbbFrame->GetText(); - eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); + aStrIntName = mpEdText->GetText(); + aStrName = mpEdIndication->GetText(); + aStrFrame = mpCbbFrame->GetText(); + eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); if( IsHTMLDoc() ) eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE ); } @@ -662,8 +662,8 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) { - String aStrUiURL; - INetURLObject aURLObj( aStrURL ); + String aStrUiURL; + INetURLObject aURLObj( aStrURL ); switch(aURLObj.GetProtocol()) { @@ -673,7 +673,7 @@ String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) case INET_PROT_FTP : { //remove password from name - INetURLObject aTmpURL(aURLObj); + INetURLObject aTmpURL(aURLObj); aTmpURL.SetPass(aEmptyStr); aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); } diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index 0228d65bf3d2..6d6c476dd0f2 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,74 +27,74 @@ /* Tabpage : Hyperlink - Internet */ -#define GRP_LINKTYPE 1 -#define RB_LINKTYP_INTERNET 2 -#define RB_LINKTYP_FTP 3 -#define RB_LINKTYP_TELNET 4 -#define FT_TARGET_HTML 5 -#define CB_TARGET_HTML 6 -#define FT_LOGIN 7 -#define ED_LOGIN 8 -#define FT_PASSWD 9 -#define ED_PASSWD 10 -#define CBX_ANONYMOUS 11 -#define BTN_BROWSE 12 -#define BTN_TARGET 13 -#define IMG_BROWSE_HC 14 -#define IMG_TARGET_HC 15 +#define GRP_LINKTYPE 1 +#define RB_LINKTYP_INTERNET 2 +#define RB_LINKTYP_FTP 3 +#define RB_LINKTYP_TELNET 4 +#define FT_TARGET_HTML 5 +#define CB_TARGET_HTML 6 +#define FT_LOGIN 7 +#define ED_LOGIN 8 +#define FT_PASSWD 9 +#define ED_PASSWD 10 +#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 */ -#define GRP_MAILNEWS 1 -#define RB_LINKTYP_MAIL 2 -#define RB_LINKTYP_NEWS 3 -#define FT_RECEIVER 4 -#define CB_RECEIVER 5 -#define FT_SUBJECT 6 -#define ED_SUBJECT 7 -#define BTN_ADRESSBOOK 8 -#define IMG_ADRESSBOOK_HC 9 +#define GRP_MAILNEWS 1 +#define RB_LINKTYP_MAIL 2 +#define RB_LINKTYP_NEWS 3 +#define FT_RECEIVER 4 +#define CB_RECEIVER 5 +#define FT_SUBJECT 6 +#define ED_SUBJECT 7 +#define BTN_ADRESSBOOK 8 +#define IMG_ADRESSBOOK_HC 9 /* Tabpage : Hyperlink - Document */ -#define GRP_DOCUMENT 1 -#define FT_PATH_DOC 2 -#define CB_PATH_DOC 3 -#define BTN_FILEOPEN 4 -#define GRP_TARGET 5 -#define FT_TARGET_DOC 6 -#define ED_TARGET_DOC 7 -#define FT_URL 8 -#define FT_FULL_URL 9 -#define IMG_FILEOPEN_HC 10 +#define GRP_DOCUMENT 1 +#define FT_PATH_DOC 2 +#define CB_PATH_DOC 3 +#define BTN_FILEOPEN 4 +#define GRP_TARGET 5 +#define FT_TARGET_DOC 6 +#define ED_TARGET_DOC 7 +#define FT_URL 8 +#define FT_FULL_URL 9 +#define IMG_FILEOPEN_HC 10 /* Tabpage : Hyperlink - New document */ -#define GRP_NEWDOCUMENT 1 -#define RB_EDITNOW 2 -#define RB_EDITLATER 3 -#define FT_PATH_NEWDOC 4 -#define ED_PATH_NEWDOC 5 -#define FT_DOCUMENT_TYPES 6 -#define LB_DOCUMENT_TYPES 7 -#define BTN_CREATE 8 -#define IMG_CREATE_HC 9 +#define GRP_NEWDOCUMENT 1 +#define RB_EDITNOW 2 +#define RB_EDITLATER 3 +#define FT_PATH_NEWDOC 4 +#define ED_PATH_NEWDOC 5 +#define FT_DOCUMENT_TYPES 6 +#define LB_DOCUMENT_TYPES 7 +#define BTN_CREATE 8 +#define IMG_CREATE_HC 9 /* Tabpage-section : Hyperlink - more justifications */ -#define GRP_MORE 30 -#define FT_FRAME 31 -#define CB_FRAME 32 -#define FT_FORM 33 -#define LB_FORM 34 -#define FT_INDICATION 35 -#define ED_INDICATION 36 -#define FT_TEXT 37 -#define ED_TEXT 38 -#define BTN_SCRIPT 39 -#define IMG_SCRIPT_HC 40 +#define GRP_MORE 30 +#define FT_FRAME 31 +#define CB_FRAME 32 +#define FT_FORM 33 +#define LB_FORM 34 +#define FT_INDICATION 35 +#define ED_INDICATION 36 +#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) +#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 4ed7d1419bba..614c3a41ba66 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "helpid.hrc" #include "hyperdlg.hrc" -#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; +#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; #define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2 /************************************************************************* diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 7f9bede9aedc..45c438ea2fd5 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: HyphenEdit_Impl( Window* pParent, const ResId& rResId ); protected: - virtual void KeyInput( const KeyEvent &rKEvt ); + virtual void KeyInput( const KeyEvent &rKEvt ); }; @@ -75,7 +75,7 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) : void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) { -// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); +// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch ( nCode ) @@ -94,7 +94,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); break; default: - Control::KeyInput( rKEvt ); // An den Dialog weiterleiten + Control::KeyInput( rKEvt ); // An den Dialog weiterleiten break; } } @@ -106,7 +106,7 @@ struct SvxHyphenWordDialog_Impl { SvxHyphenWordDialog * m_pDialog; // Window * m_pParent; - + FixedText aWordFT; HyphenEdit_Impl aWordEdit; ImageButton aLeftBtn; @@ -151,9 +151,9 @@ struct SvxHyphenWordDialog_Impl DECL_LINK( GetFocusHdl_Impl, Edit* ); - SvxHyphenWordDialog_Impl( + SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); @@ -161,9 +161,9 @@ struct SvxHyphenWordDialog_Impl }; -SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( +SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : @@ -197,7 +197,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( xHyphenator = xHyphen; pHyphWrapper = pWrapper; - uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? + uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" ); if (xHyphWord.is()) @@ -209,7 +209,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( InitControls_Impl(); aWordEdit.GrabFocus(); - + aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Left_Impl ) ); aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Right_Impl ) ); aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CutHdl_Impl ) ); @@ -219,11 +219,11 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CancelHdl_Impl ) ); aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog_Impl, GetFocusHdl_Impl ) ); } - + SvxHyphenWordDialog_Impl::~SvxHyphenWordDialog_Impl() { -} +} void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl() @@ -264,7 +264,7 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // returns a String showing only those hyphen positions which will result // in a line break if hyphenation is done there // 1) we will need to discard all hyphenation positions at th end that - // will not result in a line break where the text to the left still fits + // will not result in a line break where the text to the left still fits // on the line. // 2) since as from OOo 3.2 '-' are part of a word an thus text like // 'multi-line-editor' is regarded as single word we also need to discard those @@ -272,11 +272,11 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // the rightmost valid hyphenation position according to 1) // // Example: - // If the possible hyphenation position in 'multi-line-editor' are to eb marked + // If the possible hyphenation position in 'multi-line-editor' are to eb marked // by '=' then the text will look like this 'mul=ti-line-ed=it=or'. // If now the first line is only large enough for 'multi-line-edi' we need to discard - // the last possible hyphnation point because of 1). The the right most valid - // hyphenation position is "ed=itor". The first '-' left of this position is + // the last possible hyphnation point because of 1). The the right most valid + // hyphenation position is "ed=itor". The first '-' left of this position is // "line-ed", thus because of 2) we now need to discard all possible hyphneation // positions to the left of that as well. Thus in the end leaving us with just // 'multi-line-ed=itor' as return value for this function. (Just one valid hyphenation @@ -516,7 +516,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) ); uno::Any aAny; - + aAny <<= sal_True; xProp->setPropertyValue( aName, aAny ); @@ -531,10 +531,10 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* { (void) e; DBG_ASSERT( 0, "Hyphenate All failed" ); - } + } } return 0; -} +} IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG ) @@ -604,15 +604,15 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG ) return 0; } - + // class SvxHyphenWordDialog --------------------------------------------- -SvxHyphenWordDialog::SvxHyphenWordDialog( +SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : - + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ) { m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >( @@ -630,7 +630,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( SvxHyphenWordDialog::~SvxHyphenWordDialog() { -} +} void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc index f76e2aa75770..ba195caeb3ab 100755 --- a/cui/source/dialogs/hyphen.hrc +++ b/cui/source/dialogs/hyphen.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ // defines ------------------------------------------------------------------ -#define ED_WORD 10 -#define BTN_LEFT 11 -#define BTN_RIGHT 12 +#define ED_WORD 10 +#define BTN_LEFT 11 +#define BTN_RIGHT 12 #define FT_WORD 13 #define FL_BOTTOM 14 -#define BTN_HYPH_CONTINUE 20 -#define BTN_HYPH_DELETE 21 -#define BTN_HYPH_CUT 22 -#define BTN_HYPH_CANCEL 23 -#define BTN_HYPH_HELP 24 +#define BTN_HYPH_CONTINUE 20 +#define BTN_HYPH_DELETE 21 +#define BTN_HYPH_CUT 22 +#define BTN_HYPH_CANCEL 23 +#define BTN_HYPH_HELP 24 #define BTN_HYPH_ALL 25 #endif diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index f10e94626f31..f90048a61823 100755 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 140338916149..034ef6bc2183 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ int IconcDlgCmpUS_Impl( const void* p1, const void* p2 ) } // some stuff for easier changes for SvtViewOptions -static const sal_Char* pViewOptDataName = "dialog data"; -#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) +static const sal_Char* pViewOptDataName = "dialog data"; +#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { @@ -92,11 +92,11 @@ static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, const SfxItemSet &rAttrSet ) -: TabPage ( pParent, rResId ), - pSet ( &rAttrSet ), - bHasExchangeSupport ( FALSE ), - pDialog ( NULL ), - bStandard ( FALSE ) +: TabPage ( pParent, rResId ), + pSet ( &rAttrSet ), + bHasExchangeSupport ( FALSE ), + pDialog ( NULL ), + bStandard ( FALSE ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); } @@ -269,7 +269,7 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos, const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 ) -: ModalDialog ( pParent, rResId ), +: ModalDialog ( pParent, rResId ), meChoicePos ( ePos ), maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | @@ -277,9 +277,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, mnCurrentPageId ( USHRT_MAX ), aOKBtn ( this, WB_DEFBUTTON ), - aCancelBtn ( this, WB_DEFBUTTON ), - aHelpBtn ( this ), - aResetBtn ( this ), + aCancelBtn ( this, WB_DEFBUTTON ), + aHelpBtn ( this ), + aResetBtn ( this ), pSet ( pItemSet ), pOutSet ( NULL ), pExampleSet ( NULL ), @@ -287,9 +287,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, nResId ( rResId.GetId() ), bHideResetBtn ( FALSE ), - bModal ( FALSE ), - bInOK ( FALSE ), - bModified ( FALSE ), + bModal ( FALSE ), + bInOK ( FALSE ), + bModified ( FALSE ), bItemsReset ( FALSE ) { // IconChoiceCtrl-Settings @@ -311,7 +311,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, } // Buttons - aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); + aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); @@ -331,15 +331,15 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, const SfxItemSet * = 0, BOOL bEditFmt = 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 ) +: 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(); } @@ -382,7 +382,7 @@ IconChoiceDialog ::~IconChoiceDialog () } // remove Pagelist -/* for ( i=0; i<maPageList.Count(); i++ ) +/* for ( i=0; i<maPageList.Count(); i++ ) { IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); @@ -429,7 +429,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& pData->bOnDemand = bItemsOnDemand; USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); pEntry->SetUserData ( (void*) pId ); return pEntry; } @@ -450,7 +450,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& pData->bOnDemand = bItemsOnDemand; USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC ); + SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC ); pEntry->SetUserData ( (void*) pId ); return pEntry; } @@ -625,10 +625,10 @@ void IconChoiceDialog::ShowPage( USHORT nId ) | \**********************************************************************/ -#define ICONCTRL_WIDTH_PIXEL 110 -#define ICONCTRL_HEIGHT_PIXEL 75 -#define MINSIZE_BUTTON_WIDTH 70 -#define MINSIZE_BUTTON_HEIGHT 22 +#define ICONCTRL_WIDTH_PIXEL 110 +#define ICONCTRL_HEIGHT_PIXEL 75 +#define MINSIZE_BUTTON_WIDTH 70 +#define MINSIZE_BUTTON_HEIGHT 22 void IconChoiceDialog::Resize() { @@ -1145,7 +1145,7 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) // ----------------------------------------------------------------------- -// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. +// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId ) { IconChoicePageData * pData = GetPageData ( nId ); @@ -1361,7 +1361,7 @@ short IconChoiceDialog::Ok() if ( !pOutSet ) { if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( FALSE ); // ohne Items + pOutSet = pSet->Clone( FALSE ); // ohne Items else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } diff --git a/cui/source/dialogs/iconcdlg.src b/cui/source/dialogs/iconcdlg.src index c7d7d029b0df..6bcca8ba2f82 100644 --- a/cui/source/dialogs/iconcdlg.src +++ b/cui/source/dialogs/iconcdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 7ffcd1eefe98..cf5a0d59883f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 588b105d26d5..80e41147e022 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/insrc.hrc b/cui/source/dialogs/insrc.hrc index 2583ade5619f..0c780df36bd9 100644 --- a/cui/source/dialogs/insrc.hrc +++ b/cui/source/dialogs/insrc.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,17 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_COUNT 1 -#define ED_COUNT 2 +#define FT_COUNT 1 +#define ED_COUNT 2 #define FL_INS 3 -#define CB_POS_BEFORE 10 -#define CB_POS_AFTER 11 +#define CB_POS_BEFORE 10 +#define CB_POS_AFTER 11 #define FL_POS 12 -#define STR_ROW 20 -#define STR_COL 21 +#define STR_ROW 20 +#define STR_COL 21 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#define BT_OK 100 +#define BT_CANCEL 101 +#define BT_HELP 102 diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 69f934a29049..6139dcd37898 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 26f08b73e2f0..13230b7fd851 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> -#define MAX_FILENAME 18 -#define MAX_LINKNAME 18 -#define MAX_TYPENAME 15 -#define MAX_UPDATENAME 10 +#define MAX_FILENAME 18 +#define MAX_LINKNAME 18 +#define MAX_TYPENAME 15 +#define MAX_UPDATENAME 10 #define FILEOBJECT ( OBJECT_CLIENT_FILE & ~OBJECT_CLIENT_SO ) @@ -70,7 +70,7 @@ SV_DECL_IMPL_REF_LIST(SvBaseLink,SvBaseLink*) // Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert static long nTabs[] = - { 4, // Number of Tabs + { 4, // Number of Tabs 0, 77, 144, 209 }; @@ -143,9 +143,9 @@ SvBaseLinksDlg::~SvBaseLinksDlg() /************************************************************************* |* SvBaseLinksDlg::Handler() |* -|* Beschreibung -|* Ersterstellung MM 14.06.94 -|* Letzte Aenderung JP 30.05.95 +|* Beschreibung +|* Ersterstellung MM 14.06.94 +|* Letzte Aenderung JP 30.05.95 *************************************************************************/ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) { @@ -637,7 +637,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool INetURLObject aPath( sFileNm, INET_PROT_FILE ); String aFileName = aPath.getName(); aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS); - + if( aFileName.Len() > aTxt.Len() ) aTxt = aFileName; else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND ) diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 3470d22188c2..b08265991d99 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ffdc3834dc6c..b51f723279fa 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ using namespace ::com::sun::star::uno; struct MultiPath_Impl { - BOOL bEmptyAllowed; - BOOL bIsClassPathMode; + BOOL bEmptyAllowed; + BOOL bIsClassPathMode; bool bIsRadioButtonMode; MultiPath_Impl( BOOL bAllowed ) : @@ -198,11 +198,11 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) : aRadioLB ( this, CUI_RES( LB_RADIOBUTTON ) ), aRadioFT ( this, CUI_RES( FT_RADIOBUTTON ) ), aAddBtn ( this, CUI_RES( BTN_ADD_MULTIPATH ) ), - aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ), - aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ), - aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ), - pImpl ( new MultiPath_Impl( bEmptyAllowed ) ) + aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ), + aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ), + aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ), + pImpl ( new MultiPath_Impl( bEmptyAllowed ) ) { static long aStaticTabs[]= { 2, 0, 12 }; diff --git a/cui/source/dialogs/multipat.hrc b/cui/source/dialogs/multipat.hrc index 0bfda7212fb8..8d9a19fbee98 100644 --- a/cui/source/dialogs/multipat.hrc +++ b/cui/source/dialogs/multipat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index 987867492e13..45695d850b75 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index cdd36aeb1b1b..3e0c69e74265 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.hrc b/cui/source/dialogs/newtabledlg.hrc index 2357a4b1a280..b75c16a8611c 100644 --- a/cui/source/dialogs/newtabledlg.hrc +++ b/cui/source/dialogs/newtabledlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index 4bbbd564edd1..67e64254c7b2 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG Moveable = TRUE ; Size = MAP_APPFONT ( 181 , 6+15+15+15+14+6 ) ; Text [ en-US ] = "Insert Table" ; - + FixedText FT_COLUMNS { Pos = MAP_APPFONT ( 6 , 8 ) ; @@ -84,7 +84,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG Pos = MAP_APPFONT ( 6 , 6+15+15+15 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - }; + }; OKButton BTN_OK { Pos = MAP_APPFONT ( 69 , 6+15+15+15 ) ; diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f218fdd2557a..0878eb1a8430 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class PasswordReenterEdit_Impl : public Edit // disallow use of copy c-tor and assignment operator PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & ); PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & ); - + public: PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ); virtual ~PasswordReenterEdit_Impl(); @@ -65,14 +65,14 @@ public: virtual void Paint( const Rectangle& rRect ); }; - + PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { -// currently the spec does not want to display this text anymore... +// currently the spec does not want to display this text anymore... // m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } - + PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl() { @@ -101,7 +101,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) else Edit::Paint( rRect ); } - + ////////////////////////////////////////////////////////////////////// @@ -132,22 +132,22 @@ struct PasswordToOpenModifyDialog_Impl String m_aTwoMismatch; String m_aInvalidStateForOkButton; String m_aInvalidStateForOkButton_v2; - + bool m_bIsPasswordToModify; - + // DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( OkBtnClickHdl, OKButton * ); - PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, + PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); ~PasswordToOpenModifyDialog_Impl(); }; -PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( +PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, - sal_uInt16 nMinPasswdLen, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : m_pParent( pParent ), @@ -175,7 +175,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( 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 ); @@ -216,7 +216,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aMoreFewerOptionsBTN.Hide( TRUE ); } - + PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } @@ -241,7 +241,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* // m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); // m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); - + return 0; } #endif @@ -249,12 +249,12 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit* IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) { - bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && - m_aPasswdToOpenED.GetText().Len() == 0 && + bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && + m_aPasswdToOpenED.GetText().Len() == 0 && m_aPasswdToModifyED.GetText().Len() == 0; if (bInvalidState) { - ErrorBox aErrorBox( m_pParent, WB_OK, + ErrorBox aErrorBox( m_pParent, WB_OK, m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 ); aErrorBox.Execute(); } @@ -267,7 +267,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG { ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch ); aErrorBox.Execute(); - + Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED; PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED; String aEmpty; @@ -282,56 +282,56 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG m_aReenterPasswdToOpenED.SetText( aEmpty ); m_aPasswdToModifyED.SetText( aEmpty ); m_aReenterPasswdToModifyED.SetText( aEmpty ); - } + } rEdit.GrabFocus(); } else { m_pParent->EndDialog( RET_OK ); } - } - + } + return 0; } ////////////////////////////////////////////////////////////////////// -PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - Window * pParent, - sal_uInt16 nMinPasswdLen, +PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) { - m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( + m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) ); - + FreeResource(); -} +} PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() { -} +} String PasswordToOpenModifyDialog::GetPasswordToOpen() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); -} +} String PasswordToOpenModifyDialog::GetPasswordToModify() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); -} +} bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 522e4edf1da2..9ce3dab168e7 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index edb84813d387..355051cba753 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include <cuires.hrc> #include "passwdomdlg.hrc" @@ -47,7 +47,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Size = MAP_APPFONT( 165, 8 ); Text [ en-US ] = "File encryption password"; }; - + FixedText FT_PASSWD_TO_OPEN { Pos = MAP_APPFONT( 6, 17 ); @@ -103,7 +103,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Pos = MAP_APPFONT( 0, 117 ); Size = MAP_APPFONT( 171, 8 ); }; - + MoreButton BTN_MORE_FEWER_OPTIONS { HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE; @@ -193,7 +193,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "More ~Options" ; }; - + String STR_FEWER_OPTIONS { Text [ en-US ] = "Fewer ~Options" ; @@ -213,12 +213,12 @@ 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 90b3c1a8211e..517e778d1822 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter ); SotFormatStringId nFormat = (*aIter++).mnSotId; - String* pName = (String*) aSupplementTable.Get( nFormat ); + String* pName = (String*) aSupplementTable.Get( nFormat ); String aName; #ifdef WNT diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index de3a7ae9a09c..da079a8f95c5 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index ab4fdb0d3f1f..40ae4d89dbed 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <svx/svxids.hrc> // SID_ATTR_... +#include <svx/svxids.hrc> // SID_ATTR_... #include <svx/dialogs.hrc> // RID_SVXDLG_POSTIT #define _SVX_POSTDLG_CXX @@ -73,22 +73,22 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aPostItFL ( this, CUI_RES( FL_POSTIT ) ), aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ), - aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ), - aEditFT ( this, CUI_RES( FT_EDIT ) ), - aEditED ( this, CUI_RES( ED_EDIT ) ), + aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ), + aEditFT ( this, CUI_RES( FT_EDIT ) ), + aEditED ( this, CUI_RES( ED_EDIT ) ), aAuthorFT ( this, CUI_RES( FT_AUTHOR) ), aAuthorBtn ( this, CUI_RES( BTN_AUTHOR ) ), aOKBtn ( this, CUI_RES( BTN_POST_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ), + aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ), aHelpBtn ( this, CUI_RES( BTN_POST_HELP ) ), aPrevBtn ( this, CUI_RES( BTN_PREV ) ), - aNextBtn ( this, CUI_RES( BTN_NEXT ) ), + aNextBtn ( this, CUI_RES( BTN_NEXT ) ), - rSet ( rCoreSet ), - pOutSet ( 0 ) + rSet ( rCoreSet ), + pOutSet ( 0 ) { - if (bRedline) // HelpIDs fuer Redlining + if (bRedline) // HelpIDs fuer Redlining { SetHelpId(HID_REDLINING_DLG); aEditED.SetHelpId(HID_REDLINING_EDIT); @@ -106,7 +106,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aEditED.SetFont( aFont ); BOOL bNew = TRUE; - USHORT nWhich = 0; + USHORT nWhich = 0; if ( !bPrevNext ) { diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc index c0df97b971e2..c0272127de3c 100644 --- a/cui/source/dialogs/postdlg.hrc +++ b/cui/source/dialogs/postdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,22 +29,22 @@ // defines ------------------------------------------------------------------ -#define FT_LASTEDITLABEL 10 -#define FT_LASTEDIT 11 +#define FT_LASTEDITLABEL 10 +#define FT_LASTEDIT 11 #define FT_EDIT 12 -#define ED_EDIT 13 +#define ED_EDIT 13 #define FL_POSTIT 14 -#define BTN_PREV 15 -#define BTN_NEXT 16 -#define BTN_AUTHOR 17 +#define BTN_PREV 15 +#define BTN_NEXT 16 +#define BTN_AUTHOR 17 #define FT_AUTHOR 18 -#define STR_NOTIZ_EDIT 20 -#define STR_NOTIZ_INSERT 21 +#define STR_NOTIZ_EDIT 20 +#define STR_NOTIZ_INSERT 21 -#define BTN_POST_OK 30 -#define BTN_POST_CANCEL 31 -#define BTN_POST_HELP 32 +#define BTN_POST_OK 30 +#define BTN_POST_CANCEL 31 +#define BTN_POST_HELP 32 #endif diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 904319d45355..c05b45134204 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9d44e12f55f1..c9996a44c0fe 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -2,7 +2,7 @@ /********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,12 +99,12 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) : { FreeResource(); SetSelectionMode( SINGLE_SELECTION ); - + SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | WB_HASLINES | WB_HASLINESATROOT ); SetNodeDefaultImages(); - + nMode = 0xFF; // Alles } @@ -124,8 +124,8 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry ) { delete pUserData; // TBD seem to get a Select event on node that is remove ( below ) - // so need to be able to detect that this node is not to be - // processed in order to do this, setting userData to NULL ( must + // so need to be able to detect that this node is not to be + // processed in order to do this, setting userData to NULL ( must // be a better way to do this ) pUserData = 0; pEntry->SetUserData( pUserData ); @@ -142,7 +142,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry ) { SvLBoxEntry* pNextEntry = NextSibling( pEntry ); deleteTree( pEntry ); - GetModel()->Remove( pEntry ); + GetModel()->Remove( pEntry ); pEntry = pNextEntry; } } @@ -162,7 +162,7 @@ void SFTreeListBox::deleteAllTree() GetModel()->Remove( pEntry ); pEntry = pNextEntry; } - } + } } void SFTreeListBox::Init( const ::rtl::OUString& language ) @@ -176,8 +176,8 @@ 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::OUString::createFromAscii("user"); + ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); ::rtl::OUString singleton = ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" ); @@ -197,7 +197,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) ); if ( rootNode.is() && rootNode->hasChildNodes() == sal_True ) - { + { children = rootNode->getChildNodes(); } } @@ -207,7 +207,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); // TODO exception handling - } + } Reference<XModel> xDocumentModel; for ( sal_Int32 n = 0; n < children.getLength(); n++ ) @@ -244,7 +244,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Sequence<beans::PropertyValue> moduleDescr; try{ ::rtl::OUString appModule = xModuleManager->identify( xDocumentModel ); - xModuleConfig->getByName(appModule) >>= moduleDescr; + xModuleConfig->getByName(appModule) >>= moduleDescr; } catch(const uno::Exception&) {} @@ -264,18 +264,18 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) } ::rtl::OUString lang( language ); - Reference< browse::XBrowseNode > langEntries = + 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 ); + 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); } SetUpdateMode( TRUE ); } -Reference< XInterface > +Reference< XInterface > SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) { Reference< XInterface > xModel; @@ -307,7 +307,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU return xModel; } -Reference< browse::XBrowseNode > +Reference< browse::XBrowseNode > SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNode, ::rtl::OUString& language ) { Reference< browse::XBrowseNode > langNode; @@ -321,8 +321,8 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo { langNode = children[ n ]; break; - } - } + } + } } catch ( Exception& ) { @@ -349,20 +349,20 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co { // if we catch an exception in getChildNodes then no entries are added } - + for ( sal_Int32 n = 0; n < children.getLength(); n++ ) { ::rtl::OUString name( children[ n ]->getName() ); if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT) { - insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ))); + insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ))); } else { if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT ) { - insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model ))); - + insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model ))); + } } } @@ -421,7 +421,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry( { aImage = m_hdImage; aHCImage = m_hdImage_hc; - } + } else if( nBitmap == IMG_LIB ) { aImage = m_libImage; @@ -460,7 +460,7 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) { node = userData->GetNode(); model = userData->GetModel(); - RequestSubEntries( pEntry, node, model ); + RequestSubEntries( pEntry, node, model ); userData->setLoaded(); } } @@ -565,7 +565,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ), m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ), m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ), - m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) + m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) { // must be a neater way to deal with the strings than as above @@ -604,22 +604,22 @@ short SvxScriptOrgDialog::Execute() SfxObjectShell *pDoc = SfxObjectShell::GetFirst(); - // force load of MSPs for all documents - while ( pDoc ) + // force load of MSPs for all documents + while ( pDoc ) { - Reference< provider::XScriptProviderSupplier > xSPS = + Reference< provider::XScriptProviderSupplier > xSPS = Reference< provider::XScriptProviderSupplier > ( pDoc->GetModel(), UNO_QUERY ); if ( xSPS.is() ) { - Reference< provider::XScriptProvider > ScriptProvider = + Reference< provider::XScriptProvider > ScriptProvider = xSPS->getScriptProvider(); } - + pDoc = SfxObjectShell::GetNext(*pDoc); } aScriptsBox.ExpandAllTrees(); - + Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); @@ -637,20 +637,20 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { if ( node->getType() == browse::BrowseNodeTypes::SCRIPT) { - aRunButton.Enable(); + aRunButton.Enable(); } else { - aRunButton.Disable(); + aRunButton.Disable(); } Reference< beans::XPropertySet > xProps( node, UNO_QUERY ); - + if ( !xProps.is() ) { aEditButton.Disable(); aDelButton.Disable(); aCreateButton.Disable(); - aRunButton.Disable(); + aRunButton.Disable(); return; } @@ -698,14 +698,14 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { aRenameButton.Disable(); } - } + } else { // no node info available, disable all configurable actions aDelButton.Disable(); aCreateButton.Disable(); aEditButton.Disable(); - aRunButton.Disable(); + aRunButton.Disable(); aRenameButton.Disable(); } } @@ -739,7 +739,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) node = userData->GetNode(); CheckButtons( node ); } - + return 0; } @@ -750,7 +750,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) StoreCurrentSelection(); EndDialog( 0 ); } - if ( pButton == &aEditButton || + if ( pButton == &aEditButton || pButton == &aCreateButton || pButton == &aDelButton || pButton == &aRunButton || @@ -778,7 +778,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) { return 0; } - + if ( pButton == &aRunButton ) { ::rtl::OUString tmpString; @@ -887,7 +887,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) renameEntry( pEntry ); } } - } + } } return 0; } @@ -897,7 +897,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry* Reference< browse::XBrowseNode > node; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = (SFEntry*)pEntry->GetUserData(); if ( userData ) { node = userData->GetNode(); @@ -912,7 +912,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) Reference< XModel > model; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = (SFEntry*)pEntry->GetUserData(); if ( userData ) { model = userData->GetModel(); @@ -922,7 +922,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -Reference< XInterface > +Reference< XInterface > SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) { Reference< XInterface > xModel; @@ -960,13 +960,13 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) Reference< browse::XBrowseNode > aChildNode; Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); Reference< script::XInvocation > xInv( node, UNO_QUERY ); - + if ( xInv.is() ) { ::rtl::OUString aNewName; ::rtl::OUString aNewStdName; USHORT nMode = INPUTMODE_NEWLIB; - if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) + if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) { aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ; } @@ -979,7 +979,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) //String aNewStdName( ResId( STR_STDMODULENAME ) ); BOOL bValid = FALSE; USHORT i = 1; - + Sequence< Reference< browse::XBrowseNode > > childNodes; // no children => ok to create Parcel1 or Script1 without checking try @@ -1087,20 +1087,20 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } + } if ( aChildNode.is() ) { String aChildName = aChildNode->getName(); SvLBoxEntry* pNewEntry = NULL; - + ::rtl::OUString name( aChildName ); Reference<XModel> xDocumentModel = getModel( pEntry ); // ISSUE do we need to remove all entries for parent // to achieve sort? Just need to determine position // SvTreeListBox::InsertEntry can take position arg - // -- Basic doesn't do this on create. + // -- Basic doesn't do this on create. // Suppose we could avoid this too. -> created nodes are // not in alphabetical order if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT ) @@ -1210,7 +1210,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } + } if ( aChildNode.is() ) { aScriptsBox.SetEntryText( pEntry, aChildNode->getName() ); @@ -1259,12 +1259,12 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry ) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } - } - + } + if ( result == sal_True ) { aScriptsBox.deleteTree( pEntry ); - aScriptsBox.GetModel()->Remove( pEntry ); + aScriptsBox.GetModel()->Remove( pEntry ); } else { @@ -1372,11 +1372,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection() aScriptsBox.SetCurEntry( pEntry ); } -BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, +BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, Reference< browse::XBrowseNode > node2 ) { - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); + ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); + ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); if( node1->getName().equals( userStr ) ) return true; if( node2->getName().equals( userStr ) ) @@ -1388,7 +1388,7 @@ BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, return dialogSort2( node1, node2 ); } -BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, +BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, Reference< browse::XBrowseNode > node2 ) { return ( node1->getName().compareTo( node2->getName() ) < 0 ); @@ -1400,7 +1400,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, const ::rtl::OUString& value ) { sal_Int32 pos = source.indexOf( token ); - + if ( pos != -1 && value.getLength() != 0 ) { return source.replaceAt( pos, token.getLength(), value ); @@ -1455,7 +1455,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString language = unknown; ::rtl::OUString script = unknown; - ::rtl::OUString line = unknown; + ::rtl::OUString line = unknown; ::rtl::OUString type = ::rtl::OUString(); ::rtl::OUString message = eScriptError.Message; @@ -1501,7 +1501,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString line = unknown; ::rtl::OUString type = unknown; ::rtl::OUString message = eScriptException.Message; - + if ( eScriptException.language.getLength() != 0 ) { language = eScriptException.language; @@ -1543,10 +1543,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) ); - ::rtl::OUString language = + ::rtl::OUString language = ::rtl::OUString::createFromAscii( "UNKNOWN" ); - ::rtl::OUString script = + ::rtl::OUString script = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString message; @@ -1565,10 +1565,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); message = ReplaceString( message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language ); - + } else - { + { message = sError.Message; } return FormatErrorString( @@ -1596,7 +1596,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) { ::rtl::OUString exType; - if ( aException.getValueType() == + if ( aException.getValueType() == ::getCppuType( (const reflection::InvocationTargetException* ) NULL ) ) { reflection::InvocationTargetException ite; @@ -1615,12 +1615,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ite.TargetException >>= scriptException; return GetErrorMessage( scriptException ); } - else + else { // Unknown error, shouldn't happen // OSL_ASSERT(...) } - + } else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) ) { @@ -1628,7 +1628,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, provider::ScriptFrameworkErrorException sfe; aException >>= sfe; return GetErrorMessage( sfe ); - + } // unknown exception Exception e; @@ -1638,9 +1638,9 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, return GetErrorMessage( rte ); } - aException >>= e; + aException >>= e; return GetErrorMessage( e ); - + } SvxScriptErrorDialog::SvxScriptErrorDialog( diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc index 95ba3ddf38c2..3fb0118b04f9 100644 --- a/cui/source/dialogs/scriptdlg.hrc +++ b/cui/source/dialogs/scriptdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,18 +29,18 @@ #include <svl/solar.hrc> -#define SCRIPTDLG_OFFSET 400 +#define SCRIPTDLG_OFFSET 400 // ScriptOrgDialog -#define SF_TXT_SCRIPTS 1 -#define SF_CTRL_SCRIPTSBOX 2 -#define SF_PB_RUN 3 -#define SF_PB_CLOSE 4 -#define SF_PB_CREATE 5 -#define SF_PB_EDIT 6 -#define SF_PB_RENAME 7 -#define SF_PB_DEL 8 -#define SF_PB_HELP 9 +#define SF_TXT_SCRIPTS 1 +#define SF_CTRL_SCRIPTSBOX 2 +#define SF_PB_RUN 3 +#define SF_PB_CLOSE 4 +#define SF_PB_CREATE 5 +#define SF_PB_EDIT 6 +#define SF_PB_RENAME 7 +#define SF_PB_DEL 8 +#define SF_PB_HELP 9 #define IMG_HARDDISK 1 #define IMG_HARDDISK_HC 2 @@ -51,7 +51,7 @@ #define IMG_DOCUMENT 7 #define IMG_DOCUMENT_HC 8 -#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) +#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) #define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13) // NewObjectDialog @@ -67,9 +67,9 @@ #define STR_RENAME 19 // Others -/* +/* Please be aware that these strings are global resources, don't use self-defined values! -You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers +You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers some of its own resource files to svx - where they are added to svx resource file!! */ @@ -77,4 +77,4 @@ some of its own resource files to svx - where they are added to svx resource fil #define STR_PRODMACROS 33 -#endif // _SCRIPTDLG_HRC +#endif // _SCRIPTDLG_HRC diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 67a81376d662..292c862fe924 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 9686e04b57aa..01ea9b9aebe2 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) : SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr ) -, mrOutAttrs ( *pAttr ) +, mrOutAttrs ( *pAttr ) , mpColorTab ( pModel->GetColorTable() ) , mpGradientList ( pModel->GetGradientList() ) , mpHatchingList ( pModel->GetHatchList() ) @@ -54,7 +54,7 @@ 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() ) @@ -80,11 +80,11 @@ void SvxFormatCellsDialog::PageCreated( USHORT 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 ).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 ); diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index c3ece3326544..cef68d3acf5b 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 4ed267d614d4..aaee4e77cb4d 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #define CUIFM_PROP_LABEL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) ) //========================================================================== -// FmShowColsDialog +// FmShowColsDialog //========================================================================== DBG_NAME(FmShowColsDialog) //-------------------------------------------------------------------------- diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index 465591e8f0a0..f4d124d1795b 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index b2574fdb1e37..39fda7fcf393 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long String sTmp(maHorzBox.GetText()); maHorzBox.SetText(maVertBox.GetText()); maHorzBox.SetModeRadioImage(maVertBox.GetModeRadioImage()); - maVertBox.SetText(sTmp); - maVertBox.SetModeRadioImage(aTmpImg); + maVertBox.SetText(sTmp); + maVertBox.SetModeRadioImage(aTmpImg); } } diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc index 143f4685abe4..1cf6e5b449bd 100644 --- a/cui/source/dialogs/splitcelldlg.hrc +++ b/cui/source/dialogs/splitcelldlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FT_COUNT 1 -#define ED_COUNT 2 +#define FT_COUNT 1 +#define ED_COUNT 2 #define FL_COUNT 3 -#define RB_HORZ 10 +#define RB_HORZ 10 #define CB_PROP 11 #define RB_VERT 12 #define FL_DIR 12 @@ -36,7 +36,7 @@ #define BMP_SPLIT_VERT 13 #define BMP_SPLIT_HORZ 14 -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 +#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 5326ca2d0e4d..ea5cbc7d108b 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ ModalDialog RID_SVX_SPLITCELLDLG Size = MAP_APPFONT ( 169 , 108 ) ; Text [ en-US ] = "Split Cells" ; Moveable = TRUE ; - + OKButton BT_OK { Pos = MAP_APPFONT ( 115 , 6 ) ; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 85a4b8a9a02c..a37865dbaed5 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) { case RID_SVXPAGE_CHAR_NAME: { - const FontList* pAppFontList = 0; + const FontList* pAppFontList = 0; SfxObjectShell* pSh = SfxObjectShell::Current(); if ( pSh ) @@ -144,7 +144,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, aAttrFL ( this, CUI_RES( FL_ATTR ) ), aAttrLB ( this, CUI_RES( LB_ATTR ) ), aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ), rList( rLst ) @@ -183,7 +183,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, } // item resources are in svx - sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); + sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); SvLBoxEntry* pEntry = NULL; if ( RESARRAY_INDEX_NOTFOUND != nId ) pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); @@ -268,16 +268,16 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ), aOtherTxt ( this, CUI_RES( FT_OTHER ) ), - aOtherFld ( this, CUI_RES( NF_OTHER ) ), + aOtherFld ( this, CUI_RES( NF_OTHER ) ), aLongerTxt ( this, CUI_RES( FT_LONGER ) ), aLongerFld ( this, CUI_RES( NF_LONGER ) ), aShorterTxt ( this, CUI_RES( FT_SHORTER ) ), - aShorterFld ( this, CUI_RES( NF_SHORTER ) ), + aShorterFld ( this, CUI_RES( NF_SHORTER ) ), aRelaxBox ( this, CUI_RES( CB_RELAX ) ), - aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), - aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) ) + aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) ) { FreeResource(); diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc index 5df6d9bd4767..939b1a96554a 100644 --- a/cui/source/dialogs/srchxtra.hrc +++ b/cui/source/dialogs/srchxtra.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src index 04265a6d6726..d18c3c4cf2cf 100644 --- a/cui/source/dialogs/srchxtra.src +++ b/cui/source/dialogs/srchxtra.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc index 8add126a33c7..38b89df77fec 100644 --- a/cui/source/dialogs/svuidlg.hrc +++ b/cui/source/dialogs/svuidlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,104 +31,104 @@ #define TB_LINKS 32014 // gemeinsame Id's -#define CB_DISPLAY_AS_ICON 12 -#define FI_DISPLAY 13 +#define CB_DISPLAY_AS_ICON 12 +#define FI_DISPLAY 13 #define PB_CHANGE_ICON 14 -#define STR_AUTOLINK 32006 -#define STR_MANUALLINK 32007 -#define STR_BROKENLINK 32008 -#define STR_GRAPHICLINK 32009 -#define STR_BUTTONCLOSE 32010 -#define STR_CLOSELINKMSG 32011 -#define STR_CLOSELINKMSG_MULTI 32024 -#define STR_WAITINGLINK 32028 -#define STR_EDIT_APPLET 32029 +#define STR_AUTOLINK 32006 +#define STR_MANUALLINK 32007 +#define STR_BROKENLINK 32008 +#define STR_GRAPHICLINK 32009 +#define STR_BUTTONCLOSE 32010 +#define STR_CLOSELINKMSG 32011 +#define STR_CLOSELINKMSG_MULTI 32024 +#define STR_WAITINGLINK 32028 +#define STR_EDIT_APPLET 32029 -#define FL_CHOICE 15 -#define LB_INSERT_LIST 7 +#define FL_CHOICE 15 +#define LB_INSERT_LIST 7 -#define MD_PASTE_OBJECT 32001 -#define S_OBJECT 1 -#define RB_PASTE 20 -#define RB_PASTE_LINK 21 -#define FT_OBJECT_SOURCE 22 -#define FT_SOURCE 23 +#define MD_PASTE_OBJECT 32001 +#define S_OBJECT 1 +#define RB_PASTE 20 +#define RB_PASTE_LINK 21 +#define FT_OBJECT_SOURCE 22 +#define FT_SOURCE 23 #define MD_UPDATE_BASELINKS 32002 -#define LB_LINKS 30 -#define FT_FILES 31 -#define FT_LINKS 32 -#define FT_TYPE 33 -#define FT_STATUS 34 -#define PB_UPDATE_NOW 35 -#define PB_OPEN_SOURCE 36 -#define PB_CHANGE_SOURCE 37 -#define PB_BREAK_LINK 38 -#define FT_SOURCE2 39 -#define FT_TYPE2 40 -#define FT_UPDATE 41 -#define RB_AUTOMATIC 42 -#define RB_MANUAL 43 +#define LB_LINKS 30 +#define FT_FILES 31 +#define FT_LINKS 32 +#define FT_TYPE 33 +#define FT_STATUS 34 +#define PB_UPDATE_NOW 35 +#define PB_OPEN_SOURCE 36 +#define PB_CHANGE_SOURCE 37 +#define PB_BREAK_LINK 38 +#define FT_SOURCE2 39 +#define FT_TYPE2 40 +#define FT_UPDATE 41 +#define RB_AUTOMATIC 42 +#define RB_MANUAL 43 #define FT_FULL_SOURCE_NAME 44 -#define FT_FULL_TYPE_NAME 45 -#define GB_LINK 46 -#define FT_FILES2 47 -#define FT_FULL_FILE_NAME 48 +#define FT_FULL_TYPE_NAME 45 +#define GB_LINK 46 +#define FT_FILES2 47 +#define FT_FULL_FILE_NAME 48 -#define MD_LINKEDIT 32004 +#define MD_LINKEDIT 32004 #define ED_FULL_SOURCE_NAME 1 -#define ED_FILEPATH 10 -#define BTN_FILEPATH 11 -#define CB_FILELINK 12 +#define ED_FILEPATH 10 +#define BTN_FILEPATH 11 +#define CB_FILELINK 12 -#define MD_INSERT_OBJECT_PLUGIN 32008 -#define ED_FILEURL 10 -#define BTN_FILEURL 11 -#define GB_FILEURL 12 -#define ED_PLUGINS_OPTIONS 20 -#define GB_PLUGINS_OPTIONS 21 +#define MD_INSERT_OBJECT_PLUGIN 32008 +#define ED_FILEURL 10 +#define BTN_FILEURL 11 +#define GB_FILEURL 12 +#define ED_PLUGINS_OPTIONS 20 +#define GB_PLUGINS_OPTIONS 21 -#define MD_INSERT_OBJECT_APPLET 32009 -#define FT_CLASSFILE 10 -#define ED_CLASSFILE 11 -#define FT_CLASSLOCATION 12 -#define ED_CLASSLOCATION 12 -#define BTN_CLASS 13 -#define GB_CLASS 14 -#define ED_APPLET_OPTIONS 20 -#define GB_APPLET_OPTIONS 21 +#define MD_INSERT_OBJECT_APPLET 32009 +#define FT_CLASSFILE 10 +#define ED_CLASSFILE 11 +#define FT_CLASSLOCATION 12 +#define ED_CLASSLOCATION 12 +#define BTN_CLASS 13 +#define GB_CLASS 14 +#define ED_APPLET_OPTIONS 20 +#define GB_APPLET_OPTIONS 21 -#define MD_INSERT_OLEOBJECT 32010 -#define RB_NEW_OBJECT 10 -#define RB_OBJECT_FROMFILE 11 -#define LB_OBJECTTYPE 12 -#define GB_OBJECT 13 -#define STR_FILE 14 +#define MD_INSERT_OLEOBJECT 32010 +#define RB_NEW_OBJECT 10 +#define RB_OBJECT_FROMFILE 11 +#define LB_OBJECTTYPE 12 +#define GB_OBJECT 13 +#define STR_FILE 14 #define MD_INSERT_OBJECT_IFRAME 32011 -#define FT_FRAMENAME 3 -#define ED_FRAMENAME 4 -#define FT_URL 5 -#define ED_URL 6 -#define BT_FILEOPEN 7 -#define NM_MARGINHEIGHT 8 -#define FT_MARGINHEIGHT 9 -#define NM_MARGINWIDTH 10 -#define FT_MARGINWIDTH 11 -#define GB_MARGIN 12 -#define RB_SCROLLINGON 13 -#define RB_SCROLLINGOFF 14 -#define RB_SCROLLINGAUTO 15 -#define GB_SCROLLING 16 -#define GB_BORDER 17 -#define RB_FRMBORDER_ON 18 -#define RB_FRMBORDER_INHERIT 19 -#define RB_FRMBORDER_OFF 20 -#define CB_MARGINWIDTHDEFAULT 21 -#define CB_MARGINHEIGHTDEFAULT 22 +#define FT_FRAMENAME 3 +#define ED_FRAMENAME 4 +#define FT_URL 5 +#define ED_URL 6 +#define BT_FILEOPEN 7 +#define NM_MARGINHEIGHT 8 +#define FT_MARGINHEIGHT 9 +#define NM_MARGINWIDTH 10 +#define FT_MARGINWIDTH 11 +#define GB_MARGIN 12 +#define RB_SCROLLINGON 13 +#define RB_SCROLLINGOFF 14 +#define RB_SCROLLINGAUTO 15 +#define GB_SCROLLING 16 +#define GB_BORDER 17 +#define RB_FRMBORDER_ON 18 +#define RB_FRMBORDER_INHERIT 19 +#define RB_FRMBORDER_OFF 20 +#define CB_MARGINWIDTHDEFAULT 21 +#define CB_MARGINHEIGHTDEFAULT 22 #define FL_SEP_LEFT 46 #define FL_SEP_RIGHT 47 diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 74a8eae82274..5cb13c897b1e 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ ModalDialog MD_PASTE_OBJECT OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; - Size = MAP_APPFONT ( 282 , 135 ) ; // 12 under listbox + Size = MAP_APPFONT ( 282 , 135 ) ; // 12 under listbox Text [ en-US ] = "Paste Special" ; FixedText FT_SOURCE { diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src index 9e9d2fb6eb03..a5f43aae673c 100644 --- a/cui/source/dialogs/tbxform.src +++ b/cui/source/dialogs/tbxform.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index d62d0d98d63e..70063438d3a6 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,23 +105,23 @@ static void GetReplaceEditString( String &rText ) } // class LookUpComboBox_Impl -------------------------------------------------- - -LookUpComboBox_Impl::LookUpComboBox_Impl( + +LookUpComboBox_Impl::LookUpComboBox_Impl( Window *pParent, const ResId &rResId, SvxThesaurusDialog_Impl &rImpl ) : ComboBox (pParent, rResId), m_rDialogImpl( rImpl ) { m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) ); m_aModifyTimer.SetTimeout( 500 ); - + EnableAutocomplete( FALSE ); } - + LookUpComboBox_Impl::~LookUpComboBox_Impl() { } - + void LookUpComboBox_Impl::Modify() { @@ -138,18 +138,18 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) // class ReplaceEdit_Impl -------------------------------------------------- - -ReplaceEdit_Impl::ReplaceEdit_Impl( + +ReplaceEdit_Impl::ReplaceEdit_Impl( Window *pParent, const ResId &rResId ) : Edit (pParent, rResId) { } - + ReplaceEdit_Impl::~ReplaceEdit_Impl() { } - + void ReplaceEdit_Impl::Modify() { @@ -163,17 +163,17 @@ 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( +AlternativesString_Impl::AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : // @@ -182,8 +182,8 @@ AlternativesString_Impl::AlternativesString_Impl( { } -void AlternativesString_Impl::Paint( - const Point& rPos, +void AlternativesString_Impl::Paint( + const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) { @@ -204,9 +204,9 @@ void AlternativesString_Impl::Paint( } -ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( +ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( Window* pParent, - SvxThesaurusDialog_Impl &rImpl ) : + SvxThesaurusDialog_Impl &rImpl ) : SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ), m_rDialogImpl( rImpl ) { @@ -228,8 +228,8 @@ void ThesaurusAlternativesCtrl_Impl::ClearExtraData() } -void ThesaurusAlternativesCtrl_Impl::SetExtraData( - const SvLBoxEntry *pEntry, +void ThesaurusAlternativesCtrl_Impl::SetExtraData( + const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ) { if (!pEntry) @@ -243,7 +243,7 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData( } -AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( +AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( const SvLBoxEntry *pEntry ) { AlternativesExtraData *pRes = NULL; @@ -263,14 +263,14 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St aText = String::CreateFromInt32( nVal ); aText += A2S( ". " ); } - pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column + pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) ); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); - + if (bIsHeader) GetViewDataEntry( pEntry )->SetSelectable( false ); @@ -288,7 +288,7 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) m_rDialogImpl.AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry else if (GetEntryCount()) SvxCheckListBox::KeyInput( rKEvt ); -} +} void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) @@ -296,11 +296,11 @@ 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; @@ -308,13 +308,13 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/; aPos = PixelToLogic( aPos ); DrawText( aPos, m_rDialogImpl.aErrStr ); - + // Pop(); } else SvxCheckListBox::Paint( rRect ); } - + // struct SvxThesaurusDialog_Impl ---------------------------------------- @@ -342,7 +342,7 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) m_bWordFound( false ) { // note: FreeResource must only be called in the c-tor of SvxThesaurusDialog - + aReplaceEdit.SetButton( &aReplaceBtn ); aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog_Impl, LeftBtnHdl_Impl ) ); @@ -398,7 +398,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray(); m_pAlternativesCT->SetUpdateMode( FALSE ); - + // clear old user data of control before creating new ones via AddEntry below m_pAlternativesCT->ClearExtraData(); @@ -411,7 +411,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() const OUString *pSynonyms = aSynonyms.getConstArray(); DBG_ASSERT( rMeaningTxt.getLength() > 0, "meaning with empty text" ); DBG_ASSERT( nSynonyms > 0, "meaning without synonym" ); - + m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true ); for (sal_Int32 k = 0; k < nSynonyms; ++k) m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false ); @@ -420,7 +420,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() m_pAlternativesCT->SetUpdateMode( TRUE ); return nMeanings > 0; -} +} void SvxThesaurusDialog_Impl::LookUp( const String &rText ) @@ -428,7 +428,7 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText ) if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same aWordCB.SetText( rText ); LookUp_Impl(); -} +} IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) @@ -468,7 +468,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() String aText( aWordCB.GetText() ); aLookUpText = OUString( aText ); - if (aLookUpText.getLength() > 0 && + if (aLookUpText.getLength() > 0 && (aLookUpHistory.size() == 0 || aLookUpText != aLookUpHistory.top())) aLookUpHistory.push( aLookUpText ); @@ -507,7 +507,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox String aStr; if (pData && !pData->IsHeader()) { - aStr = pData->GetText(); + aStr = pData->GetText(); GetReplaceEditString( aStr ); } aReplaceEdit.SetText( aStr ); @@ -525,16 +525,16 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis String aStr; if (pData && !pData->IsHeader()) { - aStr = pData->GetText(); + aStr = pData->GetText(); GetReplaceEditString( aStr ); } - + aWordCB.SetText( aStr ); if (aStr.Len() > 0) LookUp_Impl(); } - //! workaround to set the selection since calling SelectEntryPos within + //! workaround to set the selection since calling SelectEntryPos within //! the double click handler does not work Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, SelectFirstHdl_Impl ), pBox ); return 0; @@ -554,10 +554,10 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); - + Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic, NULL, NULL ) ) @@ -579,7 +579,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW ); - + DBG_ASSERT( xLngMgr.is(), "LinguServiceManager missing" ); if (xLngMgr.is()) { @@ -589,22 +589,22 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" ); if (aServiceNames.getLength() == 1) aRes = aServiceNames[0]; - } + } } - catch (uno::Exception &e) + catch (uno::Exception &e) { (void) e; DBG_ASSERT( 0, "failed to get thesaurus" ); - } - + } + return aRes; } - + void SvxThesaurusDialog_Impl::UpdateVendorImage() { m_pDialog->SetUpdateMode( sal_False ); - + SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { @@ -619,15 +619,15 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage; aVendorImageFI.SetImage( aImage ); } - + m_pDialog->SetUpdateMode( sal_True ); } - + IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG ) { pThis->m_pDialog->SetUpdateMode( sal_False ); - + SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) { @@ -676,20 +676,20 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo pThis->m_pDialog->SetSizePixel( aDlgSize ); pThis->m_pDialog->Invalidate(); } - + pThis->UpdateVendorImage(); pThis->m_pDialog->SetUpdateMode( sal_True ); - + return 0; }; // class SvxThesaurusDialog ---------------------------------------------- -SvxThesaurusDialog::SvxThesaurusDialog( - Window* pParent, +SvxThesaurusDialog::SvxThesaurusDialog( + Window* pParent, uno::Reference< linguistic2::XThesaurus > xThes, - const String &rWord, + const String &rWord, LanguageType nLanguage ) : SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ) @@ -738,7 +738,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( m_pImpl->aLangMBtn.SetPopupMenu( pMenu ); SetWindowTitle( nLanguage ); - + // disable controls if service is missing if (!m_pImpl->xThesaurus.is()) Enable( sal_False ); @@ -763,7 +763,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) String SvxThesaurusDialog::GetWord() -{ +{ return m_pImpl->aReplaceEdit.GetText(); } diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc index 994c933246de..46e122723e81 100755 --- a/cui/source/dialogs/thesdlg.hrc +++ b/cui/source/dialogs/thesdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,14 +30,14 @@ // defines --------------------------------------------------------------- #define BTN_LEFT 9 -#define BTN_THES_OK 10 -#define BTN_THES_CANCEL 11 +#define BTN_THES_OK 10 +#define BTN_THES_CANCEL 11 #define MB_LANGUAGE 12 -#define BTN_THES_HELP 13 -#define FT_WORD 15 +#define BTN_THES_HELP 13 +#define FT_WORD 15 #define CB_WORD 16 -#define FT_REPL 21 -#define ED_REPL 22 +#define FT_REPL 21 +#define ED_REPL 22 #define FL_VAR 23 #define FT_THES_ALTERNATIVES 24 #define CT_THES_ALTERNATIVES 25 diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index 6c6a6444b33d..058435d3f378 100755 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,12 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "cuires.hrc" #include "thesdlg.hrc" #include "helpid.hrc" #include <svx/svxids.hrc> // SID_THESAURUS - + // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS @@ -47,7 +47,7 @@ ModalDialog RID_SVXDLG_THESAURUS Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied at runtime Hide = TRUE; }; - + ImageButton BTN_LEFT { Pos = MAP_APPFONT ( 5 , 15 ) ; @@ -66,7 +66,7 @@ ModalDialog RID_SVXDLG_THESAURUS { DropDown = TRUE ; Pos = MAP_APPFONT ( 24 , 16 ) ; - Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines + Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines }; MenuButton MB_LANGUAGE { @@ -74,7 +74,7 @@ ModalDialog RID_SVXDLG_THESAURUS Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Language" ; }; - + FixedText FT_THES_ALTERNATIVES { Pos = MAP_APPFONT ( 5 , 33 ) ; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index d72b8625e3ea..573eaed1c2fe 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -86,7 +86,7 @@ public: // ComboBox virtual void Modify(); }; - + // class ReplaceEdit_Impl -------------------------------------------------- class ReplaceEdit_Impl : public Edit @@ -108,12 +108,12 @@ public: virtual void SetText( const XubString& rStr ); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); }; - + // class ThesaurusAlternativesCtrl_Impl ---------------------------------- class AlternativesExtraData { - String sText; + String sText; bool bHeader; public: @@ -123,7 +123,7 @@ public: bHeader(bIsHeader) { } - + bool IsHeader() const { return bHeader; } const String& GetText() const { return sText; } }; @@ -141,7 +141,7 @@ public: }; -class ThesaurusAlternativesCtrl_Impl : +class ThesaurusAlternativesCtrl_Impl : public SvxCheckListBox { SvxThesaurusDialog_Impl & m_rDialogImpl; @@ -189,17 +189,17 @@ struct SvxThesaurusDialog_Impl OKButton aReplaceBtn; CancelButton aCancelBtn; - String aErrStr; + String aErrStr; Image aVendorDefaultImage; Image aVendorDefaultImageHC; - uno::Reference< linguistic2::XThesaurus > xThesaurus; + uno::Reference< linguistic2::XThesaurus > xThesaurus; OUString aLookUpText; LanguageType nLookUpLanguage; std::stack< OUString > aLookUpHistory; bool m_bWordFound; - + // Handler DECL_LINK( LeftBtnHdl_Impl, Button * ); DECL_LINK( LanguageHdl_Impl, MenuButton * ); @@ -210,14 +210,14 @@ struct SvxThesaurusDialog_Impl DECL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox * ); DECL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl * ); - - + + SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ); ~SvxThesaurusDialog_Impl(); - uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL + uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); - + bool UpdateAlternativesBox_Impl(); void UpdateVendorImage(); void LookUp( const String &rText ); diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp index c7f0e0af1d61..a8e8a3abac2c 100644 --- a/cui/source/dialogs/winpluginlib.cpp +++ b/cui/source/dialogs/winpluginlib.cpp @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <stdio.h> -#define SO_PATH_SIZE 4096 +#define SO_PATH_SIZE 4096 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll" extern "C" { int lc_isInstalled(const char* realFilePath) @@ -62,7 +62,7 @@ int lc_isInstalled(const char* realFilePath) RegCloseKey(hKeySoftware); if( ret == ERROR_FILE_NOT_FOUND) return 1; - else + else return -1; } ret = RegOpenKeyEx(hMozillaPlugins, "@sun.com/npsopluginmi;version=1.0", 0, KEY_READ, &hStarOffice); @@ -71,16 +71,16 @@ int lc_isInstalled(const char* realFilePath) RegCloseKey(hMozillaPlugins); if( ret == ERROR_FILE_NOT_FOUND) return 1; - else + else return -1; } - - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) - ret = -1; + + if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) + ret = -1; else{ - sprintf(sSoPath,"%s", 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 @@ -97,10 +97,10 @@ int lc_isInstalled(const char* realFilePath) else ret = -1; } - else + else ret = -1; - RegCloseKey(hStarOffice); - RegCloseKey(hMozillaPlugins); + RegCloseKey(hStarOffice); + RegCloseKey(hMozillaPlugins); RegCloseKey(hKeySoftware); return ret; } @@ -124,7 +124,7 @@ int lc_uninstallPlugin(const char*) RegCloseKey(hKeySoftware); if( ret == ERROR_FILE_NOT_FOUND) return 0; - else + else return -1; } @@ -134,7 +134,7 @@ int lc_uninstallPlugin(const char*) RegCloseKey(hMozillaPlugins); if( ret == ERROR_FILE_NOT_FOUND) return 0; - else + else return -1; } RegCloseKey(hStarOffice); @@ -167,43 +167,43 @@ int lc_installPlugin(const char* realFilePath) } ret = RegOpenKeyEx(hKeySoftware, "MozillaPlugins", 0, KEY_READ|KEY_WRITE, &hMozillaPlugins); if(ret != ERROR_SUCCESS){ - RegCreateKeyEx(hKeySoftware, - "MozillaPlugins", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, + RegCreateKeyEx(hKeySoftware, + "MozillaPlugins", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, &hMozillaPlugins, &sState); } - ret = RegCreateKeyEx(hMozillaPlugins, - "@sun.com/npsopluginmi;version=1.0", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, + ret = RegCreateKeyEx(hMozillaPlugins, + "@sun.com/npsopluginmi;version=1.0", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, - &hStarOffice, + &hStarOffice, &sState); if(ret != ERROR_SUCCESS){ RegCloseKey(hKeySoftware); RegCloseKey(hMozillaPlugins); return -1; } - + RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); - - - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) - ret = -1; + + + if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) + ret = -1; else{ - sprintf(sSoPath,"%s", realFilePath); - ret = 0; + sprintf(sSoPath,"%s", realFilePath); + ret = 0; } - + //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); // GetCurrentDirectory return the char number of the string if(ret == 0){ @@ -213,7 +213,7 @@ int lc_installPlugin(const char* realFilePath) else ret = -1; } - else + else ret = -1; RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 38a03773c7f7..04fe71d5d9b1 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <svx/viewlayoutitem.hxx> #include <dialmgr.hxx> #include <svx/zoom_def.hxx> -#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM +#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM #include <layout/layout-pre.hxx> #if ENABLE_LAYOUT @@ -66,7 +66,7 @@ static USHORT pRanges[] = 0 }; -#define SPECIAL_FACTOR ((USHORT)0xFFFF) +#define SPECIAL_FACTOR ((USHORT)0xFFFF) // class SvxZoomDialog --------------------------------------------------- @@ -211,11 +211,11 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : aBottomFl ( this, CUI_RES( FL_BOTTOM ) ), aOKBtn ( this, CUI_RES( BTN_ZOOM_OK ) ), aCancelBtn ( this, CUI_RES( BTN_ZOOM_CANCEL ) ), - aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ), + aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ), - rSet ( rCoreSet ), + rSet ( rCoreSet ), pOutSet ( NULL ), - bModified ( FALSE ) + bModified ( FALSE ) { #if ENABLE_LAYOUT diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc index 49412ad085f0..0fb3a8afc6c5 100644 --- a/cui/source/dialogs/zoom.hrc +++ b/cui/source/dialogs/zoom.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 8137b1c7bb89..54b995f3ddd7 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 4dfc3b19b88f..11a370c782e7 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index a7f9d20d9d4d..86f3064e09d7 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 7683eb0bcd81..ededf9174058 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,10 +56,10 @@ #include "hangulhanjadlg.hxx" //add for HangulHanjaConversionDialog #include "showcols.hxx" //add for FmShowColsDialog #include "zoom.hxx" //add for SvxZoomDialog -#include "cuigaldlg.hxx" //add for Gallery 6 Dialogs and 1 TabPage -#include "cuiimapwnd.hxx" //add for URLDlg -#include "hlmarkwn.hxx" //add for SvxHlinkDlgMarkWnd -#include "srchxtra.hxx" //add for SvxSearchFormatDialog +#include "cuigaldlg.hxx" //add for Gallery 6 Dialogs and 1 TabPage +#include "cuiimapwnd.hxx" //add for URLDlg +#include "hlmarkwn.hxx" //add for SvxHlinkDlgMarkWnd +#include "srchxtra.hxx" //add for SvxSearchFormatDialog #include "transfrm.hxx" //add for SvxTransformTabDialog #include "bbdlg.hxx" //add for SvxBorderBackgroundDlg #include "cuisrchdlg.hxx" //add for SvxJSearchOptionsDialog @@ -70,13 +70,13 @@ #include "multifil.hxx" //add for SvxMultiFileDialog #include "cuihyperdlg.hxx" //add for SvxHpLinkDlg #include "cuifmsearch.hxx" //add for FmSearchDialog -#include "cuigrfflt.hxx" //add for GraphicFilterDialog +#include "cuigrfflt.hxx" //add for GraphicFilterDialog #include "cuitabarea.hxx" //add for SvxAreaTabDialog #include "cuitabline.hxx" //add for SvxLineTabDialog #include "measure.hxx" //add for SvxMeasureDialog #include "connect.hxx" //add for SvxConnectionDialog #include "dbregister.hxx" // add for DatabaseRegistrationDialog -#include "cuioptgenrl.hxx" //add for SvxGeneralTabPage +#include "cuioptgenrl.hxx" //add for SvxGeneralTabPage #include "optasian.hxx" #include "insdlg.hxx" #include "pastedlg.hxx" @@ -123,7 +123,7 @@ IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl) IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) -AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \ +AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \ { delete pDlg; } @@ -341,11 +341,11 @@ void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString( { pDlg->SetCurrentString(_rNewString,_rSuggestions,_bOriginatesFromDocument); } -String AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const +String AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const { return pDlg->GetCurrentString(); } -editeng::HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const +editeng::HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const { return pDlg->GetConversionFormat(); } @@ -355,7 +355,7 @@ void AbstractHangulHanjaConversionDialog_Impl::FocusSuggestion( ) pDlg->FocusSuggestion(); } -String AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const +String AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const { return pDlg->GetCurrentSuggestion(); } @@ -370,7 +370,7 @@ sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const return pDlg->GetLanguage(); }; -Window* AbstractThesaurusDialog_Impl::GetWindow() +Window* AbstractThesaurusDialog_Impl::GetWindow() { return pDlg; } @@ -385,7 +385,7 @@ void AbstractHyphenWordDialog_Impl::SelRight() pDlg->SelRight(); } -Window* AbstractHyphenWordDialog_Impl::GetWindow() +Window* AbstractHyphenWordDialog_Impl::GetWindow() { return pDlg; } @@ -486,7 +486,7 @@ void AbstractSearchProgress_Impl::SetDirectory( const INetURLObject& rURL ) { pDlg->SetDirectory( rURL ); } -PLinkStub AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl() +PLinkStub AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl() { return SearchProgress::LinkStubCleanUpHdl; } @@ -506,7 +506,7 @@ void AbstractTakeProgress_Impl::SetFile( const INetURLObject& rURL ) pDlg->SetFile( rURL ); } -PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl() +PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl() { return TakeProgress::LinkStubCleanUpHdl; } @@ -989,7 +989,7 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow() String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const { return pDlg->GetPasswordToOpen(); -} +} String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const { return pDlg->GetPasswordToModify(); @@ -1138,7 +1138,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( return new AbstractSvxCaptionDialog_Impl( pDlg ); } -AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent, +AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor , SvxDistributeVertical eVer) @@ -1154,7 +1154,7 @@ AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHan return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); } -AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, +AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ) { @@ -1346,7 +1346,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, const USHORT* pWhRanges ) { @@ -1448,7 +1448,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, const String& rName, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) @@ -1812,17 +1812,17 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId ) return 0; } -CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc() +CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc() { return SvxDistributePage::Create; } -DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId ) +DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId ) { switch ( nId ) { case RID_SVXDLG_POSTIT: - return SvxPostItDialog::GetRanges; //add for SvxPostItDialog + return SvxPostItDialog::GetRanges; //add for SvxPostItDialog default: break; } @@ -1953,7 +1953,7 @@ SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDi return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal ); } -SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) +SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) { return new SvxNewTableDialog( pParent ); } @@ -1969,13 +1969,13 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind return new SvxInsRowColDlg( pParent, bCol, nHelpId ); } -AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( +AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ); return new AbstractPasswordToOpenModifyDialog_Impl( pDlg ); -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 09659128b47a..30e2da2f98ae 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define _CUI_DLGFACT_HXX // include --------------------------------------------------------------- -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <com/sun/star/container/XNameReplace.hpp> #include "tools/link.hxx" @@ -72,24 +72,24 @@ class HangulHanjaConversionDialog; } using namespace svx; -#define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ -public: \ - Class( DialogClass* p) \ - : pDlg(p) \ +#define DECL_ABSTDLG_BASE(Class,DialogClass) \ + DialogClass* pDlg; \ +public: \ + Class( DialogClass* p) \ + : pDlg(p) \ {} \ - virtual ~Class(); \ - virtual short Execute() ; -// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) + virtual ~Class(); \ + virtual short Execute() ; +// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) -#define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ +#define IMPL_ABSTDLG_BASE(Class) \ +Class::~Class() \ { \ - delete pDlg; \ -} \ + delete pDlg; \ +} \ short Class::Execute() \ { \ - return pDlg->Execute(); \ + return pDlg->Execute(); \ } //for GalleryThemeProperties begin @@ -124,23 +124,23 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog class AbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const; //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const ; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const ; }; class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001 - virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001 + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001 + virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001 //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 ); //add by CHINA001 + virtual String GetText() const; //add by CHINA001 }; //for SvxDistributeDialog begin @@ -158,47 +158,47 @@ public: class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog { DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog) - virtual void EndDialog(long nResult = 0); + virtual void EndDialog(long nResult = 0); virtual void EnableRubySupport( sal_Bool _bVal ); - virtual void SetByCharacter( sal_Bool _bByCharacter ) ; - virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); - virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); - virtual void SetOptionsChangedHdl( const Link& _rHdl ); - virtual void SetIgnoreHdl( const Link& _rHdl ); - virtual void SetIgnoreAllHdl( const Link& _rHdl ) ; - virtual void SetChangeHdl( const Link& _rHdl ) ; - virtual void SetChangeAllHdl( const Link& _rHdl ) ; - virtual void SetClickByCharacterHdl( const Link& _rHdl ) ; - virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) ; - virtual void SetFindHdl( const Link& _rHdl ); - virtual sal_Bool GetUseBothDirections( ) const; + virtual void SetByCharacter( sal_Bool _bByCharacter ) ; + virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); + virtual void SetOptionsChangedHdl( const Link& _rHdl ); + virtual void SetIgnoreHdl( const Link& _rHdl ); + virtual void SetIgnoreAllHdl( const Link& _rHdl ) ; + virtual void SetChangeHdl( const Link& _rHdl ) ; + virtual void SetChangeAllHdl( const Link& _rHdl ) ; + virtual void SetClickByCharacterHdl( const Link& _rHdl ) ; + virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) ; + virtual void SetFindHdl( const Link& _rHdl ); + virtual sal_Bool GetUseBothDirections( ) const; virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; - virtual void SetCurrentString( + virtual void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); - virtual String GetCurrentString( ) const ; + virtual String GetCurrentString( ) const ; virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const ; - virtual void FocusSuggestion( ); - virtual String GetCurrentSuggestion( ) const; + virtual void FocusSuggestion( ); + virtual String GetCurrentSuggestion( ) const; }; class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog { DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) - virtual String GetWord(); - virtual sal_uInt16 GetLanguage() const; - virtual Window* GetWindow(); + virtual String GetWord(); + virtual sal_uInt16 GetLanguage() const; + virtual Window* GetWindow(); }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog { DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) - virtual void SelLeft(); - virtual void SelRight(); - virtual Window* GetWindow(); + virtual void SelLeft(); + virtual void SelRight(); + virtual Window* GetWindow(); }; // for FmShowColsDialog begin @@ -206,7 +206,7 @@ class FmShowColsDialog; class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog { DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog) - virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); + virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); }; //for FmShowColsDialog end @@ -216,9 +216,9 @@ class SvxZoomDialog; class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog { DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog) - virtual void SetLimits( USHORT nMin, USHORT nMax ); - virtual void HideButton( USHORT nBtnId ); - virtual const SfxItemSet* GetOutputItemSet() const ; + virtual void SetLimits( USHORT nMin, USHORT nMax ); + virtual void HideButton( USHORT nBtnId ); + virtual const SfxItemSet* GetOutputItemSet() const ; }; //for SvxZoomDialog end @@ -244,12 +244,12 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog //STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p) //STRIP001 : pDlg(p) //STRIP001 {} -//STRIP001 virtual USHORT Execute() ; -//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ; +//STRIP001 virtual USHORT Execute() ; +//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ; //STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ; //STRIP001 virtual void HideAutoCorrect() ; -//STRIP001 virtual String GetNewEditWord(); -//STRIP001 virtual void SetNewEditWord( const String& _rNew ); +//STRIP001 virtual String GetNewEditWord(); +//STRIP001 virtual void SetNewEditWord( const String& _rNew ); //STRIP001 } //for SvxSpellCheckDialog end @@ -261,9 +261,9 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress) virtual void Update() ; virtual void Sync() ; - virtual void SetFileType( const String& rType ) ; - virtual void SetDirectory( const INetURLObject& rURL ) ; - virtual PLinkStub GetLinkStubCleanUpHdl() ; + virtual void SetFileType( const String& rType ) ; + virtual void SetDirectory( const INetURLObject& rURL ) ; + virtual PLinkStub GetLinkStubCleanUpHdl() ; }; //for SearchProgress end @@ -275,8 +275,8 @@ class AbstractTakeProgress_Impl : public AbstractTakeProgress DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress) virtual void Update() ; virtual void Sync() ; - virtual void SetFile( const INetURLObject& rURL ) ; - virtual PLinkStub GetLinkStubCleanUpHdl() ; + virtual void SetFile( const INetURLObject& rURL ) ; + virtual PLinkStub GetLinkStubCleanUpHdl() ; }; //for TakeProgress end @@ -286,7 +286,7 @@ class TitleDialog; class AbstractTitleDialog_Impl : public AbstractTitleDialog { DECL_ABSTDLG_BASE(AbstractTitleDialog_Impl,TitleDialog) - virtual String GetTitle() const ; + virtual String GetTitle() const ; }; //for TitleDialog end @@ -308,7 +308,7 @@ class GalleryIdDialog; class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog { DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog) - virtual ULONG GetId() const ; + virtual ULONG GetId() const ; }; //for GalleryIdDialog end @@ -318,11 +318,11 @@ class URLDlg; class AbstractURLDlg_Impl :public AbstractURLDlg { DECL_ABSTDLG_BASE(AbstractURLDlg_Impl,URLDlg) - virtual String GetURL() const; - virtual String GetAltText() const; - virtual String GetDesc() const; - virtual String GetTarget() const; - virtual String GetName() const; + virtual String GetURL() const; + virtual String GetAltText() const; + virtual String GetDesc() const; + virtual String GetTarget() const; + virtual String GetName() const; }; //for URLDlg end @@ -331,16 +331,16 @@ class SvxHlinkDlgMarkWnd; class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd { DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd) - virtual void Hide( USHORT nFlags = 0 ); - virtual BOOL IsVisible() const ; - virtual void Invalidate( USHORT nFlags = 0 ); - virtual void SetSizePixel( const Size& rNewSize ); - virtual Size GetSizePixel() const; - virtual BOOL MoveTo ( Point aNewPos )const; - virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const; - virtual void RefreshTree ( String aStrURL ) ; - virtual void SelectEntry ( String aStrMark ); - virtual USHORT SetError( USHORT nError) ; + virtual void Hide( USHORT nFlags = 0 ); + virtual BOOL IsVisible() const ; + virtual void Invalidate( USHORT nFlags = 0 ); + virtual void SetSizePixel( const Size& rNewSize ); + virtual Size GetSizePixel() const; + virtual BOOL MoveTo ( Point aNewPos )const; + virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const; + virtual void RefreshTree ( String aStrURL ) ; + virtual void SelectEntry ( String aStrMark ); + virtual USHORT SetError( USHORT nError) ; }; //for SvxHlinkDlgMarkWnd end @@ -350,10 +350,10 @@ class SvxSearchSimilarityDialog; class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog { DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog) - virtual USHORT GetOther(); - virtual USHORT GetShorter(); - virtual USHORT GetLonger(); - virtual BOOL IsRelaxed(); + virtual USHORT GetOther(); + virtual USHORT GetShorter(); + virtual USHORT GetLonger(); + virtual BOOL IsRelaxed(); }; //for SvxSearchSimilarityDialog end @@ -362,7 +362,7 @@ class SvxJSearchOptionsDialog; class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog { DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog) - virtual INT32 GetTransliterationFlags() const; + virtual INT32 GetTransliterationFlags() const; }; //for SvxJSearchOptionsDialog end @@ -457,7 +457,7 @@ class SvxMessDialog; class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog { DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog) - virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ); + virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ); }; //for SvxMessDialog end @@ -466,8 +466,8 @@ class SvxMultiPathDialog; class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl,SvxMultiPathDialog) - virtual String GetPath() const; - virtual void SetPath( const String& rPath ); + virtual String GetPath() const; + virtual void SetPath( const String& rPath ); virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); }; @@ -478,12 +478,12 @@ class SvxMultiFileDialog; class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl,SvxMultiFileDialog) - virtual String GetFiles() const ; - virtual void SetFiles( const String& rPath ) ; + virtual String GetFiles() const ; + virtual void SetFiles( const String& rPath ) ; //from SvxMultiPathDialog - virtual String GetPath() const; - virtual void SetPath( const String& rPath ); - virtual void SetClassPathMode(); + virtual String GetPath() const; + virtual void SetPath( const String& rPath ); + virtual void SetClassPathMode(); virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window @@ -518,7 +518,7 @@ class GraphicFilterDialog; class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog { DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog) - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); }; //for GraphicFilterDialog end @@ -527,14 +527,14 @@ class SvxAreaTabDialog; class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog { DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; - virtual void DontDeleteColorTable() ; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; + virtual void DontDeleteColorTable() ; }; //add for SvxAreaTabDialog end @@ -569,19 +569,19 @@ class SvxPostItDialog; class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog { DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog ) - virtual void SetText( const XubString& rStr ); //From class Window + virtual void SetText( const XubString& rStr ); //From class Window virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetPrevHdl( const Link& rLink ) ; virtual void SetNextHdl( const Link& rLink ) ; - virtual void EnableTravel(BOOL bNext, BOOL bPrev) ; - virtual String GetNote() ; - virtual void SetNote(const String& rTxt) ; - virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) ; - virtual void DontChangeAuthor() ; - virtual void HideAuthor() ; - virtual void SetReadonlyPostIt(BOOL bDisable) ; - virtual BOOL IsOkEnabled() const ; - virtual Window * GetWindow(); + virtual void EnableTravel(BOOL bNext, BOOL bPrev) ; + virtual String GetNote() ; + virtual void SetNote(const String& rTxt) ; + virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) ; + virtual void DontChangeAuthor() ; + virtual void HideAuthor() ; + virtual void SetReadonlyPostIt(BOOL bDisable) ; + virtual BOOL IsOkEnabled() const ; + virtual Window * GetWindow(); private: Link aNextHdl; Link aPrevHdl; @@ -595,7 +595,7 @@ class PasswordToOpenModifyDialog; class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog { DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog ) - + virtual String GetPasswordToOpen() const; virtual String GetPasswordToModify() const; virtual bool IsRecommendToOpenReadonly() const; @@ -608,45 +608,45 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ); - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ); - virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, + virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ); + virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ); + virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, const SfxItemSet* pAttrSet=0 ); - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ); - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog + virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ); virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const String& rParameter ); - virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, + virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const String *pUserButtonText=0 ); - virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, + virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const String *pUserButtonText=0 ); - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ); //add for SvxTextTabDialog - virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent, const SfxItemSet& rSet, sal_uInt32 nResId); //add by CHINA001 virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001 - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001 + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); @@ -660,10 +660,10 @@ public: virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ); - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, const String &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); @@ -695,9 +695,9 @@ public: //STRIP001 SvxSpellWrapper* pWrapper, //STRIP001 sal_uInt32 nResId); virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ); - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, const INetURLObject& rStartURL); - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ); + virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ); virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog const String& rOldText); virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog @@ -711,7 +711,7 @@ public: TargetList& rTargetList ); virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); //add for SvxHlinkDlgMarkWnd - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, const USHORT* pWhRanges); virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, @@ -726,61 +726,61 @@ public: virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, sal_uInt32 nResId ); //add for SvxNewDictionaryDialog - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, const String& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId);//add for SvxEditDictionaryDialog - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, const String& rName, const String& rDesc ); // #i68101# virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ); virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription); - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const String& rText, const String& rDesc, Image* pImg = NULL ); //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink SfxBindings* pBindings, sal_uInt32 nResId); - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog + virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog const String& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss const Graphic& rGraphic, RECT_POINT eLightSource, sal_uInt32 nResId); - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, USHORT nCount, sal_uInt32 nResId); - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId); - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId); - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, BOOL bHasObj = TRUE ); - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, BOOL bPrevNext = FALSE, BOOL bRedline = FALSE ); // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); - virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(); + virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ); + virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(); - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); - virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ); + virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ); + virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ); virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( @@ -792,7 +792,7 @@ public: virtual VclAbstractDialog* CreateScriptErrorDialog( Window* pParent, ::com::sun::star::uno::Any aException); - virtual VclAbstractDialog* CreateSvxMacroAssignDlg( + virtual VclAbstractDialog* CreateSvxMacroAssignDlg( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index 46c91735b739..2b145e202251 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index 882a80318b8a..70789226a9b1 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,17 +35,17 @@ class SvxControlFocusHelper : public Control { private: - Control* m_pFocusCtrl; + Control* m_pFocusCtrl; public: SvxControlFocusHelper( Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} - void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } + void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); }; -#endif // SVX_CONTROLL_FUCUS_HELPER_HXX +#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 cd7fa148462d..f10b52e065a3 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ private: bool m_bIsUndoEditMode; Link m_aModifyLink; - + void CallModifyLink() {m_aModifyLink.Call(this);} SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParent();} @@ -93,28 +93,28 @@ public: ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;} - + void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ); void SetText( const String& rStr ); - - bool MarkNextError( bool bIgnoreCurrentError ); + + bool MarkNextError( bool bIgnoreCurrentError ); void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage); void MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar); String GetErrorText() const; void RestoreCurrentError(); - + void SetAlternatives( com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> ); - + const SpellErrorDescription* GetAlternatives(); void ResetModified() { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;} BOOL IsModified() const { return GetTextEngine()->IsModified(); } - + bool IsUndoEditMode() const { return m_bIsUndoEditMode;} void SetUndoEditMode(bool bSet); - + svx::SpellPortions CreateSpellPortions( bool bSetIgnoreFlag ) const; void ResetUndo(); @@ -135,15 +135,15 @@ class SpellDialogChildWindow; class ExplainButton : public PushButton { String m_sExplanation; - + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Click(); -public: +public: ExplainButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId ){} - ~ExplainButton(); + ~ExplainButton(); void SetExplanation( const String& rText ) {m_sExplanation = rText;} bool HasExplanation() { return m_sExplanation.Len() > 0;} - + }; class SpellDialog : public SfxModelessDialog @@ -152,23 +152,23 @@ class SpellDialog : public SfxModelessDialog friend class SentenceEditWindow_Impl; private: - + FixedImage aVendorImageFI; - + FixedText aLanguageFT; SvxLanguageBox aLanguageLB; - + FixedText aNotInDictFT; - SentenceEditWindow_Impl aSentenceED; - + SentenceEditWindow_Impl aSentenceED; + FixedText aSuggestionFT; ListBox aSuggestionLB; - + PushButton aIgnorePB; PushButton aIgnoreAllPB; PushButton aIgnoreRulePB; MenuButton aAddToDictMB; - + PushButton aChangePB; PushButton aChangeAllPB; ExplainButton aExplainPB; @@ -193,20 +193,20 @@ private: const String m_sTitleSpelling; const String m_sTitleSpellingGrammar; const String m_sTitleSpellingGrammarVendor; - + Size aOldWordEDSize; Link aDialogUndoLink; - + bool bModified; bool bFocusLocked; - + svx::SpellDialogChildWindow& rParent; svx::SpellPortions m_aSavedSentence; SpellDialog_Impl* pImpl; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - LanguageType nOldLang; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + LanguageType nOldLang; DECL_LINK( ChangeHdl, Button * ); DECL_LINK( ChangeAllHdl, Button * ); @@ -222,7 +222,7 @@ private: DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * ); - + void StartSpellOptDlg_Impl(); void InitUserDicts(); void UpdateBoxes_Impl(); @@ -231,30 +231,30 @@ private: void LockFocusChanges( bool bLock ) {bFocusLocked = bLock;} void Impl_Restore(); - void SetSelectedLang_Impl( LanguageType nLang ); - LanguageType GetSelectedLang_Impl() const; + void SetSelectedLang_Impl( LanguageType nLang ); + LanguageType GetSelectedLang_Impl() const; /** Retrieves the next sentence. */ bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/); - /** Corrects all errors that have been selected to be changed always + /** Corrects all errors that have been selected to be changed always */ bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); - void SetTitle_Impl(LanguageType nLang); + void SetTitle_Impl(LanguageType nLang); -protected: +protected: virtual void Paint( const Rectangle& rRect ); virtual long Notify( NotifyEvent& rNEvt ); public: - SpellDialog( + SpellDialog( svx::SpellDialogChildWindow* pChildWindow, Window * pParent, SfxBindings* pBindings); ~SpellDialog(); - void SetLanguage( sal_uInt16 nLang ); - virtual sal_Bool Close(); + void SetLanguage( sal_uInt16 nLang ); + virtual sal_Bool Close(); void InvalidateDialog(); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 85b51cefaf28..55b35cd652af 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ class SfxAcceleratorConfigPage; class SfxAccCfgTabListBox_Impl : public SvTabListBox { - SfxAcceleratorConfigPage* m_pAccelConfigPage; + SfxAcceleratorConfigPage* m_pAccelConfigPage; - void KeyInput( const KeyEvent &rKEvt ); + void KeyInput( const KeyEvent &rKEvt ); protected: - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); public: SfxAccCfgTabListBox_Impl( @@ -89,7 +89,7 @@ public: m_pAccelConfigPage( pAccelConfigPage ) {} - void ReplaceEntry( USHORT nPos, const String &rStr ); + void ReplaceEntry( USHORT nPos, const String &rStr ); }; // class SfxAcceleratorConfigPage ---------------------------------------- @@ -131,31 +131,31 @@ class SfxAcceleratorConfigPage : public SfxTabPage { friend class SfxAccCfgTabListBox_Impl; private: - const SfxMacroInfoItem* m_pMacroInfoItem; - const SfxStringItem* m_pStringItem; - const SfxStringItem* m_pFontItem; + const SfxMacroInfoItem* m_pMacroInfoItem; + const SfxStringItem* m_pStringItem; + const SfxStringItem* m_pFontItem; sfx2::FileDialogHelper* m_pFileDlg; - SfxAccCfgTabListBox_Impl aEntriesBox; + SfxAccCfgTabListBox_Impl aEntriesBox; FixedLine aKeyboardGroup; - RadioButton aOfficeButton; - RadioButton aModuleButton; - PushButton aChangeButton; - PushButton aRemoveButton; - FixedText aGroupText; + RadioButton aOfficeButton; + RadioButton aModuleButton; + PushButton aChangeButton; + PushButton aRemoveButton; + FixedText aGroupText; SfxConfigGroupListBox_Impl* pGroupLBox; - FixedText aFunctionText; - SfxConfigFunctionListBox_Impl* pFunctionBox; - FixedText aKeyText; - SvTreeListBox aKeyBox; + FixedText aFunctionText; + SfxConfigFunctionListBox_Impl* pFunctionBox; + FixedText aKeyText; + SvTreeListBox aKeyBox; FixedLine aFunctionsGroup; - PushButton aLoadButton; - PushButton aSaveButton; - PushButton aResetButton; - String aLoadAccelConfigStr; - String aSaveAccelConfigStr; - String aFilterAllStr; - String aFilterCfgStr; + PushButton aLoadButton; + PushButton aSaveButton; + PushButton aResetButton; + String aLoadAccelConfigStr; + String aSaveAccelConfigStr; + String aFilterAllStr; + String aFilterCfgStr; SfxStylesInfo_Impl m_aStylesInfo; sal_Bool m_bStylesInfoInitialized; @@ -170,42 +170,42 @@ private: ::rtl::OUString m_sModuleShortName; ::rtl::OUString m_sModuleUIName; - DECL_LINK( ChangeHdl, Button * ); - DECL_LINK( RemoveHdl, Button * ); - DECL_LINK( SelectHdl, Control * ); - DECL_LINK( Save, Button * ); - DECL_LINK( Load, Button * ); - DECL_LINK( Default, PushButton * ); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK( ChangeHdl, Button * ); + DECL_LINK( RemoveHdl, Button * ); + DECL_LINK( SelectHdl, Control * ); + DECL_LINK( Save, Button * ); + DECL_LINK( Load, Button * ); + DECL_LINK( Default, PushButton * ); + DECL_LINK( RadioHdl, RadioButton* ); DECL_LINK( LoadHdl, sfx2::FileDialogHelper* ); DECL_LINK( SaveHdl, sfx2::FileDialogHelper* ); String GetLabel4Command(const String& sCommand); void InitAccCfg(); - KeyCode MapPosToKeyCode( USHORT nPos ) const; - USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; + KeyCode MapPosToKeyCode( USHORT nPos ) const; + USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; + String GetFunctionName( KeyFuncType eType ) const; css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName); void StartFileDialog( WinBits nBits, const String& rTitle ); - void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); - void ResetConfig(); + void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); + void ResetConfig(); - void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); + void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); - virtual ~SfxAcceleratorConfigPage(); + virtual ~SfxAcceleratorConfigPage(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); - void SelectMacro(const SfxMacroInfoItem*); + void SelectMacro(const SfxMacroInfoItem*); void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; @@ -237,7 +237,7 @@ class SfxAcceleratorConfigDialog : public ModalDialog PushButton aRemoveButton; SfxAcceleratorConfigListBox aEntriesBox; FixedText aDescriptionTextText; - FixedText aDescriptionInfoText; + FixedText aDescriptionInfoText; FixedLine aKeyboardGroup; FixedText aGroupText; ListBox aGroupLBox; @@ -273,7 +273,7 @@ public: Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); - virtual ~SvxShortcutAssignDlg(); + virtual ~SvxShortcutAssignDlg(); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 6d005eba6774..0d0ce6aa8b04 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index d11df2b971cf..b93998a2a9f9 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ class SmartTagMgr; class OfaAutoCorrDlg : public SfxTabDialog { - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; DECL_LINK(SelectLanguageHdl, ListBox*); public: OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet ); - void EnableLanguage(BOOL bEnable) - { aLanguageFT.Enable(bEnable); + void EnableLanguage(BOOL bEnable) + { aLanguageFT.Enable(bEnable); aLanguageLB.Enable(bEnable);} }; @@ -78,8 +78,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); - virtual void HBarClick(); + virtual void SetTabs(); + virtual void HBarClick(); virtual void KeyInput( const KeyEvent& rKEvt ); public: @@ -90,10 +90,10 @@ class OfaACorrCheckListBox : public SvxSimpleTable inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } - BOOL IsChecked(ULONG nPos, USHORT nCol = 0); - void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + BOOL IsChecked(ULONG nPos, USHORT nCol = 0); + void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); + SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); }; // class OfaAutocorrOptionsPage ------------------------------------------ @@ -104,29 +104,29 @@ class OfaAutocorrOptionsPage : public SfxTabPage using TabPage::ActivatePage; private: - SvxCheckListBox aCheckLB; - - String sInput; - String sDoubleCaps; - String sStartCap; - String sBoldUnderline; - String sURL; - String sNoDblSpaces; - String sDash; + SvxCheckListBox aCheckLB; + + String sInput; + String sDoubleCaps; + String sStartCap; + String sBoldUnderline; + String sURL; + String sNoDblSpaces; + String sDash; String sNonBrkSpace; - String sFirst; + String sFirst; String sAccidentalCaps; public: OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrOptionsPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; @@ -136,45 +136,45 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage { using TabPage::ActivatePage; - OfaACorrCheckListBox aCheckLB; - PushButton aEditPB; - FixedText aHeader1Expl; - FixedText aHeader2Expl; - - String sHeader1; - String sHeader2; - - String sDeleteEmptyPara; - String sUseReplaceTbl; - String sCptlSttWord; - String sCptlSttSent; - String sUserStyle; - String sBullet; - String sByInputBullet; - String sBoldUnder; - String sNoDblSpaces; + OfaACorrCheckListBox aCheckLB; + PushButton aEditPB; + FixedText aHeader1Expl; + FixedText aHeader2Expl; + + String sHeader1; + String sHeader2; + + String sDeleteEmptyPara; + String sUseReplaceTbl; + String sCptlSttWord; + String sCptlSttSent; + String sUserStyle; + String sBullet; + String sByInputBullet; + String sBoldUnder; + String sNoDblSpaces; String sCorrectCapsLock; - String sDetectURL; + String sDetectURL; String sDash; String sNonBrkSpace; - String sOrdinal; - String sRightMargin; - String sNum; - String sBorder; - String sTable; - String sReplaceTemplates; - String sDelSpaceAtSttEnd; - String sDelSpaceBetweenLines; + String sOrdinal; + String sRightMargin; + String sNum; + String sBorder; + String sTable; + String sReplaceTemplates; + String sDelSpaceAtSttEnd; + String sDelSpaceBetweenLines; - String sMargin; - String sBulletChar; - String sByInputBulletChar; + String sMargin; + String sBulletChar; + String sByInputBulletChar; - Font aBulletFont; - Font aByInputBulletFont; - USHORT nPercent; + Font aBulletFont; + Font aByInputBulletFont; + USHORT nPercent; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, OfaACorrCheckListBox*); DECL_LINK(EditHdl, PushButton*); @@ -190,27 +190,27 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage const SfxItemSet& rAttrSet); virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual void ActivatePage( const SfxItemSet& ); }; // class AutoCorrEdit ---------------------------------------------------- class AutoCorrEdit : public Edit { - Link aActionLink; - BOOL bSpaces; + Link aActionLink; + BOOL bSpaces; public: AutoCorrEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(FALSE){} - void SetActionHdl( const Link& rLink ) + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(BOOL bSet) + void SetSpaces(BOOL bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ); }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -225,34 +225,34 @@ class OfaAutocorrReplacePage : public SfxTabPage using TabPage::DeactivatePage; private: - CheckBox aTextOnlyCB; + CheckBox aTextOnlyCB; FixedText aShortFT; - AutoCorrEdit aShortED; + AutoCorrEdit aShortED; FixedText aReplaceFT; - AutoCorrEdit aReplaceED; - SvTabListBox aReplaceTLB; - PushButton aNewReplacePB; - PushButton aDeleteReplacePB; + AutoCorrEdit aReplaceED; + SvTabListBox aReplaceTLB; + PushButton aNewReplacePB; + PushButton aDeleteReplacePB; - String sModify; - String sNew; + String sModify; + String sNew; - SvStringsISortDtor* pFormatText; - DoubleStringTable aDoubleStringTable; - CollatorWrapper* pCompareClass; + SvStringsISortDtor* pFormatText; + DoubleStringTable aDoubleStringTable; + CollatorWrapper* pCompareClass; CharClass* pCharClass; - LanguageType eLang; + LanguageType eLang; - BOOL bHasSelectionText; - BOOL bFirstSelect:1; - BOOL bReplaceEditChanged:1; - BOOL bSWriter:1; + BOOL bHasSelectionText; + BOOL bFirstSelect:1; + BOOL bReplaceEditChanged:1; + BOOL bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen + void RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen LanguageType eOldLanguage, LanguageType eNewLanguage); @@ -260,15 +260,15 @@ public: OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrReplacePage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetLanguage(LanguageType eSet); + void SetLanguage(LanguageType eSet); }; // class OfaAutocorrExceptPage --------------------------------------------- @@ -283,43 +283,43 @@ class OfaAutocorrExceptPage : public SfxTabPage using TabPage::DeactivatePage; private: - FixedLine aAbbrevFL; - AutoCorrEdit aAbbrevED; - ListBox aAbbrevLB; - PushButton aNewAbbrevPB; - PushButton aDelAbbrevPB; + FixedLine aAbbrevFL; + AutoCorrEdit aAbbrevED; + ListBox aAbbrevLB; + PushButton aNewAbbrevPB; + PushButton aDelAbbrevPB; CheckBox aAutoAbbrevCB; - FixedLine aDoubleCapsFL; - AutoCorrEdit aDoubleCapsED; - ListBox aDoubleCapsLB; - PushButton aNewDoublePB; - PushButton aDelDoublePB; + FixedLine aDoubleCapsFL; + AutoCorrEdit aDoubleCapsED; + ListBox aDoubleCapsLB; + PushButton aNewDoublePB; + PushButton aDelDoublePB; CheckBox aAutoCapsCB; - StringsTable aStringsTable; + StringsTable aStringsTable; CollatorWrapper* pCompareClass; - LanguageType eLang; + LanguageType eLang; DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen + void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen LanguageType eOldLanguage, LanguageType eNewLanguage); public: OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ); ~OfaAutocorrExceptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetLanguage(LanguageType eSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + void SetLanguage(LanguageType eSet); }; @@ -331,54 +331,54 @@ class OfaQuoteTabPage : public SfxTabPage private: // For anything but writer - SvxCheckListBox aCheckLB; + SvxCheckListBox aCheckLB; // Just for writer - OfaACorrCheckListBox aSwCheckLB; - String sHeader1; - String sHeader2; - + OfaACorrCheckListBox aSwCheckLB; + String sHeader1; + String sHeader2; + String sNonBrkSpace; String sOrdinal; + + SvLBoxButtonData* pCheckButtonData; - SvLBoxButtonData* pCheckButtonData; - - FixedLine aSingleFL; + FixedLine aSingleFL; CheckBox aSingleTypoCB; - FixedText aSglStartQuoteFT; + FixedText aSglStartQuoteFT; PushButton aSglStartQuotePB; - FixedText aSglStartExFT; - FixedText aSglEndQuoteFT; - PushButton aSglEndQuotePB; - FixedText aSglEndExFT; - PushButton aSglStandardPB; + FixedText aSglStartExFT; + FixedText aSglEndQuoteFT; + PushButton aSglEndQuotePB; + FixedText aSglEndExFT; + PushButton aSglStandardPB; - FixedLine aDoubleFL; + FixedLine aDoubleFL; CheckBox aTypoCB; - FixedText aStartQuoteFT; + FixedText aStartQuoteFT; PushButton aStartQuotePB; - FixedText aDblStartExFT; - FixedText aEndQuoteFT; - PushButton aEndQuotePB; - FixedText aDblEndExFT; - PushButton aDblStandardPB; + FixedText aDblStartExFT; + FixedText aEndQuoteFT; + PushButton aEndQuotePB; + FixedText aDblEndExFT; + PushButton aDblStandardPB; - String sStartQuoteDlg; - String sEndQuoteDlg; + String sStartQuoteDlg; + String sEndQuoteDlg; - String sStandard; + String sStandard; - sal_UCS4 cSglStartQuote; - sal_UCS4 cSglEndQuote; + sal_UCS4 cSglStartQuote; + sal_UCS4 cSglEndQuote; - sal_UCS4 cStartQuote; - sal_UCS4 cEndQuote; + sal_UCS4 cStartQuote; + sal_UCS4 cEndQuote; DECL_LINK( QuoteHdl, PushButton* ); DECL_LINK( StdQuoteHdl, PushButton* ); - String ChangeStringExt_Impl( sal_UCS4 ); + String ChangeStringExt_Impl( sal_UCS4 ); SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); @@ -386,12 +386,12 @@ private: public: ~OfaQuoteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; // class OfaAutoCompleteTabPage --------------------------------------------- @@ -420,15 +420,15 @@ class OfaAutoCompleteTabPage : public SfxTabPage //--removed--CheckBox aCBEndless;// FixedText aFTExpandKey; - ListBox aDCBExpandKey; + ListBox aDCBExpandKey; FixedText aFTMinWordlen; NumericField aNFMinWordlen; FixedText aFTMaxEntries; NumericField aNFMaxEntries; AutoCompleteMultiListBox aLBEntries; - PushButton aPBEntries; - SvStringsISortDtor* pAutoCmpltList; - USHORT nAutoCmpltListCnt; + PushButton aPBEntries; + SvStringsISortDtor* pAutoCmpltList; + USHORT nAutoCmpltListCnt; DECL_LINK( CheckHdl, CheckBox* ); @@ -437,12 +437,12 @@ class OfaAutoCompleteTabPage : public SfxTabPage public: virtual ~OfaAutoCompleteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); void CopyToClipboard() const; DECL_LINK( DeleteHdl, PushButton* ); @@ -459,23 +459,23 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage using TabPage::ActivatePage; private: - + // controls - CheckBox m_aMainCB; - SvxCheckListBox m_aSmartTagTypesLB; - PushButton m_aPropertiesPB; - FixedText m_aTitleFT; + CheckBox m_aMainCB; + SvxCheckListBox m_aSmartTagTypesLB; + PushButton m_aPropertiesPB; + FixedText m_aTitleFT; // construction via Create() - OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); - + OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + /** Inserts items into m_aSmartTagTypesLB - + Reads out the smart tag types supported by the SmartTagMgr and inserts the associated strings into the list box. */ void FillListBox( const SmartTagMgr& rSmartTagMgr ); - + /** Clears the m_aSmartTagTypesLB */ void ClearListBox(); @@ -486,7 +486,7 @@ private: check box. */ DECL_LINK( CheckHdl, CheckBox* ); - + /** Handler for the push button Calls the displayPropertyPage function of the smart tag recognizer @@ -500,16 +500,16 @@ private: smart tag types list box changes. */ DECL_LINK( SelectHdl, SvxCheckListBox* ); - + public: virtual ~OfaSmartTagOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& ); }; #endif // _OFA_AUTOCDLG_CXX diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index ce6eccbfa78f..9ec0548b8e30 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public: void ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle) void ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen) void EnableTransparency(BOOL bColor, BOOL bGraphic); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -82,7 +82,7 @@ private: ~SvxBackgroundTabPage(); // Hintergrundfarbe ------------------------------------ - Control aBorderWin; + Control aBorderWin; ValueSet aBackgroundColorSet; FixedLine aBackgroundColorBox; BackgroundPreviewImpl* pPreviewWin1; @@ -115,14 +115,14 @@ private: FixedText aTblDesc; ListBox aTblLBox; - ListBox aParaLBox; + ListBox aParaLBox; //------------------------------------------------------ - Color aBgdColor; - USHORT nHtmlMode; - BOOL bAllowShowSelector : 1; - BOOL bIsGraphicValid : 1; - BOOL bLinkOnly : 1; + Color aBgdColor; + USHORT nHtmlMode; + BOOL bAllowShowSelector : 1; + BOOL bIsGraphicValid : 1; + BOOL bLinkOnly : 1; BOOL bResized : 1; BOOL bColTransparency : 1; BOOL bGraphTransparency : 1; @@ -134,9 +134,9 @@ private: SvxOpenGraphicDialog* pImportDlg; // Items fuer Sw-Tabelle muessen gesammelt werden - SvxBackgroundTable_Impl* pTableBck_Impl; + SvxBackgroundTable_Impl* pTableBck_Impl; // auch fuer die Absatzvorlage - SvxBackgroundPara_Impl* pParaBck_Impl; + SvxBackgroundPara_Impl* pParaBck_Impl; #ifdef _SVX_BACKGRND_CXX void FillColorValueSets_Impl(); @@ -146,10 +146,10 @@ private: void RaiseLoadError_Impl(); void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); SvxGraphicPosition GetGraphicPosition_Impl(); - void FillControls_Impl(const SvxBrushItem& rBgdAttr, + void FillControls_Impl(const SvxBrushItem& rBgdAttr, const String& rUserData); - BOOL FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot); - void ResetFromWallpaperItem( const SfxItemSet& rSet ); + BOOL FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot); + void ResetFromWallpaperItem( const SfxItemSet& rSet ); DECL_LINK( LoadTimerHdl_Impl, Timer* ); DECL_LINK( SelectHdl_Impl, ListBox* ); diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 73f3bc66a122..08bb80b17d2e 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,23 +33,23 @@ #include <sfx2/tabdlg.hxx> /*-------------------------------------------------------------------- - Beschreibung: Border Background Pages buendeln + Beschreibung: Border Background Pages buendeln --------------------------------------------------------------------*/ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg( Window *pParent, + SvxBorderBackgroundDlg( Window *pParent, const SfxItemSet& rCoreSet, BOOL bEnableSelector = FALSE ); ~SvxBorderBackgroundDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); private: - BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg + BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg }; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 7b4e7fab3b62..48ef3eef690f 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,17 +51,17 @@ class SvxBorderTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rCoreAttrs ); - virtual void Reset( const SfxItemSet& ); + virtual BOOL FillItemSet( SfxItemSet& rCoreAttrs ); + virtual void Reset( const SfxItemSet& ); - void HideShadowControls(); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void HideShadowControls(); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: @@ -69,38 +69,38 @@ private: ~SvxBorderTabPage(); // Controls - FixedLine aFlBorder; + FixedLine aFlBorder; FixedText aDefaultFT; ValueSet aWndPresets; FixedText aUserDefFT; svx::FrameSelector aFrameSel; FixedLine aFlSep1; - FixedLine aFlLine; + FixedLine aFlLine; FixedText aStyleFT; LineListBox aLbLineStyle; FixedText aColorFT; - ColorListBox aLbLineColor; + ColorListBox aLbLineColor; FixedLine aFlSep2; - FixedLine aDistanceFL; - FixedText aLeftFT; - MetricField aLeftMF; - FixedText aRightFT; - MetricField aRightMF; - FixedText aTopFT; - MetricField aTopMF; - FixedText aBottomFT; - MetricField aBottomMF; - CheckBox aSynchronizeCB; - - FixedLine aFlShadow; - FixedText aFtShadowPos; - ValueSet aWndShadows; - FixedText aFtShadowSize; - MetricField aEdShadowSize; - FixedText aFtShadowColor; - ColorListBox aLbShadowColor; + FixedLine aDistanceFL; + FixedText aLeftFT; + MetricField aLeftMF; + FixedText aRightFT; + MetricField aRightMF; + FixedText aTopFT; + MetricField aTopMF; + FixedText aBottomFT; + MetricField aBottomMF; + CheckBox aSynchronizeCB; + + FixedLine aFlShadow; + FixedText aFtShadowPos; + ValueSet aWndShadows; + FixedText aFtShadowSize; + MetricField aEdShadowSize; + FixedText aFtShadowColor; + ColorListBox aLbShadowColor; //properties - "Merge with next paragraph" in Writer FixedLine aPropertiesFL; @@ -114,8 +114,8 @@ private: ImageList aBorderImgLstH; ImageList aBorderImgLst; - long nMinValue; // minimum distance - int nSWMode; // table, textframe, paragraph + long nMinValue; // minimum distance + int nSWMode; // table, textframe, paragraph bool mbHorEnabled; /// true = Inner horizontal border enabled. bool mbVerEnabled; /// true = Inner vertical border enabled. @@ -123,7 +123,7 @@ private: bool mbBLTREnabled; /// true = Bottom-left to top-right border enabled. bool mbUseMarginItem; - static BOOL bSync; + static BOOL bSync; #ifdef _SVX_BORDER_CXX // Handler @@ -143,7 +143,7 @@ private: void FillValueSets(); // Filler - void FillLineListBox_Impl(); + void FillLineListBox_Impl(); // Setzen von einzelnen Frame-/Core-Linien void ResetFrameLine_Impl( svx::FrameBorderType eBorder, diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 5a84b2a98c14..ccc45bba70d0 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #include <sfx2/tabdlg.hxx> #include <vector> @@ -78,8 +78,8 @@ public: void ActivateTabPage( USHORT ); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual short Ok(); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); }; @@ -88,10 +88,10 @@ class SaveInData : public ImageProvider { private: - bool bModified; + bool bModified; - bool bDocConfig; - bool bReadOnly; + bool bDocConfig; + bool bReadOnly; ::com::sun::star::uno::Reference < com::sun::star::ui::XUIConfigurationManager > m_xCfgMgr; @@ -137,7 +137,7 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager > GetParentConfigManager() { return m_xParentCfgMgr; }; - + ::com::sun::star::uno::Reference < ::com::sun::star::ui::XImageManager > GetImageManager() { return m_xImgMgr; }; @@ -172,13 +172,13 @@ class MenuSaveInData : public SaveInData { private: - rtl::OUString m_aMenuResourceURL; - rtl::OUString m_aDescriptorContainer; + rtl::OUString m_aMenuResourceURL; + rtl::OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess > m_xMenuSettings; - SvxConfigEntry* pRootEntry; + SvxConfigEntry* pRootEntry; // static holder of the default menu data static MenuSaveInData* pDefaultData; @@ -186,9 +186,9 @@ private: static void SetDefaultData( MenuSaveInData* pData ) {pDefaultData = pData;} static MenuSaveInData* GetDefaultData() { return pDefaultData; } - void Apply( bool bDefault ); + void Apply( bool bDefault ); - void Apply( + void Apply( SvxConfigEntry* pRootEntry, com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, @@ -196,14 +196,14 @@ private: com::sun::star::lang::XSingleComponentFactory >& rFactory, SvLBoxEntry *pParent = NULL ); - void ApplyMenu( + void ApplyMenu( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >& rFactory, SvxConfigEntry *pMenuData = NULL ); - bool LoadSubMenus( + bool LoadSubMenus( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, const rtl::OUString& rBaseTitle, SvxConfigEntry* pParentData ); @@ -221,12 +221,12 @@ public: ~MenuSaveInData(); // methods inherited from SaveInData - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; } - bool HasSettings() { return m_xMenuSettings.is(); } - void Reset(); - bool Apply(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + bool HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; } + bool HasSettings() { return m_xMenuSettings.is(); } + void Reset(); + bool Apply(); }; class SvxConfigEntry @@ -234,28 +234,28 @@ class SvxConfigEntry private: // common properties - USHORT nId; - ::rtl::OUString aHelpText; - ::rtl::OUString aLabel; - ::rtl::OUString aCommand; - ::rtl::OUString aHelpURL; + USHORT nId; + ::rtl::OUString aHelpText; + ::rtl::OUString aLabel; + ::rtl::OUString aCommand; + ::rtl::OUString aHelpURL; bool bPopUp; bool bStrEdited; - bool bIsUserDefined; - bool bIsMain; - bool bIsDeletable; - bool bIsMovable; + bool bIsUserDefined; + bool bIsMain; + bool bIsDeletable; + bool bIsMovable; bool bIsParentData; // toolbar specific properties - bool bIsVisible; - sal_Int32 nStyle; + bool bIsVisible; + sal_Int32 nStyle; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xBackupGraphic; - SvxEntries *pEntries; + SvxEntries *pEntries; public: @@ -271,7 +271,7 @@ public: bool bParentData = FALSE ); SvxConfigEntry() - : + : nId( 0 ), bPopUp( FALSE ), bStrEdited( FALSE ), @@ -285,46 +285,46 @@ public: ~SvxConfigEntry(); - const ::rtl::OUString& GetCommand() const { return aCommand; } - void SetCommand( const String& rCmd ) { aCommand = rCmd; } + const ::rtl::OUString& GetCommand() const { return aCommand; } + void SetCommand( const String& rCmd ) { aCommand = rCmd; } - const ::rtl::OUString& GetName() const { return aLabel; } - void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; } - bool HasChangedName() const { return bStrEdited; } + const ::rtl::OUString& GetName() const { return aLabel; } + void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; } + bool HasChangedName() const { return bStrEdited; } - const ::rtl::OUString& GetHelpText() ; - void SetHelpText( const String& rStr ) { aHelpText = rStr; } + const ::rtl::OUString& GetHelpText() ; + void SetHelpText( const String& rStr ) { aHelpText = rStr; } - const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } - void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } + const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } + void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } - void SetPopup( bool bOn = TRUE ) { bPopUp = bOn; } - bool IsPopup() const { return bPopUp; } + void SetPopup( bool bOn = TRUE ) { bPopUp = bOn; } + bool IsPopup() const { return bPopUp; } - void SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; } - bool IsUserDefined() const { return bIsUserDefined; } + void SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; } + bool IsUserDefined() const { return bIsUserDefined; } - bool IsBinding() const { return !bPopUp; } - bool IsSeparator() const { return nId == 0; } + bool IsBinding() const { return !bPopUp; } + bool IsSeparator() const { return nId == 0; } - SvxEntries* GetEntries() const { return pEntries; } - void SetEntries( SvxEntries* entries ) { pEntries = entries; } - bool HasEntries() const { return pEntries != NULL; } + SvxEntries* GetEntries() const { return pEntries; } + void SetEntries( SvxEntries* entries ) { pEntries = entries; } + bool HasEntries() const { return pEntries != NULL; } - void SetMain( bool bValue = TRUE ) { bIsMain = bValue; } - bool IsMain() { return bIsMain; } + void SetMain( bool bValue = TRUE ) { bIsMain = bValue; } + bool IsMain() { return bIsMain; } void SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; } bool IsParentData() { return bIsParentData; } - bool IsMovable(); - bool IsDeletable(); - bool IsRenamable(); + bool IsMovable(); + bool IsDeletable(); + bool IsRenamable(); - void SetVisible( bool b ) { bIsVisible = b; } - bool IsVisible() const { return bIsVisible; } + void SetVisible( bool b ) { bIsVisible = b; } + bool IsVisible() const { return bIsVisible; } - void SetBackupGraphic( + void SetBackupGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > graphic ) { xBackupGraphic = graphic; } @@ -334,10 +334,10 @@ public: GetBackupGraphic() { return xBackupGraphic; } - bool IsIconModified() { return xBackupGraphic.is(); } + bool IsIconModified() { return xBackupGraphic.is(); } - sal_Int32 GetStyle() { return nStyle; } - void SetStyle( sal_Int32 style ) { nStyle = style; } + sal_Int32 GetStyle() { return nStyle; } + void SetStyle( sal_Int32 style ) { nStyle = style; } com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetProperties( @@ -348,38 +348,38 @@ public: class SvxMenuEntriesListBox : public SvTreeListBox { private: - SvxConfigPage* pPage; + SvxConfigPage* pPage; protected: - bool m_bIsInternalDrag; + bool m_bIsInternalDrag; public: SvxMenuEntriesListBox( Window*, const ResId& ); ~SvxMenuEntriesListBox(); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); + virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); - virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, + virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& ); - virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, + virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&); - virtual DragDropMode NotifyStartDrag( + virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ); - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ); }; class SvxDescriptionEdit : public ExtMultiLineEdit { private: Rectangle m_aRealRect; - + public: SvxDescriptionEdit( Window* pParent, const ResId& _rId ); inline ~SvxDescriptionEdit() {} @@ -392,8 +392,8 @@ class SvxConfigPage : public SfxTabPage { private: - bool bInitialised; - SaveInData* pCurrentSaveInData; + bool bInitialised; + SaveInData* pCurrentSaveInData; DECL_LINK( SelectSaveInLocation, ListBox * ); DECL_LINK( AsyncInfoMsg, String* ); @@ -405,34 +405,34 @@ protected: // the top section of the tab page where top level menus and toolbars // are displayed in a listbox - FixedLine aTopLevelSeparator; - FixedText aTopLevelLabel; - ListBox aTopLevelListBox; - PushButton aNewTopLevelButton; - MenuButton aModifyTopLevelButton; + FixedLine aTopLevelSeparator; + FixedText aTopLevelLabel; + ListBox aTopLevelListBox; + PushButton aNewTopLevelButton; + MenuButton aModifyTopLevelButton; // the contents section where the contents of the selected // menu or toolbar are displayed - FixedLine aContentsSeparator; - FixedText aContentsLabel; - SvTreeListBox* aContentsListBox; + FixedLine aContentsSeparator; + FixedText aContentsLabel; + SvTreeListBox* aContentsListBox; - PushButton aAddCommandsButton; - MenuButton aModifyCommandButton; + PushButton aAddCommandsButton; + MenuButton aModifyCommandButton; - ImageButton aMoveUpButton; - ImageButton aMoveDownButton; + ImageButton aMoveUpButton; + ImageButton aMoveDownButton; - FixedText aSaveInText; - ListBox aSaveInListBox; + FixedText aSaveInText; + ListBox aSaveInListBox; FixedText aDescriptionLabel; SvxDescriptionEdit aDescriptionField; - SvxScriptSelectorDialog* pSelectorDlg; + SvxScriptSelectorDialog* pSelectorDlg; // the ResourceURL to select when opening the dialog - rtl::OUString m_aURLToSelect; + rtl::OUString m_aURLToSelect; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -450,49 +450,49 @@ protected: const rtl::OUString& aModuleId, bool docConfig ) = 0; - virtual void Init() = 0; - virtual void UpdateButtonStates() = 0; - virtual short QueryReset() = 0; + virtual void Init() = 0; + virtual void UpdateButtonStates() = 0; + virtual short QueryReset() = 0; - void PositionContentsListBox(); + void PositionContentsListBox(); - SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData, + SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData, SvLBoxEntry* pTarget = NULL, bool bFront = FALSE ); - void AddSubMenusToUI( const String& rBaseTitle, + void AddSubMenusToUI( const String& rBaseTitle, SvxConfigEntry* pParentData ); - SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, + SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData, ULONG nPos = LIST_APPEND ); - SvxEntries* FindParentForChild( SvxEntries* pParentEntries, + SvxEntries* FindParentForChild( SvxEntries* pParentEntries, SvxConfigEntry* pChildData ); - void ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL ); + void ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL ); public: - static bool CanConfig( const ::rtl::OUString& rModuleId ); + static bool CanConfig( const ::rtl::OUString& rModuleId ); - SaveInData* GetSaveInData() { return pCurrentSaveInData; } + SaveInData* GetSaveInData() { return pCurrentSaveInData; } - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, bool bFront = FALSE, bool bAllowDuplicates = FALSE ); - virtual void MoveEntry( bool bMoveUp ); + virtual void MoveEntry( bool bMoveUp ); - bool MoveEntryData( SvLBoxEntry* pSourceEntry, + bool MoveEntryData( SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry ); - BOOL FillItemSet( SfxItemSet& ); - void Reset( const SfxItemSet& ); + BOOL FillItemSet( SfxItemSet& ); + void Reset( const SfxItemSet& ); - virtual bool DeleteSelectedContent() = 0; - virtual void DeleteSelectedTopLevel() = 0; + virtual bool DeleteSelectedContent() = 0; + virtual void DeleteSelectedTopLevel() = 0; - SvxConfigEntry* GetTopLevelSelection() + SvxConfigEntry* GetTopLevelSelection() { return (SvxConfigEntry*) aTopLevelListBox.GetEntryData( aTopLevelListBox.GetSelectEntryPos() ); @@ -524,11 +524,11 @@ private: DECL_LINK( AddCommandsHdl, Button * ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); - void Init(); - void UpdateButtonStates(); - short QueryReset(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void Init(); + void UpdateButtonStates(); + short QueryReset(); + bool DeleteSelectedContent(); + void DeleteSelectedTopLevel(); public: SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); @@ -545,19 +545,19 @@ public: class SvxMainMenuOrganizerDialog : public ModalDialog { - FixedText aMenuNameText; - Edit aMenuNameEdit; - FixedText aMenuListText; - SvTreeListBox aMenuListBox; - ImageButton aMoveUpButton; - ImageButton aMoveDownButton; - OKButton aOKButton; - CancelButton aCloseButton; - HelpButton aHelpButton; - - SvxEntries* pEntries; - SvLBoxEntry* pNewMenuEntry; - bool bModified; + FixedText aMenuNameText; + Edit aMenuNameEdit; + FixedText aMenuListText; + SvTreeListBox aMenuListBox; + ImageButton aMoveUpButton; + ImageButton aMoveDownButton; + OKButton aOKButton; + CancelButton aCloseButton; + HelpButton aHelpButton; + + SvxEntries* pEntries; + SvLBoxEntry* pNewMenuEntry; + bool bModified; void UpdateButtonStates(); @@ -572,27 +572,27 @@ public: ~SvxMainMenuOrganizerDialog (); - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - SvxConfigEntry* GetSelectedEntry(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + SvxConfigEntry* GetSelectedEntry(); }; class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox { - Size m_aCheckBoxImageSizePixel; - Link m_aChangedListener; - SvLBoxButtonData* m_pButtonData; - BOOL m_bHiContrastMode; - SvxConfigPage* pPage; + Size m_aCheckBoxImageSizePixel; + Link m_aChangedListener; + SvLBoxButtonData* m_pButtonData; + BOOL m_bHiContrastMode; + SvxConfigPage* pPage; - void ChangeVisibility( SvLBoxEntry* pEntry ); + void ChangeVisibility( SvLBoxEntry* pEntry ); protected: - virtual void CheckButtonHdl(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void BuildCheckBoxButtonImages( SvLBoxButtonData* ); - Image GetSizedImage( + virtual void CheckButtonHdl(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void BuildCheckBoxButtonImages( SvLBoxButtonData* ); + Image GetSizedImage( VirtualDevice& aDev, const Size& aNewSize, const Image& aImage ); public: @@ -602,21 +602,21 @@ public: ~SvxToolbarEntriesListBox(); - void SetChangedListener( const Link& aChangedListener ) + void SetChangedListener( const Link& aChangedListener ) { m_aChangedListener = aChangedListener; } - const Link& GetChangedListener() const { return m_aChangedListener; } + const Link& GetChangedListener() const { return m_aChangedListener; } - Size GetCheckBoxPixelSize() const + Size GetCheckBoxPixelSize() const { return m_aCheckBoxImageSizePixel; } - virtual BOOL NotifyMoving( + virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& ); - virtual BOOL NotifyCopying( + virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&); - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ); }; class SvxToolbarConfigPage : public SvxConfigPage @@ -632,23 +632,23 @@ private: DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); DECL_LINK( MoveHdl, Button * ); - void UpdateButtonStates(); - short QueryReset(); - void Init(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void UpdateButtonStates(); + short QueryReset(); + void Init(); + bool DeleteSelectedContent(); + void DeleteSelectedTopLevel(); public: SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); ~SvxToolbarConfigPage(); - SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, + SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL, bool bFront = FALSE, bool bAllowDuplicates = TRUE ); - void MoveEntry( bool bMoveUp ); + void MoveEntry( bool bMoveUp ); - SaveInData* CreateSaveInData( + SaveInData* CreateSaveInData( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < @@ -661,18 +661,18 @@ class ToolbarSaveInData : public SaveInData { private: - SvxConfigEntry* pRootEntry; - rtl::OUString m_aDescriptorContainer; + SvxConfigEntry* pRootEntry; + rtl::OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess > m_xPersistentWindowState; - bool LoadToolbar( + bool LoadToolbar( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xToolBarSettings, SvxConfigEntry* pParentData ); - void ApplyToolbar( + void ApplyToolbar( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewToolbarBar, com::sun::star::uno::Reference< @@ -691,41 +691,41 @@ public: ~ToolbarSaveInData(); - void CreateToolbar( SvxConfigEntry* pToolbar ); - void RestoreToolbar( SvxConfigEntry* pToolbar ); - void RemoveToolbar( SvxConfigEntry* pToolbar ); - void ApplyToolbar( SvxConfigEntry* pToolbar ); - void ReloadToolbar( const rtl::OUString& rURL ); + void CreateToolbar( SvxConfigEntry* pToolbar ); + void RestoreToolbar( SvxConfigEntry* pToolbar ); + void RemoveToolbar( SvxConfigEntry* pToolbar ); + void ApplyToolbar( SvxConfigEntry* pToolbar ); + void ReloadToolbar( const rtl::OUString& rURL ); - rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); + rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); - sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); + sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); - void SetSystemStyle( + void SetSystemStyle( const rtl::OUString& rResourceURL, sal_Int32 nStyle ); - void SetSystemStyle( + void SetSystemStyle( ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame, const rtl::OUString& rResourceURL, sal_Int32 nStyle ); - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasSettings(); - bool HasURL( const rtl::OUString& rURL ); - void Reset(); - bool Apply(); + SvxEntries* GetEntries(); + void SetEntries( SvxEntries* ); + bool HasSettings(); + bool HasURL( const rtl::OUString& rURL ); + void Reset(); + bool Apply(); }; class SvxNewToolbarDialog : public ModalDialog { private: - FixedText aFtDescription; - Edit aEdtName; - FixedText aSaveInText; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDescription; + Edit aEdtName; + FixedText aSaveInText; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Link aCheckNameHdl; @@ -734,7 +734,7 @@ private: public: SvxNewToolbarDialog( Window* pWindow, const String& rName ); - ListBox aSaveInListBox; + ListBox aSaveInListBox; void GetName( rtl::OUString& rName ){rName = aEdtName.GetText();} @@ -751,18 +751,18 @@ public: class SvxIconSelectorDialog : public ModalDialog { private: - FixedText aFtDescription; - ToolBox aTbSymbol; - FixedText aFtNote; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnImport; - PushButton aBtnDelete; + FixedText aFtDescription; + ToolBox aTbSymbol; + FixedText aFtNote; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnImport; + PushButton aBtnDelete; FixedLine aFlSeparator; sal_uInt16 m_nNextId; - sal_Int32 m_nExpectedSize; + sal_Int32 m_nExpectedSize; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xImageManager; @@ -771,13 +771,13 @@ private: ::com::sun::star::ui::XImageManager > m_xParentImageManager; ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager > m_xImportedImageManager; + ::com::sun::star::ui::XImageManager > m_xImportedImageManager; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider; - + bool ReplaceGraphicItem( const ::rtl::OUString& aURL ); - + bool ImportGraphic( const ::rtl::OUString& aURL ); void ImportGraphics( @@ -792,8 +792,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >& rXImageManager, const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager >& rXParentImageManager - ); + ::com::sun::star::ui::XImageManager >& rXParentImageManager + ); ~SvxIconSelectorDialog(); @@ -802,19 +802,19 @@ public: DECL_LINK( SelectHdl, ToolBox * ); DECL_LINK( ImportHdl, PushButton * ); - DECL_LINK( DeleteHdl, PushButton * ); + DECL_LINK( DeleteHdl, PushButton * ); }; class SvxIconReplacementDialog : public MessBox { public: - SvxIconReplacementDialog( - Window *pWindow, + SvxIconReplacementDialog( + Window *pWindow, const rtl::OUString& aMessage, bool aYestoAll); - SvxIconReplacementDialog( - Window *pWindow, + SvxIconReplacementDialog( + Window *pWindow, const rtl::OUString& aMessage ); rtl::OUString ReplaceIconName( const rtl::OUString& ); @@ -824,8 +824,8 @@ public: class SvxIconChangeDialog : public ModalDialog { private: - FixedImage aFImageInfo; - OKButton aBtnOK; + FixedImage aFImageInfo; + OKButton aBtnOK; FixedText aDescriptionLabel; SvxDescriptionEdit aLineEditDescription; public: diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index db8d4740b054..7d14afebacf8 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/timer.hxx> #include <svtools/svtabbx.hxx> @@ -110,10 +110,10 @@ struct SfxStylesInfo_Impl struct SfxGroupInfo_Impl { - USHORT nKind; - USHORT nOrd; - void* pObject; - BOOL bWasOpened; + USHORT nKind; + USHORT nOrd; + void* pObject; + BOOL bWasOpened; String sCommand; String sLabel; @@ -143,7 +143,7 @@ public: SvLBoxEntry* GetEntry_Impl( USHORT nId ); SvLBoxEntry* GetEntry_Impl( const String& ); USHORT GetId( SvLBoxEntry *pEntry ); - using Window::GetHelpText; + using Window::GetHelpText; String GetHelpText( SvLBoxEntry *pEntry ); USHORT GetCurId() { return GetId( FirstSelected() ); } String GetCurCommand(); @@ -156,7 +156,7 @@ public: struct SvxConfigGroupBoxResource_Impl; class SfxConfigGroupListBox_Impl : public SvTreeListBox { - SvxConfigGroupBoxResource_Impl* pImp; + SvxConfigGroupBoxResource_Impl* pImp; //SfxSlotPool* pSlotPool; SfxConfigFunctionListBox_Impl* pFunctionListBox; SfxGroupInfoArr_Impl aArr; @@ -191,7 +191,7 @@ protected: public: SfxConfigGroupListBox_Impl ( Window* pParent, - const ResId&, + const ResId&, ULONG nConfigMode = 0 ); ~SfxConfigGroupListBox_Impl(); void ClearAll(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 494d77bf7f13..49169b084ea7 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,43 +44,43 @@ class FontList; // ----------------------------------------------------------------------- -#define DISABLE_CASEMAP ((USHORT)0x0001) -#define DISABLE_WORDLINE ((USHORT)0x0002) -#define DISABLE_BLINK ((USHORT)0x0004) -#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) +#define DISABLE_CASEMAP ((USHORT)0x0001) +#define DISABLE_WORDLINE ((USHORT)0x0002) +#define DISABLE_BLINK ((USHORT)0x0004) +#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) -#define DISABLE_LANGUAGE ((USHORT)0x0010) -#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) +#define DISABLE_LANGUAGE ((USHORT)0x0010) +#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) // class SvxCharBasePage ------------------------------------------------- class SvxCharBasePage : public SfxTabPage { protected: - SvxFontPrevWindow m_aPreviewWin; - FixedInfo m_aFontTypeFT; + SvxFontPrevWindow m_aPreviewWin; + FixedInfo m_aFontTypeFT; - BOOL m_bPreviewBackgroundToCharacter; + BOOL m_bPreviewBackgroundToCharacter; SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&, USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT ); - virtual ~SvxCharBasePage(); + virtual ~SvxCharBasePage(); - void SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); - void SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); - void SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight - void SetPrevFontWidthScale( const SfxItemSet& rSet ); + void SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); + void SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont ); + void SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight + void SetPrevFontWidthScale( const SfxItemSet& rSet ); - void SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc ); + void SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc ); - inline SvxFont& GetPreviewFont(); - inline SvxFont& GetPreviewCJKFont(); - inline SvxFont& GetPreviewCTLFont(); + inline SvxFont& GetPreviewFont(); + inline SvxFont& GetPreviewCJKFont(); + inline SvxFont& GetPreviewCTLFont(); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); // virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -128,12 +128,12 @@ private: FixedText* m_pColorFT; ColorListBox* m_pColorLB; - SvxCharNamePage_Impl* m_pImpl; + SvxCharNamePage_Impl* m_pImpl; SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); - const FontList* GetFontList() const; + void Initialize(); + const FontList* GetFontList() const; void UpdatePreview_Impl(); void FillStyleBox_Impl( const FontNameBox* rBox ); void FillSizeBox_Impl( const FontNameBox* rBox ); @@ -153,19 +153,19 @@ private: Ctl }; - void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); - BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); + void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); + BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); + void ResetColor_Impl( const SfxItemSet& rSet ); + BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); - DECL_LINK( UpdateHdl_Impl, Timer* ); - DECL_LINK( FontModifyHdl_Impl, void* ); - DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); + DECL_LINK( UpdateHdl_Impl, Timer* ); + DECL_LINK( FontModifyHdl_Impl, void* ); + DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -180,12 +180,12 @@ public: void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); - void EnableSearchMode(); + void EnableSearchMode(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); void DisableControls( USHORT nDisable ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharEffectsPage ---------------------------------------------- @@ -194,64 +194,64 @@ class SvxCharEffectsPage : public SvxCharBasePage { private: - FixedText m_aFontColorFT; - ColorListBox m_aFontColorLB; + FixedText m_aFontColorFT; + ColorListBox m_aFontColorLB; - FixedText m_aEffectsFT; - SvxCheckListBox m_aEffectsLB; + FixedText m_aEffectsFT; + SvxCheckListBox m_aEffectsLB; - ListBox m_aEffects2LB; + ListBox m_aEffects2LB; FixedText m_aReliefFT; ListBox m_aReliefLB; TriStateBox m_aOutlineBtn; - TriStateBox m_aShadowBtn; - TriStateBox m_aBlinkingBtn; + TriStateBox m_aShadowBtn; + TriStateBox m_aBlinkingBtn; TriStateBox m_aHiddenBtn; - FixedLine m_aVerticalLine; + FixedLine m_aVerticalLine; - FixedText m_aOverlineFT; - ListBox m_aOverlineLB; - FixedText m_aOverlineColorFT; - ColorListBox m_aOverlineColorLB; + FixedText m_aOverlineFT; + ListBox m_aOverlineLB; + FixedText m_aOverlineColorFT; + ColorListBox m_aOverlineColorLB; - FixedText m_aStrikeoutFT; - ListBox m_aStrikeoutLB; + FixedText m_aStrikeoutFT; + ListBox m_aStrikeoutLB; - FixedText m_aUnderlineFT; - ListBox m_aUnderlineLB; - FixedText m_aUnderlineColorFT; - ColorListBox m_aUnderlineColorLB; + FixedText m_aUnderlineFT; + ListBox m_aUnderlineLB; + FixedText m_aUnderlineColorFT; + ColorListBox m_aUnderlineColorLB; - CheckBox m_aIndividualWordsBtn; + CheckBox m_aIndividualWordsBtn; - FixedLine m_aAsianLine; + FixedLine m_aAsianLine; - FixedText m_aEmphasisFT; - ListBox m_aEmphasisLB; + FixedText m_aEmphasisFT; + ListBox m_aEmphasisLB; - FixedText m_aPositionFT; - ListBox m_aPositionLB; + FixedText m_aPositionFT; + ListBox m_aPositionLB; - USHORT m_nHtmlMode; + USHORT m_nHtmlMode; - String m_aTransparentColorName; + String m_aTransparentColorName; SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); + void Initialize(); void UpdatePreview_Impl(); void SetCaseMap_Impl( SvxCaseMap eCaseMap ); - void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); + void ResetColor_Impl( const SfxItemSet& rSet ); + BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); - DECL_LINK( SelectHdl_Impl, ListBox* ); + DECL_LINK( SelectHdl_Impl, ListBox* ); DECL_LINK( CbClickHdl_Impl, CheckBox* ); DECL_LINK( TristClickHdl_Impl, TriStateBox* ); - DECL_LINK( UpdatePreview_Impl, ListBox* ); - DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); + DECL_LINK( UpdatePreview_Impl, ListBox* ); + DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); public: // using SfxTabPage::ActivatePage; @@ -271,7 +271,7 @@ public: void EnableFlash(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharPositionPage --------------------------------------------- @@ -280,60 +280,60 @@ class SvxCharPositionPage : public SvxCharBasePage { private: - FixedLine m_aPositionLine; - RadioButton m_aHighPosBtn; - RadioButton m_aNormalPosBtn; - RadioButton m_aLowPosBtn; - FixedText m_aHighLowFT; - MetricField m_aHighLowEdit; - CheckBox m_aHighLowRB; - FixedText m_aFontSizeFT; - MetricField m_aFontSizeEdit; - FixedLine m_aRotationScalingFL; - FixedLine m_aScalingFL; - RadioButton m_a0degRB; - RadioButton m_a90degRB; - RadioButton m_a270degRB; - CheckBox m_aFitToLineCB; - FixedText m_aScaleWidthFT; - MetricField m_aScaleWidthMF; - - FixedLine m_aKerningLine; - ListBox m_aKerningLB; - FixedText m_aKerningFT; - MetricField m_aKerningEdit; - CheckBox m_aPairKerningBtn; + FixedLine m_aPositionLine; + RadioButton m_aHighPosBtn; + RadioButton m_aNormalPosBtn; + RadioButton m_aLowPosBtn; + FixedText m_aHighLowFT; + MetricField m_aHighLowEdit; + CheckBox m_aHighLowRB; + FixedText m_aFontSizeFT; + MetricField m_aFontSizeEdit; + FixedLine m_aRotationScalingFL; + FixedLine m_aScalingFL; + RadioButton m_a0degRB; + RadioButton m_a90degRB; + RadioButton m_a270degRB; + CheckBox m_aFitToLineCB; + FixedText m_aScaleWidthFT; + MetricField m_aScaleWidthMF; + + FixedLine m_aKerningLine; + ListBox m_aKerningLB; + FixedText m_aKerningFT; + MetricField m_aKerningEdit; + CheckBox m_aPairKerningBtn; short m_nSuperEsc; short m_nSubEsc; - UINT16 m_nScaleWidthItemSetVal; - UINT16 m_nScaleWidthInitialVal; + UINT16 m_nScaleWidthItemSetVal; + UINT16 m_nScaleWidthInitialVal; BYTE m_nSuperProp; BYTE m_nSubProp; SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet ); - void Initialize(); + void Initialize(); void UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc ); void SetEscapement_Impl( USHORT nEsc ); - DECL_LINK( PositionHdl_Impl, RadioButton* ); - DECL_LINK( RotationHdl_Impl, RadioButton* ); - DECL_LINK( FontModifyHdl_Impl, MetricField* ); - DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); - DECL_LINK( FitToLineHdl_Impl, CheckBox* ); - DECL_LINK( KerningSelectHdl_Impl, ListBox* ); - DECL_LINK( KerningModifyHdl_Impl, MetricField* ); - DECL_LINK( PairKerningHdl_Impl, CheckBox* ); - DECL_LINK( LoseFocusHdl_Impl, MetricField* ); - DECL_LINK( ScaleWidthModifyHdl_Impl, MetricField* ); + DECL_LINK( PositionHdl_Impl, RadioButton* ); + DECL_LINK( RotationHdl_Impl, RadioButton* ); + DECL_LINK( FontModifyHdl_Impl, MetricField* ); + DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); + DECL_LINK( FitToLineHdl_Impl, CheckBox* ); + DECL_LINK( KerningSelectHdl_Impl, ListBox* ); + DECL_LINK( KerningModifyHdl_Impl, MetricField* ); + DECL_LINK( PairKerningHdl_Impl, CheckBox* ); + DECL_LINK( LoseFocusHdl_Impl, MetricField* ); + DECL_LINK( ScaleWidthModifyHdl_Impl, MetricField* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -346,7 +346,7 @@ public: virtual void FillUserData(); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; // class SvxCharTwoLinesPage --------------------------------------------- @@ -354,32 +354,32 @@ public: class SvxCharTwoLinesPage : public SvxCharBasePage { private: - FixedLine m_aSwitchOnLine; - CheckBox m_aTwoLinesBtn; + FixedLine m_aSwitchOnLine; + CheckBox m_aTwoLinesBtn; - FixedLine m_aEncloseLine; - FixedText m_aStartBracketFT; - ListBox m_aStartBracketLB; - FixedText m_aEndBracketFT; - ListBox m_aEndBracketLB; + FixedLine m_aEncloseLine; + FixedText m_aStartBracketFT; + ListBox m_aStartBracketLB; + FixedText m_aEndBracketFT; + ListBox m_aEndBracketLB; - USHORT m_nStartBracketPosition; - USHORT m_nEndBracketPosition; + USHORT m_nStartBracketPosition; + USHORT m_nEndBracketPosition; SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet ); - void UpdatePreview_Impl(); - void Initialize(); - void SelectCharacter( ListBox* pBox ); - void SetBracket( sal_Unicode cBracket, BOOL bStart ); + void UpdatePreview_Impl(); + void Initialize(); + void SelectCharacter( ListBox* pBox ); + void SetBracket( sal_Unicode cBracket, BOOL bStart ); - DECL_LINK( TwoLinesHdl_Impl, CheckBox* ); - DECL_LINK( CharacterMapHdl_Impl, ListBox* ); + DECL_LINK( TwoLinesHdl_Impl, CheckBox* ); + DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - + virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -391,7 +391,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rSet ); // the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; #endif // #ifndef _SVX_CHARDLG_HXX diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 8bceb90b7ff4..7ffbcee8dabc 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,36 +49,36 @@ class SdrView; class SvxConnectionPage : public SfxTabPage { private: - FixedText aFtType; - ListBox aLbType; - - FixedLine aFlDelta; - FixedText aFtLine1; - MetricField aMtrFldLine1; - FixedText aFtLine2; - MetricField aMtrFldLine2; - FixedText aFtLine3; - MetricField aMtrFldLine3; - - FixedLine aFlDistance; - FixedText aFtHorz1; - MetricField aMtrFldHorz1; - FixedText aFtVert1; - MetricField aMtrFldVert1; - FixedText aFtHorz2; - MetricField aMtrFldHorz2; - FixedText aFtVert2; - MetricField aMtrFldVert2; - - SvxXConnectionPreview aCtlPreview; - - const SfxItemSet& rOutAttrs; - SfxItemSet aAttrSet; - const SdrView* pView; - SfxMapUnit eUnit; + FixedText aFtType; + ListBox aLbType; + + FixedLine aFlDelta; + FixedText aFtLine1; + MetricField aMtrFldLine1; + FixedText aFtLine2; + MetricField aMtrFldLine2; + FixedText aFtLine3; + MetricField aMtrFldLine3; + + FixedLine aFlDistance; + FixedText aFtHorz1; + MetricField aMtrFldHorz1; + FixedText aFtVert1; + MetricField aMtrFldVert1; + FixedText aFtHorz2; + MetricField aMtrFldHorz2; + FixedText aFtVert2; + MetricField aMtrFldVert2; + + SvxXConnectionPreview aCtlPreview; + + const SfxItemSet& rOutAttrs; + SfxItemSet aAttrSet; + const SdrView* pView; + SfxMapUnit eUnit; #ifdef _SVX_CONNECT_CXX - void FillTypeLB(); + void FillTypeLB(); DECL_LINK( ChangeAttrHdl_Impl, void * ); #endif @@ -88,15 +88,15 @@ public: SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxConnectionPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 987759813c27..4a3113836008 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include <vcl/ctrl.hxx> #include <vcl/metric.hxx> #include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> +#include <vcl/fixed.hxx> +#include <vcl/lstbox.hxx> #include <sfx2/basedlgs.hxx> #include <svx/charmap.hxx> @@ -94,7 +94,7 @@ friend class SvxCharacterMap; CancelButton aCancelBtn; HelpButton aHelpBtn; PushButton aDeleteBtn; -// PushButton aAssignBtn; +// PushButton aAssignBtn; FixedText aFontText; ListBox aFontLB; FixedText aSubsetText; @@ -102,7 +102,7 @@ friend class SvxCharacterMap; FixedText aSymbolText; SvxShowText aShowChar; FixedText aCharCodeText; -// FixedText aAssignText; +// FixedText aAssignText; Font aFont; BOOL bOne; const SubsetMap* pSubsetMap; @@ -137,10 +137,10 @@ public: String GetCharacters() const; - virtual short Execute(); + virtual short Execute(); }; #endif - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 52e3663707aa..d204247af943 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,59 +68,59 @@ class FmSearchDialog : public ModalDialog // meine ganzen Controls FixedLine m_flSearchFor; - RadioButton m_rbSearchForText; - RadioButton m_rbSearchForNull; - RadioButton m_rbSearchForNotNull; - ComboBox m_cmbSearchText; + RadioButton m_rbSearchForText; + RadioButton m_rbSearchForNull; + RadioButton m_rbSearchForNotNull; + ComboBox m_cmbSearchText; FixedLine m_flWhere; - FixedText m_ftForm; - ListBox m_lbForm; - RadioButton m_rbAllFields; - RadioButton m_rbSingleField; - ListBox m_lbField; + FixedText m_ftForm; + ListBox m_lbForm; + RadioButton m_rbAllFields; + RadioButton m_rbSingleField; + ListBox m_lbField; FixedLine m_flOptions; - FixedText m_ftPosition; - ListBox m_lbPosition; - CheckBox m_cbUseFormat; - CheckBox m_cbCase; - CheckBox m_cbBackwards; - CheckBox m_cbStartOver; - CheckBox m_cbWildCard; - CheckBox m_cbRegular; - CheckBox m_cbApprox; - PushButton m_pbApproxSettings; - CheckBox m_aHalfFullFormsCJK; - CheckBox m_aSoundsLikeCJK; - PushButton m_aSoundsLikeCJKSettings; + FixedText m_ftPosition; + ListBox m_lbPosition; + CheckBox m_cbUseFormat; + CheckBox m_cbCase; + CheckBox m_cbBackwards; + CheckBox m_cbStartOver; + CheckBox m_cbWildCard; + CheckBox m_cbRegular; + CheckBox m_cbApprox; + PushButton m_pbApproxSettings; + CheckBox m_aHalfFullFormsCJK; + CheckBox m_aSoundsLikeCJK; + PushButton m_aSoundsLikeCJKSettings; FixedLine m_flState; - FixedText m_ftRecordLabel; - FixedText m_ftRecord; - FixedText m_ftHint; - PushButton m_pbSearchAgain; - CancelButton m_pbClose; - HelpButton m_pbHelp; + FixedText m_ftRecordLabel; + FixedText m_ftRecord; + FixedText m_ftHint; + PushButton m_pbSearchAgain; + CancelButton m_pbClose; + HelpButton m_pbHelp; String m_sSearch; String m_sCancel; - Window* m_pPreSearchFocus; + Window* m_pPreSearchFocus; - Link m_lnkFoundHandler; // Handler fuer "gefunden" - Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors + Link m_lnkFoundHandler; // Handler fuer "gefunden" + Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors - Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten + Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten // ein 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; + FmSearchEngine* m_pSearchEngine; - Timer m_aDelayedPaint; + Timer m_aDelayedPaint; // siehe EnableSearchUI - ::svxform::FmSearchConfigItem* m_pConfig; + ::svxform::FmSearchConfigItem* m_pConfig; public: - /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in + /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in strContexts stehen (getrennt durch ';'), der Benutzer kann einen davon auswaehlen. Wenn der Benutzer einen Kontext auswaehlt, wird lnkContextSupplier aufgerufen, er bekommt einen Zeiger auf eine FmSearchContext-Struktur, die gefuellt werden muss. diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6254a9150038..6a418c0546c5 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ class TPGalleryThemeProperties; struct FilterEntry { - String aFilterName; + String aFilterName; }; // ---------------- @@ -76,15 +76,15 @@ class SearchThread : public ::osl::Thread { private: - SearchProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; - INetURLObject maStartURL; + SearchProgress* mpProgress; + TPGalleryThemeProperties* mpBrowser; + INetURLObject maStartURL; - void ImplSearch( const INetURLObject& rStartURL, + void ImplSearch( const INetURLObject& rStartURL, const ::std::vector< String >& rFormats, BOOL bRecursive ); - virtual void SAL_CALL run(); + virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); public: @@ -92,7 +92,7 @@ public: SearchThread( SearchProgress* pProgess, TPGalleryThemeProperties* pBrowser, const INetURLObject& rStartURL ); - virtual ~SearchThread(); + virtual ~SearchThread(); }; // ------------------ @@ -103,15 +103,15 @@ class SearchProgress : public ModalDialog { private: - FixedText aFtSearchDir; + FixedText aFtSearchDir; FixedLine aFLSearchDir; - FixedText aFtSearchType; + FixedText aFtSearchType; FixedLine aFLSearchType; - CancelButton aBtnCancel; - SearchThread maSearchThread; + CancelButton aBtnCancel; + SearchThread maSearchThread; DECL_LINK( ClickCancelBtn, void* ); - void Terminate(); + void Terminate(); public: SearchProgress( Window* pParent, const INetURLObject& rStartURL ); @@ -119,10 +119,10 @@ public: DECL_LINK( CleanUpHdl, void* ); - virtual short Execute(); + virtual short Execute(); virtual void StartExecuteModal( const Link& rEndDialogHdl ); - void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); } - void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } + void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); } + void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } }; // -------------- @@ -133,11 +133,11 @@ class TakeThread : public ::osl::Thread { private: - TakeProgress* mpProgress; - TPGalleryThemeProperties* mpBrowser; - List& mrTakenList; + TakeProgress* mpProgress; + TPGalleryThemeProperties* mpBrowser; + List& mrTakenList; - virtual void SAL_CALL run(); + virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); public: @@ -154,14 +154,14 @@ class TakeProgress : public ModalDialog { private: - FixedText aFtTakeFile; + FixedText aFtTakeFile; FixedLine aFLTakeProgress; - CancelButton aBtnCancel; - TakeThread maTakeThread; - List maTakenList; + CancelButton aBtnCancel; + TakeThread maTakeThread; + List maTakenList; DECL_LINK( ClickCancelBtn, void* ); - void Terminate(); + void Terminate(); public: @@ -170,8 +170,8 @@ public: DECL_LINK( CleanUpHdl, void* ); - void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); } - virtual short Execute(); + void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); } + virtual short Execute(); virtual void StartExecuteModal( const Link& rEndDialogHdl ); }; @@ -183,12 +183,12 @@ class ActualizeProgress : public ModalDialog { private: - FixedText aFtActualizeFile; + FixedText aFtActualizeFile; FixedLine aFLActualizeProgress; - CancelButton aBtnCancel; - Timer* pTimer; - GalleryTheme* pTheme; - GalleryProgress aStatusProgress; + CancelButton aBtnCancel; + Timer* pTimer; + GalleryTheme* pTheme; + GalleryProgress aStatusProgress; DECL_LINK( ClickCancelBtn, void* ); DECL_LINK( TimeoutHdl, Timer* ); @@ -198,7 +198,7 @@ public: ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); ~ActualizeProgress() {}; - virtual short Execute(); + virtual short Execute(); }; // --------------- @@ -209,16 +209,16 @@ class TitleDialog : public ModalDialog { private: - OKButton maOk; - CancelButton maCancel; - HelpButton maHelp; + OKButton maOk; + CancelButton maCancel; + HelpButton maHelp; FixedLine maFL; - Edit maEdit; + Edit maEdit; public: TitleDialog( Window* pParent, const String& rOldText ); - String GetTitle() const { return maEdit.GetText(); } + String GetTitle() const { return maEdit.GetText(); } }; // ------------------- @@ -229,11 +229,11 @@ class GalleryIdDialog : public ModalDialog { private: - OKButton aBtnOk; - CancelButton aBtnCancel; + OKButton aBtnOk; + CancelButton aBtnCancel; FixedLine aFLId; - ListBox aLbResName; - GalleryTheme* pThm; + ListBox aLbResName; + GalleryTheme* pThm; DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); @@ -243,7 +243,7 @@ public: GalleryIdDialog( Window* pParent, GalleryTheme* pThm ); ~GalleryIdDialog() {} - ULONG GetId() const { return aLbResName.GetSelectEntryPos(); } + ULONG GetId() const { return aLbResName.GetSelectEntryPos(); } }; // -------------------------- @@ -252,9 +252,9 @@ public: class GalleryThemeProperties : public SfxTabDialog { - ExchangeData* pData; + ExchangeData* pData; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -270,21 +270,21 @@ class TPGalleryThemeGeneral : public SfxTabPage { private: - FixedImage aFiMSImage; - Edit aEdtMSName; - FixedLine aFlMSGeneralFirst; - FixedText aFtMSType; - FixedText aFtMSShowType; - FixedText aFtMSPath; - FixedText aFtMSShowPath; - FixedText aFtMSContent; - FixedText aFtMSShowContent; - FixedLine aFlMSGeneralSecond; - FixedText aFtMSChangeDate; - FixedText aFtMSShowChangeDate; - ExchangeData* pData; - - virtual void Reset( const SfxItemSet& ) {} + FixedImage aFiMSImage; + Edit aEdtMSName; + FixedLine aFlMSGeneralFirst; + FixedText aFtMSType; + FixedText aFtMSShowType; + FixedText aFtMSPath; + FixedText aFtMSShowPath; + FixedText aFtMSContent; + FixedText aFtMSShowContent; + FixedLine aFlMSGeneralSecond; + FixedText aFtMSChangeDate; + FixedText aFtMSShowChangeDate; + ExchangeData* pData; + + virtual void Reset( const SfxItemSet& ) {} virtual BOOL FillItemSet( SfxItemSet& rSet ); @@ -293,10 +293,10 @@ public: TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ); ~TPGalleryThemeGeneral() {} - void SetXChgData( ExchangeData* pData ); - const ExchangeData* GetXChgData() const { return pData; } + void SetXChgData( ExchangeData* pData ); + const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); }; // ---------------------------- @@ -309,28 +309,28 @@ class TPGalleryThemeProperties : public SfxTabPage friend class TakeProgress; friend class TakeThread; - PushButton aBtnSearch; - PushButton aBtnTake; - PushButton aBtnTakeAll; - CheckBox aCbxPreview; - ComboBox aCbbFileType; - MultiListBox aLbxFound; - FixedText aFtFileType; - GalleryPreview aWndPreview; - - ExchangeData* pData; - StringList aFoundList; - List aFilterEntryList; - Timer aPreviewTimer; - String aLastFilterName; - String aPreviewString; - INetURLObject aURL; - USHORT nCurFilterPos; - USHORT nFirstExtFilterPos; - BOOL bEntriesFound; - BOOL bInputAllowed; - BOOL bTakeAll; - BOOL bSearchRecursive; + PushButton aBtnSearch; + PushButton aBtnTake; + PushButton aBtnTakeAll; + CheckBox aCbxPreview; + ComboBox aCbbFileType; + MultiListBox aLbxFound; + FixedText aFtFileType; + GalleryPreview aWndPreview; + + ExchangeData* pData; + StringList aFoundList; + List aFilterEntryList; + Timer aPreviewTimer; + String aLastFilterName; + String aPreviewString; + INetURLObject aURL; + USHORT nCurFilterPos; + USHORT nFirstExtFilterPos; + BOOL bEntriesFound; + BOOL bInputAllowed; + BOOL bTakeAll; + BOOL bSearchRecursive; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; @@ -338,12 +338,12 @@ class TPGalleryThemeProperties : public SfxTabPage virtual void Reset( const SfxItemSet& /*rSet*/ ) {} virtual BOOL FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; } - ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); - void FillFilterList(); + ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); + void FillFilterList(); - void SearchFiles(); - void TakeFiles(); - void DoPreview(); + void SearchFiles(); + void TakeFiles(); + void DoPreview(); DECL_LINK( ClickPreviewHdl, void* ); DECL_LINK( ClickCloseBrowserHdl, void* ); @@ -362,12 +362,12 @@ public: TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); ~TPGalleryThemeProperties(); - void SetXChgData( ExchangeData* pData ); - const ExchangeData* GetXChgData() const { return pData; } + void SetXChgData( ExchangeData* pData ); + const ExchangeData* GetXChgData() const { return pData; } void StartSearchFiles( const String& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); }; #endif // _CUI_GALDLG_HXX_ diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index ac1bf38ad904..ed17fa9501e0 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ // - Error codes - // --------------- -#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 -#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 -#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 +#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000 +#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001 +#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002 // -------------------- // - SvxGraphicFilter - @@ -60,8 +60,8 @@ class SvxGraphicFilter { public: - static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); - static void DisableGraphicFilterSlots( SfxItemSet& rSet ); + static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); + static void DisableGraphicFilterSlots( SfxItemSet& rSet ); }; */ // ----------------------- @@ -75,47 +75,47 @@ private: class PreviewWindow : public Control { private: + + GraphicObject maGraphic; - GraphicObject maGraphic; - - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: PreviewWindow( Window* pParent, const ResId& rResId ); ~PreviewWindow(); - void SetGraphic( const Graphic& rGraphic ); + void SetGraphic( const Graphic& rGraphic ); }; private: - Timer maTimer; - Link maModifyHdl; - Graphic maGraphic; - double mfScaleX; - double mfScaleY; - Size maSizePixel; - PreviewWindow maPreview; - FixedLine maFlParameter; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; + Timer maTimer; + Link maModifyHdl; + Graphic maGraphic; + double mfScaleX; + double mfScaleY; + Size maSizePixel; + PreviewWindow maPreview; + FixedLine maFlParameter; + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer ); DECL_LINK( ImplModifyHdl, void* p ); protected: - const Link& GetModifyHdl() const { return maModifyHdl; } - const Size& GetGraphicSizePixel() const { return maSizePixel; } - -public: + const Link& GetModifyHdl() const { return maModifyHdl; } + const Size& GetGraphicSizePixel() const { return maSizePixel; } +public: + GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ); ~GraphicFilterDialog(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; // ----------------------- @@ -126,11 +126,11 @@ class GraphicFilterMosaic : public GraphicFilterDialog { private: - FixedText maFtWidth; - MetricField maMtrWidth; - FixedText maFtHeight; - MetricField maMtrHeight; - CheckBox maCbxEdges; + FixedText maFtWidth; + MetricField maMtrWidth; + FixedText maFtHeight; + MetricField maMtrHeight; + CheckBox maCbxEdges; public: @@ -138,10 +138,10 @@ public: USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ); ~GraphicFilterMosaic(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - long GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); } - long GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); } - BOOL IsEnhanceEdges() const { return maCbxEdges.IsChecked(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + long GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); } + long GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); } + BOOL IsEnhanceEdges() const { return maCbxEdges.IsChecked(); } }; // ------------------------- @@ -152,9 +152,9 @@ class GraphicFilterSolarize : public GraphicFilterDialog { private: - FixedText maFtThreshold; - MetricField maMtrThreshold; - CheckBox maCbxInvert; + FixedText maFtThreshold; + MetricField maMtrThreshold; + CheckBox maCbxInvert; public: @@ -162,9 +162,9 @@ public: BYTE nGreyThreshold, BOOL bInvert ); ~GraphicFilterSolarize(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - BYTE GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); } - BOOL IsInvert() const { return maCbxInvert.IsChecked(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + BYTE GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); } + BOOL IsInvert() const { return maCbxInvert.IsChecked(); } }; // ---------------------- @@ -175,8 +175,8 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: - FixedText maFtSepia; - MetricField maMtrSepia; + FixedText maFtSepia; + MetricField maMtrSepia; public: @@ -184,8 +184,8 @@ public: USHORT nSepiaPercent ); ~GraphicFilterSepia(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - USHORT GetSepiaPercent() const + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + USHORT GetSepiaPercent() const { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); } }; @@ -197,8 +197,8 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: - FixedText maFtPoster; - NumericField maNumPoster; + FixedText maFtPoster; + NumericField maNumPoster; public: @@ -206,8 +206,8 @@ public: USHORT nPosterColorCount ); ~GraphicFilterPoster(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - USHORT GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + USHORT GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); } }; // ----------------------- @@ -222,22 +222,22 @@ private: { private: - Link maModifyHdl; + Link maModifyHdl; - virtual void MouseButtonDown( const MouseEvent& rEvt ); + virtual void MouseButtonDown( const MouseEvent& rEvt ); public: - EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) : + EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) : SvxRectCtl( pParent, rResId ) { SetActualRP( eRectPoint ); } - - void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } + + void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } }; private: - FixedText maFtLight; - EmbossControl maCtlLight; + FixedText maFtLight; + EmbossControl maCtlLight; public: @@ -245,8 +245,8 @@ public: RECT_POINT eLightSource ); ~GraphicFilterEmboss(); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); - RECT_POINT GetLightSource() const { return maCtlLight.GetActualRP(); } + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + RECT_POINT GetLightSource() const { return maCtlLight.GetActualRP(); } }; #endif diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index c183473da03b..43d25a2b7c63 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,14 +50,14 @@ class SvxHlinkCtrl : public SfxControllerItem { private : SvxHpLinkDlg *pParent; - + SfxStatusForwarder aOnlineForwarder; SfxStatusForwarder aRdOnlyForwarder; public : SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -72,43 +72,43 @@ public : class SvxHpLinkDlg : public IconChoiceDialog { private: - SvxHlinkCtrl maCtrl; // Controler - SfxBindings* mpBindings; - SfxItemSet* mpItemSet; - - sal_Bool mbDummy1 : 1; - sal_Bool mbDummy2 : 1; - sal_Bool mbDummy3 : 1; - sal_Bool mbDummy4 : 1; - sal_Bool mbDummy5 : 1; - sal_Bool mbGrabFocus : 1; - sal_Bool mbReadOnly : 1; - sal_Bool mbIsHTMLDoc : 1; + SvxHlinkCtrl maCtrl; // Controler + SfxBindings* mpBindings; + SfxItemSet* mpItemSet; + + sal_Bool mbDummy1 : 1; + sal_Bool mbDummy2 : 1; + sal_Bool mbDummy3 : 1; + sal_Bool mbDummy4 : 1; + sal_Bool mbDummy5 : 1; + sal_Bool mbGrabFocus : 1; + sal_Bool mbReadOnly : 1; + sal_Bool mbIsHTMLDoc : 1; void* mpDummy1; void* mpDummy2; DECL_LINK (ClickApplyHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * ); - + protected: - virtual BOOL Close(); - virtual void Move(); + virtual BOOL Close(); + virtual void Move(); -// virtual long PreNotify( NotifyEvent& rNEvt ); +// virtual long PreNotify( NotifyEvent& rNEvt ); public: SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); ~SvxHpLinkDlg (); virtual void PageCreated( USHORT nId, IconChoicePage& rPage ); - USHORT SetPage( SvxHyperlinkItem* pItem ); - void EnableInetBrowse( sal_Bool bEnable = sal_True ); - void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); - inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } + USHORT SetPage( SvxHyperlinkItem* pItem ); + void EnableInetBrowse( sal_Bool bEnable = sal_True ); + void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); + inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } - inline SfxBindings* GetBindings() const { return mpBindings; }; - inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } + inline SfxBindings* GetBindings() const { return mpBindings; }; + inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } }; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index fa0bfeb1ad64..b12c86ce3088 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -23,20 +23,20 @@ class URLDlg : public ModalDialog { - FixedText maFtURL; - Edit maEdtURL; - FixedText maFtTarget; - ComboBox maCbbTargets; - FixedText maFtName; - Edit maEdtName; - FixedText maFtAlternativeText; - Edit maEdtAlternativeText; - FixedText maFtDescription; - MultiLineEdit maEdtDescription; + FixedText maFtURL; + Edit maEdtURL; + FixedText maFtTarget; + ComboBox maCbbTargets; + FixedText maFtName; + Edit maEdtName; + FixedText maFtAlternativeText; + Edit maEdtAlternativeText; + FixedText maFtDescription; + MultiLineEdit maEdtDescription; FixedLine maFlURL; - HelpButton maBtnHelp; - OKButton maBtnOk; - CancelButton maBtnCancel; + HelpButton maBtnHelp; + OKButton maBtnOk; + CancelButton maBtnCancel; public: @@ -45,13 +45,13 @@ public: const String& rTarget, const String& rName, TargetList& rTargetList ); - String GetURL() const { return maEdtURL.GetText(); } - String GetAltText() const { return maEdtAlternativeText.GetText(); } - String GetDesc() const { return maEdtDescription.GetText(); } - String GetTarget() const { return maCbbTargets.GetText(); } - String GetName() const { return maEdtName.GetText(); } + String GetURL() const { return maEdtURL.GetText(); } + String GetAltText() const { return maEdtAlternativeText.GetText(); } + String GetDesc() const { return maEdtDescription.GetText(); } + String GetTarget() const { return maCbbTargets.GetText(); } + String GetName() const { return maEdtName.GetText(); } }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index e96e639c05ef..855cee4e01d3 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,39 +69,39 @@ class SvxGeneralTabPage : public SfxTabPage using TabPage::DeactivatePage; private: FixedLine aAddrFrm; - FixedText aCompanyLbl; + FixedText aCompanyLbl; SvxUserEdit aCompanyEdit; - FixedText aNameLbl; - FixedText aNameLblRuss; - FixedText aNameLblEastern; + FixedText aNameLbl; + FixedText aNameLblRuss; + FixedText aNameLblEastern; SvxUserEdit aFirstName; SvxUserEdit aFatherName; SvxUserEdit aName; SvxUserEdit aShortName; - FixedText aStreetLbl; - FixedText aStreetLblRuss; + FixedText aStreetLbl; + FixedText aStreetLblRuss; SvxUserEdit aStreetEdit; SvxUserEdit aApartmentNrEdit; - FixedText aCityLbl; + FixedText aCityLbl; SvxUserEdit aPLZEdit; SvxUserEdit aCityEdit; SvxUserEdit aUsCityEdit; SvxUserEdit aUsStateEdit; SvxUserEdit aUsZipEdit; - FixedText aCountryLbl; + FixedText aCountryLbl; SvxUserEdit aCountryEdit; - FixedText aTitlePosLbl; + FixedText aTitlePosLbl; SvxUserEdit aTitleEdit; SvxUserEdit aPositionEdit; - FixedText aPhoneLbl; + FixedText aPhoneLbl; SvxUserEdit aTelPrivEdit; SvxUserEdit aTelCompanyEdit; - FixedText aFaxMailLbl; + FixedText aFaxMailLbl; SvxUserEdit aFaxEdit; SvxUserEdit aEmailEdit; - CheckBox aUseDataCB; + CheckBox aUseDataCB; - GeneralTabPage_Impl* pImpl; + GeneralTabPage_Impl* pImpl; #ifdef _SVX_OPTGENRL_CXX DECL_LINK( ModifyHdl_Impl, Edit * ); @@ -111,16 +111,16 @@ private: #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); public: SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxGeneralTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 023d9281de94..eb5c21f2d8a6 100755 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,17 +40,17 @@ // tab pages // used in "dialogs" -#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) +#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) // used in "tabpages" -#define RID_SVXDLG_TEXT (RID_SVX_START + 183) +#define RID_SVXDLG_TEXT (RID_SVX_START + 183) #define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45) #define RID_SVXDLG_LINE (RID_SVX_START + 50) #define RID_SVXDLG_BBDLG (RID_SVX_START + 40) #define RID_SVXDLG_CAPTION (RID_SVX_START + 151) #define RID_SVXDLG_AREA (RID_SVX_START + 55) -#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) -#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) +#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) +#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) #define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) #define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) @@ -76,8 +76,8 @@ #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_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) @@ -108,23 +108,23 @@ // autocor #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) -#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) -#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) -#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) -#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) -#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) -#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) +#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) +#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) +#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) +#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) +#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) +#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) // options -#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) +#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) +#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) #define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) -#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define DLG_DOCUMENTLINK (RID_OFA_START + 124) +#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) +#define DLG_DOCUMENTLINK (RID_OFA_START + 124) #define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) #define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) #define STR_NAME_CONFLICT (RID_SVX_START + 1112) -#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) +#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) // treeopt #define RID_SVXPAGE_COLOR (RID_SVX_START + 60) @@ -136,27 +136,27 @@ #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)//? +#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//? // options #define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301) #define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300) #define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298) -#define OFA_TP_MEMORY (RID_OFA_START + 250) -#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) -#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) +#define OFA_TP_MEMORY (RID_OFA_START + 250) +#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) +#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) #define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) -#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) -#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) -#define OFA_TP_LANGUAGES (RID_OFA_START + 205) -#define OFA_TP_MISC (RID_OFA_START + 200) -#define OFA_TP_VIEW (RID_OFA_START + 202) -#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) -#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) +#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) +#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) +#define OFA_TP_LANGUAGES (RID_OFA_START + 205) +#define OFA_TP_MISC (RID_OFA_START + 200) +#define OFA_TP_VIEW (RID_OFA_START + 202) +#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) +#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) #define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125) -#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) -#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) +#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) +#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) #define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) @@ -166,25 +166,25 @@ #define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) #define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) -#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) -#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) -#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) -#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) -#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) -#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) -#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) -#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) -#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) +#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) +#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) +#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) +#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) +#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) +#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) +#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) +#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) +#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) +#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) +#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) #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) //? -#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? +#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //? +#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? +#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? #define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? #define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//? #define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//? @@ -209,8 +209,8 @@ #define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//? // dialogs -#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) -#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) +#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) +#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) #define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) @@ -218,82 +218,82 @@ #define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // 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) -#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) -#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) -#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) -#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) -#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) -#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) -#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) -#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) -#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) -#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) -#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) -#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) -#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) +#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) +#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) +#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) +#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) +#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) +#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) +#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) +#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) +#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) +#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) +#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) +#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) +#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) +#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) +#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) +#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) #define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553) -#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) +#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) #define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800) #define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801) -#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) -#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) -#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) -#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) -#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) -#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) +#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) +#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) +#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) +#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) +#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) +#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) // imap dialog -#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100) -#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) +#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100) +#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) // name dialog #define RID_SVXDLG_NAME (RID_SVX_START + 62) #define RID_SVXDLG_MESSBOX (RID_SVX_START + 63) -#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) +#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) #define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67) // hangulhanja -#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 ) -#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) -#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) -#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) +#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 ) +#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) +#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) +#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) // icon choice -#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) +#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) // insert rows&cols -#define DLG_INS_ROW_COL (RID_SVX_START + 156) +#define DLG_INS_ROW_COL (RID_SVX_START + 156) // SvxMultiFileDialog -#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) -#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) +#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) +#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) +#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) +#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) +#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) // password to open/modify dialog #define RID_DLG_PASSWORD_TO_OPEN_MODIFY (RID_SVX_START + 500) // multi path dialog -#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) -#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) +#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) +#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) // new table dialog -#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) +#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) // script organizer #define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258) -#define RID_DLG_NEWLIB (RID_SVX_START + 290) +#define RID_DLG_NEWLIB (RID_SVX_START + 290) #define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) #define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) #define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) @@ -321,10 +321,10 @@ #define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32) // split cells -#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) +#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) // searching -#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) +#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) // customize @@ -333,7 +333,7 @@ #define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293) #define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294) #define RID_SVXPAGE_EVENTS (RID_SVX_START + 295) -#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) +#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) #define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297) #define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259) #define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) @@ -343,10 +343,10 @@ #define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) #define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) #define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117) -#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 -#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 +#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 +#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 +#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 +#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 #define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042) #define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) #define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) @@ -360,7 +360,7 @@ #define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137) #define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051) #define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052) -#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) +#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) #define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054) #define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055) #define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056) @@ -409,24 +409,24 @@ #define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) #define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) #define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171) -#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) -#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) -#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) -#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) -#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) -#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) -#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) -#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) -#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) -#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) -#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) -#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) -#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) -#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) -#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) -#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) -#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) +#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) +#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) +#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) +#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) +#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) +#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) +#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) +#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) +#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) +#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) +#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) +#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) +#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) +#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) +#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) +#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) +#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) +#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) // For now, keep new IDs unique only within cui. // Later, cui should perhaps get an own range of IDs. diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 6f6718f55378..e4f9fc294f4f 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class SvxJSearchOptionsPage; class SvxJSearchOptionsDialog : public SfxSingleTabDialog { - INT32 nInitialTlFlags; + INT32 nInitialTlFlags; SvxJSearchOptionsPage *pPage; // disallow copy-constructor and assignment-operator for now @@ -65,10 +65,10 @@ public: virtual ~SvxJSearchOptionsDialog(); // Window - virtual void Activate(); + virtual void Activate(); - INT32 GetTransliterationFlags() const; - void SetTransliterationFlags( INT32 nSettings ); + INT32 GetTransliterationFlags() const; + void SetTransliterationFlags( INT32 nSettings ); }; #endif diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index bc7c024fd35e..fa61e02680f5 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class SvxAreaTabDialog : public SfxTabDialog { private: SdrModel* mpDrawModel; -// const SdrView* mpView; +// const SdrView* mpView; XColorTable* mpColorTab; XColorTable* mpNewColorTab; @@ -81,29 +81,29 @@ public: const SdrView* pSdrView = NULL ); ~SvxAreaTabDialog(); - void SetNewColorTable( XColorTable* pColTab ) + void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } - XColorTable* GetNewColorTable() const { return mpNewColorTab; } - const XColorTable* GetColorTable() const { return mpColorTab; } + XColorTable* GetNewColorTable() const { return mpNewColorTab; } + const XColorTable* GetColorTable() const { return mpColorTab; } - void SetNewGradientList( XGradientList* pGrdLst) + void SetNewGradientList( XGradientList* pGrdLst) { mpNewGradientList = pGrdLst; } - XGradientList* GetNewGradientList() const + XGradientList* GetNewGradientList() const { return mpNewGradientList; } const XGradientList* GetGradientList() const { return mpGradientList; } - void SetNewHatchingList( XHatchList* pHtchLst) + void SetNewHatchingList( XHatchList* pHtchLst) { mpNewHatchingList = pHtchLst; } - XHatchList* GetNewHatchingList() const + XHatchList* GetNewHatchingList() const { return mpNewHatchingList; } - const XHatchList* GetHatchingList() const { return mpHatchingList; } + const XHatchList* GetHatchingList() const { return mpHatchingList; } - void SetNewBitmapList( XBitmapList* pBmpLst) + void SetNewBitmapList( XBitmapList* pBmpLst) { mpNewBitmapList = pBmpLst; } - XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; } - const XBitmapList* GetBitmapList() const { return mpBitmapList; } + XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; } + const XBitmapList* GetBitmapList() const { return mpBitmapList; } - void DontDeleteColorTable() { mbDeleteColorTable = FALSE; } + void DontDeleteColorTable() { mbDeleteColorTable = FALSE; } }; /************************************************************************* @@ -122,8 +122,8 @@ class SvxTransparenceTabPage : public SvxTabPage //CHINA001 UINT16* pPageType; //CHINA001 UINT16* pDlgType; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 // main selection FixedLine aFlProp; @@ -153,7 +153,7 @@ class SvxTransparenceTabPage : public SvxTabPage // preview SvxXRectPreview aCtlBitmapPreview; SvxXRectPreview aCtlXRectPreview; - BOOL bBitmap; + BOOL bBitmap; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -190,9 +190,9 @@ public: //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; } //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; } - void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 - void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 + void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* @@ -220,28 +220,28 @@ private: FixedLine aFlStepCount; NumericField aNumFldStepCount; - CheckBox aCbxHatchBckgrd; + CheckBox aCbxHatchBckgrd; ColorLB aLbHatchBckgrdColor; FixedLine aFlSize; - TriStateBox aTsbOriginal; - TriStateBox aTsbScale; - FixedText aFtXSize; - MetricField aMtrFldXSize; - FixedText aFtYSize; - MetricField aMtrFldYSize; + TriStateBox aTsbOriginal; + TriStateBox aTsbScale; + FixedText aFtXSize; + MetricField aMtrFldXSize; + FixedText aFtYSize; + MetricField aMtrFldYSize; FixedLine aFlPosition; - SvxRectCtl aCtlPosition; - FixedText aFtXOffset; - MetricField aMtrFldXOffset; - FixedText aFtYOffset; - MetricField aMtrFldYOffset; + SvxRectCtl aCtlPosition; + FixedText aFtXOffset; + MetricField aMtrFldXOffset; + FixedText aFtYOffset; + MetricField aMtrFldYOffset; TriStateBox aTsbTile; TriStateBox aTsbStretch; FixedLine aFlOffset; - RadioButton aRbtRow; - RadioButton aRbtColumn; - MetricField aMtrFldOffset; + RadioButton aRbtRow; + RadioButton aRbtColumn; + MetricField aMtrFldOffset; SvxXRectPreview aCtlXRectPreview; @@ -261,9 +261,9 @@ private: //CHINA001 USHORT* pPageType; //CHINA001 USHORT* pDlgType; //CHINA001 USHORT* pPos; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType;//add CHINA001 - UINT16 nPos; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType;//add CHINA001 + UINT16 nPos; //add CHINA001 BOOL* pbAreaTP; @@ -271,8 +271,8 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; - FieldUnit eFUnit; + SfxMapUnit ePoolUnit; + FieldUnit eFUnit; #ifdef _SVX_TPAREA_CXX DECL_LINK( SelectDialogTypeHdl_Impl, ListBox * ); @@ -287,7 +287,7 @@ private: DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ClickBitmapHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); -// DECL_LINK( ModifyTransparentHdl_Impl, void * ); +// DECL_LINK( ModifyTransparentHdl_Impl, void * ); DECL_LINK( ModifyStepCountHdl_Impl, void * ); DECL_LINK( ModifyTileHdl_Impl, void * ); DECL_LINK( ClickScaleHdl_Impl, void * ); @@ -299,14 +299,14 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - + void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } void SetGradientList( XGradientList* pGrdLst) { pGradientList = pGrdLst; } @@ -315,13 +315,13 @@ public: void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; } //CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } - void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 + void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 //CHINA001 void SetPos( USHORT* pInPos ) { pPos = pInPos; } - void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 + void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } @@ -350,24 +350,24 @@ private: ColorLB aLbShadowColor; FixedText aFtTransparent; MetricField aMtrTransparent; - SvxXShadowPreview aCtlXRectPreview; + SvxXShadowPreview aCtlXRectPreview; const SfxItemSet& rOutAttrs; RECT_POINT eRP; XColorTable* pColorTab; ChangeType* pnColorTableState; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 USHORT* pPos; BOOL* pbAreaTP; - BOOL bDisable; + BOOL bDisable; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; #ifdef _SVX_TPSHADOW_CXX DECL_LINK( ClickShadowHdl_Impl, void * ); @@ -379,7 +379,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -388,14 +388,14 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } -//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } -//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } - void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001 +//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } +//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } + void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001 void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 - void DisablePage( BOOL bIn ) { bDisable = bIn; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void DisablePage( BOOL bIn ) { bDisable = bIn; } }; /************************************************************************* @@ -540,7 +540,7 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; #ifdef _SVX_TPHATCH_CXX DECL_LINK( ChangeHatchHdl_Impl, void * ); @@ -580,7 +580,7 @@ public: void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; /************************************************************************* @@ -681,7 +681,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; }; /************************************************************************* @@ -745,7 +745,7 @@ private: ColorModel eCM; - Color aAktuellColor; + Color aAktuellColor; #ifdef _SVX_TPCOLOR_CXX void ConvertColorValues (Color& rColor, ColorModel eModell); @@ -756,18 +756,18 @@ private: void FillValueSet_Impl( ValueSet& rVs ); //----------------------------------------------------------------------------------------------------- - DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen' - DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern' - 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( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox 'Farbmodell' + DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen' + DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern' + 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( 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( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle laden' - DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle sichern' + 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' long CheckChanges_Impl(); #endif @@ -793,7 +793,7 @@ public: void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - void SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; } + void SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; } virtual void FillUserData(); }; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index efb22b2ff607..03e83ab0dcc4 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ public: XLineEndList* GetNewLineEndList() const { return pNewLineEndList; } const XLineEndList* GetLineEndList() const { return pLineEndList; } - void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } + void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } XColorTable* GetNewColorTable() const { return mpNewColorTab; } const XColorTable* GetColorTable() const { return pColorTab; } }; @@ -134,27 +134,27 @@ private: //#58425# Symbole auf einer Linie (z.B. StarChart) -> SdrObjList* pSymbolList; //a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. The list position is to be used cyclic. - bool bNewSize; - Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen - long nNumMenuGalleryItems; - long nSymbolType; + bool bNewSize; + Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen + long nNumMenuGalleryItems; + long nSymbolType; SfxItemSet* pSymbolAttr; //attributes for the shown symbols; only necessary if not equal to line properties - FixedLine aFlSymbol; + FixedLine aFlSymbol; MenuButton aSymbolMB; FixedText aSymbolWidthFT; - MetricField aSymbolWidthMF; - FixedText aSymbolHeightFT; - MetricField aSymbolHeightMF; - CheckBox aSymbolRatioCB; - List aGrfNames; - List aGrfBrushItems; - String sNumCharFmtName; - BOOL bLastWidthModified; - Size aSymbolLastSize; - Graphic aSymbolGraphic; - Size aSymbolSize; - BOOL bSymbols; - + MetricField aSymbolWidthMF; + FixedText aSymbolHeightFT; + MetricField aSymbolHeightMF; + CheckBox aSymbolRatioCB; + List aGrfNames; + List aGrfBrushItems; + String sNumCharFmtName; + BOOL bLastWidthModified; + Size aSymbolLastSize; + Graphic aSymbolGraphic; + Size aSymbolSize; + BOOL bSymbols; + const SfxItemSet& rOutAttrs; RECT_POINT eRP; BOOL bObjSelected; @@ -174,16 +174,16 @@ private: ChangeType* pnLineEndListState; ChangeType* pnDashListState; ChangeType* pnColorTableState; - UINT16 nPageType; //add CHINA001 - UINT16 nDlgType; //add CHINA001 + UINT16 nPageType; //add CHINA001 + UINT16 nDlgType; //add CHINA001 USHORT* pPosDashLb; USHORT* pPosLineEndLb; SfxMapUnit ePoolUnit; // #63083# - INT32 nActLineWidth; - + INT32 nActLineWidth; + //Handler für Gallery-Popup-Menue-Button + Size DECL_LINK( GraphicHdl_Impl, MenuButton * ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); @@ -235,15 +235,15 @@ public: void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; } void SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; } - void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } + void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; } void SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; } void SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; } void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } - void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } + void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index e2b992dbfc72..ff6381487922 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -13,10 +13,10 @@ class FmInputRecordNoDialog : public ModalDialog { public: - FixedText m_aLabel; - NumericField m_aRecordNo; - OKButton m_aOk; - CancelButton m_aCancel; + FixedText m_aLabel; + NumericField m_aRecordNo; + OKButton m_aOk; + CancelButton m_aCancel; public: FmInputRecordNoDialog(Window * pParent); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 2ae0bd775304..0f642c16b07a 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,18 +53,18 @@ namespace svx { private: FixedLine aStdBox; - FixedText aTypeText; - FixedText aPathText; - SvxControlFocusHelper aPathCtrl; - PushButton m_aNew; - PushButton m_aEdit; - PushButton m_aDelete; - - HeaderBar* pHeaderBar; - ::svx::OptHeaderTabListBox* pPathBox; - SvLBoxEntry* m_pCurEntry; - ULONG m_nOldCount; - BOOL m_bModified; + FixedText aTypeText; + FixedText aPathText; + SvxControlFocusHelper aPathCtrl; + PushButton m_aNew; + PushButton m_aEdit; + PushButton m_aDelete; + + HeaderBar* pHeaderBar; + ::svx::OptHeaderTabListBox* pPathBox; + SvLBoxEntry* m_pCurEntry; + ULONG m_nOldCount; + BOOL m_bModified; #ifdef SVX_DBREGISTER_HXX DECL_LINK( NewHdl, void * ); @@ -79,25 +79,25 @@ namespace svx /** inserts a new entry in the tablistbox - @param _sName + @param _sName The name of the entry. - @param _sLocation + @param _sLocation The location of the file. */ void insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool bReadOnly ); /** opens the LinkDialog to create a register pair - @param _sOldName + @param _sOldName The old name of the entry may be empty. - @param _sOldLocation + @param _sOldLocation The old location of the entry may be empty. - @param _pEntry + @param _pEntry The entry to remove if the entry will be changed */ void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL); /** opens a file pciker to select a database file - @param _sLocation + @param _sLocation If set, the file picker use it as default directory @return the location of the database file @@ -109,11 +109,11 @@ namespace svx DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; @@ -148,11 +148,11 @@ namespace svx DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); ~DatabaseRegistrationDialog(); - virtual short Execute(); + virtual short Execute(); }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTER_HXX diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx index 39913eaba94a..f2b340a4ed23 100644 --- a/cui/source/inc/defdlgname.hxx +++ b/cui/source/inc/defdlgname.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ // define ---------------------------------------------------------------- -#define MESS_BTN_1 ((USHORT)0) -#define MESS_BTN_2 ((USHORT)1) +#define MESS_BTN_1 ((USHORT)0) +#define MESS_BTN_2 ((USHORT)1) // const ----------------------------------------------------------------- -const short RET_BTN_1 = 100; -const short RET_BTN_2 = 101; +const short RET_BTN_1 = 100; +const short RET_BTN_2 = 101; #endif diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index 4d5f4f115931..637c561160a2 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ class ResMgr; struct CuiResMgr { - static ResMgr* GetResMgr(); + 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())) +#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 diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 641d00342eee..936a560adc7e 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ class SvxNameDialog : public ModalDialog { private: - FixedText aFtDescription; - Edit aEdtName; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDescription; + Edit aEdtName; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Link aCheckNameHdl; #if _SOLAR__PRIVATE @@ -96,16 +96,16 @@ class SvxObjectNameDialog : public ModalDialog { private: // name - FixedText aFtName; - Edit aEdtName; + FixedText aFtName; + Edit aEdtName; // separator - FixedLine aFlSeparator; + FixedLine aFlSeparator; // buttons - HelpButton aBtnHelp; - OKButton aBtnOK; - CancelButton aBtnCancel; + HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; // callback link for name uniqueness Link aCheckNameHdl; @@ -140,20 +140,20 @@ class SvxObjectTitleDescDialog : public ModalDialog { private: // title - FixedText aFtTitle; - Edit aEdtTitle; + FixedText aFtTitle; + Edit aEdtTitle; // description - FixedText aFtDescription; - MultiLineEdit aEdtDescription; + FixedText aFtDescription; + MultiLineEdit aEdtDescription; // separator - FixedLine aFlSeparator; + FixedLine aFlSeparator; // buttons - HelpButton aBtnHelp; - OKButton aBtnOK; - CancelButton aBtnCancel; + HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; public: // constructor @@ -174,12 +174,12 @@ public: class SvxMessDialog : public ModalDialog { private: - FixedText aFtDescription; - PushButton aBtn1; - PushButton aBtn2; - CancelButton aBtnCancel; - FixedImage aFtImage; - Image* pImage; + FixedText aFtDescription; + PushButton aBtn1; + PushButton aBtn2; + CancelButton aBtnCancel; + FixedImage aFtImage; + Image* pImage; #if _SOLAR__PRIVATE DECL_LINK( Button1Hdl, Button * ); DECL_LINK( Button2Hdl, Button * ); @@ -188,7 +188,7 @@ public: SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL ); ~SvxMessDialog(); - void SetButtonText( USHORT nBtnId, const String& rNewTxt ); + void SetButtonText( USHORT nBtnId, const String& rNewTxt ); }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 7c38ffa7c5c5..ad60687fc9cd 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,29 +62,29 @@ enum SvxDistributeVertical class SvxDistributePage : public SvxTabPage { - SvxDistributeHorizontal meDistributeHor; - SvxDistributeVertical meDistributeVer; - - FixedLine maFlHorizontal ; - RadioButton maBtnHorNone ; - RadioButton maBtnHorLeft ; - RadioButton maBtnHorCenter ; - RadioButton maBtnHorDistance ; - RadioButton maBtnHorRight ; - FixedImage maHorLow ; - FixedImage maHorCenter ; - FixedImage maHorDistance ; - FixedImage maHorHigh ; - FixedLine maFlVertical ; - RadioButton maBtnVerNone ; - RadioButton maBtnVerTop ; - RadioButton maBtnVerCenter ; - RadioButton maBtnVerDistance ; - RadioButton maBtnVerBottom ; - FixedImage maVerLow ; - FixedImage maVerCenter ; - FixedImage maVerDistance ; - FixedImage maVerHigh ; + SvxDistributeHorizontal meDistributeHor; + SvxDistributeVertical meDistributeVer; + + FixedLine maFlHorizontal ; + RadioButton maBtnHorNone ; + RadioButton maBtnHorLeft ; + RadioButton maBtnHorCenter ; + RadioButton maBtnHorDistance ; + RadioButton maBtnHorRight ; + FixedImage maHorLow ; + FixedImage maHorCenter ; + FixedImage maHorDistance ; + FixedImage maHorHigh ; + FixedLine maFlVertical ; + RadioButton maBtnVerNone ; + RadioButton maBtnVerTop ; + RadioButton maBtnVerCenter ; + RadioButton maBtnVerDistance ; + RadioButton maBtnVerBottom ; + FixedImage maVerLow ; + FixedImage maVerCenter ; + FixedImage maVerDistance ; + FixedImage maVerHigh ; public: SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs, @@ -109,7 +109,7 @@ public: class SvxDistributeDialog : public SfxSingleTabDialog { - SvxDistributePage* mpPage; + SvxDistributePage* mpPage; public: SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index c9d6729be447..7d6c71e2d213 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #include <cuires.hrc> // Gallery-TabDialoge/-TabPages -#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) -#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) -#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82) +#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) +#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) +#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82) -#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1) -#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4) +#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1) +#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4) // Dialoge -#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6) -#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7) +#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6) +#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7) #define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8) -#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9) +#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9) // Gallery-Strings -#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) -#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30) -#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) -#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40) -#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) -#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) -#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) +#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) +#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30) +#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) +#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40) +#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) +#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) +#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) // Images -#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) -#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) -#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53) -#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55) +#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) +#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) +#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53) +#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55) // lokale Defines #define BTN_OK 1 @@ -80,22 +80,22 @@ #define FL_ACTUALIZE_PROGRESS 1 #define FT_ACTUALIZE_FILE 1 #define FL_ID 1 -#define LB_RESNAME 1 -#define EDT_TITLE 20 +#define LB_RESNAME 1 +#define EDT_TITLE 20 #define FL_TITLE 21 // Gallery-TabDialog -#define FI_MS_IMAGE 1 +#define FI_MS_IMAGE 1 #define EDT_MS_NAME 1 -#define FL_MS_GENERAL_FIRST 1 -#define FT_MS_TYPE 2 -#define FT_MS_SHOW_TYPE 3 -#define FT_MS_PATH 4 -#define FT_MS_SHOW_PATH 5 -#define FT_MS_CONTENT 6 -#define FT_MS_SHOW_CONTENT 7 -#define FL_MS_GENERAL_SECOND 2 -#define FT_MS_CHANGEDATE 10 -#define FT_MS_SHOW_CHANGEDATE 11 +#define FL_MS_GENERAL_FIRST 1 +#define FT_MS_TYPE 2 +#define FT_MS_SHOW_TYPE 3 +#define FT_MS_PATH 4 +#define FT_MS_SHOW_PATH 5 +#define FT_MS_CONTENT 6 +#define FT_MS_SHOW_CONTENT 7 +#define FL_MS_GENERAL_SECOND 2 +#define FT_MS_CHANGEDATE 10 +#define FT_MS_SHOW_CHANGEDATE 11 diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 769937bcc75f..7cfffdd79270 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,66 +44,66 @@ class SvxGrfCropPage : public SfxTabPage class SvxCropExample : public Window { - Size aFrameSize; - Point aTopLeft, aBottomRight; - Graphic aGrf; + Size aFrameSize; + Point aTopLeft, aBottomRight; + Graphic aGrf; public: SvxCropExample( Window* pPar, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } - void SetTop( long nVal ) { aTopLeft.X() = nVal; } - void SetBottom( long nVal ) { aBottomRight.X() = nVal; } - void SetLeft( long nVal ) { aTopLeft.Y() = nVal; } - void SetRight( long nVal) { aBottomRight.Y() = nVal; } - void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; } + void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } + void SetTop( long nVal ) { aTopLeft.X() = nVal; } + void SetBottom( long nVal ) { aBottomRight.X() = nVal; } + void SetLeft( long nVal ) { aTopLeft.Y() = nVal; } + void SetRight( long nVal) { aBottomRight.Y() = nVal; } + void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; } void SetFrameSize( const Size& rSz ); - void SetGraphic( const Graphic& rGrf ) { aGrf = rGrf; } - const Graphic& GetGraphic() const { return aGrf; } + void SetGraphic( const Graphic& rGrf ) { aGrf = rGrf; } + const Graphic& GetGraphic() const { return aGrf; } }; FixedLine aCropFL; - RadioButton aZoomConstRB; - RadioButton aSizeConstRB; - FixedText aLeftFT; - MetricField aLeftMF; - FixedText aRightFT; - MetricField aRightMF; - FixedText aTopFT; - MetricField aTopMF; - FixedText aBottomFT; - MetricField aBottomMF; + RadioButton aZoomConstRB; + RadioButton aSizeConstRB; + FixedText aLeftFT; + MetricField aLeftMF; + FixedText aRightFT; + MetricField aRightMF; + FixedText aTopFT; + MetricField aTopMF; + FixedText aBottomFT; + MetricField aBottomMF; FixedLine aZoomFL; - FixedText aWidthZoomFT; - MetricField aWidthZoomMF; - FixedText aHeightZoomFT; - MetricField aHeightZoomMF; + FixedText aWidthZoomFT; + MetricField aWidthZoomMF; + FixedText aHeightZoomFT; + MetricField aHeightZoomMF; FixedLine aSizeFL; - FixedText aWidthFT; - MetricField aWidthMF; - FixedText aHeightFT; - MetricField aHeightMF; - FixedText aOrigSizeFT; - PushButton aOrigSizePB; + FixedText aWidthFT; + MetricField aWidthMF; + FixedText aHeightFT; + MetricField aHeightMF; + FixedText aOrigSizeFT; + PushButton aOrigSizePB; // Example - SvxCropExample aExampleWN; + SvxCropExample aExampleWN; - Timer aTimer; - String aGraphicName; - Size aOrigSize; - Size aPageSize; - const MetricField* pLastCropField; - long nOldWidth; - long nOldHeight; - BOOL bReset; - BOOL bInitialized; - BOOL bSetOrigSize; + Timer aTimer; + String aGraphicName; + Size aOrigSize; + Size aPageSize; + const MetricField* pLastCropField; + long nOldWidth; + long nOldHeight; + BOOL bReset; + BOOL bInitialized; + BOOL bSetOrigSize; SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); @@ -117,12 +117,12 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( OrigSizeHdl, PushButton * ); DECL_LINK( Timeout, Timer * ); - void CalcZoom(); - void CalcMinMaxBorder(); - void GraphicHasChanged(BOOL bFound); - virtual void ActivatePage(const SfxItemSet& rSet); + void CalcZoom(); + void CalcMinMaxBorder(); + void GraphicHasChanged(BOOL bFound); + virtual void ActivatePage(const SfxItemSet& rSet); - Size GetGrfOrigSize( const Graphic& ) const; + Size GetGrfOrigSize( const Graphic& ) const; public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 1771cbc192e3..e3e469656063 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include <svtools/valueset.hxx> #include <vector> -#include <memory> // for auto_ptr +#include <memory> // for auto_ptr class SvxCommonLinguisticControl; //............................................................................. @@ -79,7 +79,7 @@ namespace svx void SelectEntryPos( USHORT nPos ); USHORT GetEntryCount() const; - + XubString GetEntry( USHORT nPos ) const; XubString GetSelectEntry() const; @@ -106,7 +106,7 @@ namespace svx SuggestionSet m_aValueSet; ListBox m_aListBox; - Link m_aSelectLink; + Link m_aSelectLink; bool m_bInSelectionUpdate; }; @@ -114,77 +114,77 @@ namespace svx { private: ::std::auto_ptr< SvxCommonLinguisticControl > - m_pPlayground; // order matters: before all other controls! + m_pPlayground; // order matters: before all other controls! - PushButton m_aFind; + PushButton m_aFind; SuggestionDisplay m_aSuggestions; - FixedText m_aFormat; - RadioButton m_aSimpleConversion; - RadioButton m_aHangulBracketed; - RadioButton m_aHanjaBracketed; - ::std::auto_ptr< RadioButton > m_pHanjaAbove; - ::std::auto_ptr< RadioButton > m_pHanjaBelow; - ::std::auto_ptr< RadioButton > m_pHangulAbove; - ::std::auto_ptr< RadioButton > m_pHangulBelow; - FixedText m_aConversion; - CheckBox m_aHangulOnly; - CheckBox m_aHanjaOnly; - CheckBox m_aReplaceByChar; - - CheckBox* m_pIgnoreNonPrimary; - bool m_bDocumentMode; + FixedText m_aFormat; + RadioButton m_aSimpleConversion; + RadioButton m_aHangulBracketed; + RadioButton m_aHanjaBracketed; + ::std::auto_ptr< RadioButton > m_pHanjaAbove; + ::std::auto_ptr< RadioButton > m_pHanjaBelow; + ::std::auto_ptr< RadioButton > m_pHangulAbove; + ::std::auto_ptr< RadioButton > m_pHangulBelow; + FixedText m_aConversion; + CheckBox m_aHangulOnly; + CheckBox m_aHanjaOnly; + CheckBox m_aReplaceByChar; + + CheckBox* m_pIgnoreNonPrimary; + bool m_bDocumentMode; // are we working for a document? This is normally true, but in case // the user uses the "find" functionality, we switch to working // with what the user entered, which then does not have any relation to // the document anymore. Some functionality must be disabled then - Link m_aOptionsChangedLink; - Link m_aClickByCharacterLink; + Link m_aOptionsChangedLink; + Link m_aClickByCharacterLink; public: - HangulHanjaConversionDialog( - Window* _pParent, + HangulHanjaConversionDialog( + Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); ~HangulHanjaConversionDialog( ); public: - void SetOptionsChangedHdl( const Link& _rHdl ); - void SetIgnoreHdl( const Link& _rHdl ); - void SetIgnoreAllHdl( const Link& _rHdl ); - void SetChangeHdl( const Link& _rHdl ); - void SetChangeAllHdl( const Link& _rHdl ); - void SetOptionsHdl( const Link& _rHdl ); - - void SetClickByCharacterHdl( const Link& _rHdl ); - void SetConversionFormatChangedHdl( const Link& _rHdl ); - void SetFindHdl( const Link& _rHdl ); - - String GetCurrentString( ) const; - void SetCurrentString( + void SetOptionsChangedHdl( const Link& _rHdl ); + void SetIgnoreHdl( const Link& _rHdl ); + void SetIgnoreAllHdl( const Link& _rHdl ); + void SetChangeHdl( const Link& _rHdl ); + void SetChangeAllHdl( const Link& _rHdl ); + void SetOptionsHdl( const Link& _rHdl ); + + void SetClickByCharacterHdl( const Link& _rHdl ); + void SetConversionFormatChangedHdl( const Link& _rHdl ); + void SetFindHdl( const Link& _rHdl ); + + String GetCurrentString( ) const; + void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); - void FocusSuggestion( ); + void FocusSuggestion( ); // retrieves the current suggestion - String GetCurrentSuggestion( ) const; + String GetCurrentSuggestion( ) const; void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; - void SetByCharacter( sal_Bool _bByCharacter ); - sal_Bool GetByCharacter( ) const; + void SetByCharacter( sal_Bool _bByCharacter ); + sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? - sal_Bool GetUseBothDirections( ) const; - + sal_Bool GetUseBothDirections( ) const; + // get current conversion direction to use // (return argument if GetUseBothDirections is true) - editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; + editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; // enables or disbales the checkboxes for ruby formatted replacements void EnableRubySupport( sal_Bool bVal ); @@ -196,7 +196,7 @@ namespace svx DECL_LINK( OnSuggestionSelected, void* ); DECL_LINK( OnConversionDirectionClicked, CheckBox* ); DECL_LINK( ClickByCharacterHdl, CheckBox* ); - + // fill the suggestion list box with suggestions for the actual input void FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ); }; @@ -207,22 +207,22 @@ namespace svx class HangulHanjaOptionsDialog : public ModalDialog { private: - FixedText m_aUserdefdictFT; - SvxCheckListBox m_aDictsLB; - FixedLine m_aOptionsFL; - CheckBox m_aIgnorepostCB; - CheckBox m_aShowrecentlyfirstCB; - CheckBox m_aAutoreplaceuniqueCB; - PushButton m_aNewPB; - PushButton m_aEditPB; - PushButton m_aDeletePB; - OKButton m_aOkPB; - CancelButton m_aCancelPB; - HelpButton m_aHelpPB; - - SvLBoxButtonData* m_pCheckButtonData; - - HHDictList m_aDictList; + FixedText m_aUserdefdictFT; + SvxCheckListBox m_aDictsLB; + FixedLine m_aOptionsFL; + CheckBox m_aIgnorepostCB; + CheckBox m_aShowrecentlyfirstCB; + CheckBox m_aAutoreplaceuniqueCB; + PushButton m_aNewPB; + PushButton m_aEditPB; + PushButton m_aDeletePB; + OKButton m_aOkPB; + CancelButton m_aCancelPB; + HelpButton m_aHelpPB; + + SvLBoxButtonData* m_pCheckButtonData; + + HHDictList m_aDictList; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK( OkHdl, void* ); @@ -234,35 +234,35 @@ namespace svx DECL_LINK( EditDictHdl, void* ); DECL_LINK( DeleteDictHdl, void* ); - void Init( void ); // reads settings from core and init controls + void Init( void ); // reads settings from core and init controls public: HangulHanjaOptionsDialog( Window* _pParent ); - virtual ~HangulHanjaOptionsDialog(); + virtual ~HangulHanjaOptionsDialog(); - void AddDict( const String& _rName, bool _bChecked ); + void AddDict( const String& _rName, bool _bChecked ); }; class HangulHanjaNewDictDialog : public ModalDialog { private: - FixedLine m_aNewDictFL; - FixedText m_aDictNameFT; - Edit m_aDictNameED; - OKButton m_aOkBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; + FixedLine m_aNewDictFL; + FixedText m_aDictNameFT; + Edit m_aDictNameED; + OKButton m_aOkBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; - bool m_bEntered; + bool m_bEntered; DECL_LINK( OKHdl, void* ); DECL_LINK( ModifyHdl, void* ); protected: public: HangulHanjaNewDictDialog( Window* _pParent ); - virtual ~HangulHanjaNewDictDialog(); + virtual ~HangulHanjaNewDictDialog(); - bool GetName( String& _rRetName ) const; + bool GetName( String& _rRetName ) const; }; @@ -271,49 +271,49 @@ namespace svx class SuggestionEdit : public Edit { private: - SuggestionEdit* m_pPrev; - SuggestionEdit* m_pNext; - ScrollBar& m_rScrollBar; + SuggestionEdit* m_pPrev; + SuggestionEdit* m_pNext; + ScrollBar& m_rScrollBar; - bool ShouldScroll( bool _bUp ) const; - void DoJump( bool _bUp ); + bool ShouldScroll( bool _bUp ) const; + void DoJump( bool _bUp ); public: SuggestionEdit( Window* pParent, const ResId& rResId, ScrollBar& _rScrollBar, SuggestionEdit* _pPrev, SuggestionEdit* _pNext ); - virtual ~SuggestionEdit(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual ~SuggestionEdit(); + virtual long PreNotify( NotifyEvent& rNEvt ); }; class HangulHanjaEditDictDialog : public ModalDialog { private: - const String m_aEditHintText; - HHDictList& m_rDictList; - sal_uInt32 m_nCurrentDict; - - String m_aOriginal; - SuggestionList* m_pSuggestions; - - FixedText m_aBookFT; - ListBox m_aBookLB; - FixedText m_aOriginalFT; - ComboBox m_aOriginalLB; - FixedText m_aSuggestionsFT; - SuggestionEdit m_aEdit1; - SuggestionEdit m_aEdit2; - SuggestionEdit m_aEdit3; - SuggestionEdit m_aEdit4; - ScrollBar m_aScrollSB; - PushButton m_aNewPB; - PushButton m_aDeletePB; - HelpButton m_aHelpPB; - CancelButton m_aClosePB; - - sal_uInt16 m_nTopPos; + const String m_aEditHintText; + HHDictList& m_rDictList; + sal_uInt32 m_nCurrentDict; + + String m_aOriginal; + SuggestionList* m_pSuggestions; + + FixedText m_aBookFT; + ListBox m_aBookLB; + FixedText m_aOriginalFT; + ComboBox m_aOriginalLB; + FixedText m_aSuggestionsFT; + SuggestionEdit m_aEdit1; + SuggestionEdit m_aEdit2; + SuggestionEdit m_aEdit3; + SuggestionEdit m_aEdit4; + ScrollBar m_aScrollSB; + PushButton m_aNewPB; + PushButton m_aDeletePB; + HelpButton m_aHelpPB; + CancelButton m_aClosePB; + + sal_uInt16 m_nTopPos; bool m_bModifiedSuggestions; - bool m_bModifiedOriginal; + bool m_bModifiedOriginal; DECL_LINK( OriginalModifyHdl, void* ); DECL_LINK( ScrollHdl, void* ); @@ -321,31 +321,31 @@ namespace svx DECL_LINK( EditModifyHdl2, Edit* ); DECL_LINK( EditModifyHdl3, Edit* ); DECL_LINK( EditModifyHdl4, Edit* ); - + DECL_LINK( BookLBSelectHdl, void* ); DECL_LINK( NewPBPushHdl, void* ); DECL_LINK( DeletePBPushHdl, void* ); - void InitEditDictDialog( sal_uInt32 _nSelDict ); - void UpdateOriginalLB( void ); - void UpdateSuggestions( void ); + void InitEditDictDialog( sal_uInt32 _nSelDict ); + void UpdateOriginalLB( void ); + void UpdateSuggestions( void ); void UpdateButtonStates(); + + void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); + void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); + void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); - void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - - bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); + bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); ~HangulHanjaEditDictDialog(); - void UpdateScrollbar( void ); + void UpdateScrollbar( void ); }; //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. #endif // SVX_HANGUL_HANJA_HXX diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 426bd39e69b4..7ef6d4971820 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,23 +36,23 @@ class _HeaderTabListBox : public Control { private: - SvHeaderTabListBox maListBox; - HeaderBar maHeaderBar; + SvHeaderTabListBox maListBox; + HeaderBar maHeaderBar; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); public: _HeaderTabListBox( Window* pParent, const ResId& rId ); - virtual ~_HeaderTabListBox(); + virtual ~_HeaderTabListBox(); - inline SvHeaderTabListBox& GetListBox( void ); - inline HeaderBar& GetHeaderBar( void ); + inline SvHeaderTabListBox& GetListBox( void ); + inline HeaderBar& GetHeaderBar( void ); - void ConnectElements( void ); + void ConnectElements( void ); // should be called after all manipulations on elements are done // calcs real sizes depending on sizes of this - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show() - void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable() + void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show() + void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable() }; inline SvHeaderTabListBox& _HeaderTabListBox::GetListBox( void ) diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 6607c5aee4db..5b25f37fdea3 100755 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,21 +32,21 @@ // Help-Ids -------------------------------------------------------------- -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) +#define HID_OPTIONS_COLOR (HID_CUI_START + 1) +#define HID_OPTIONS_SAVE (HID_CUI_START + 2) +#define HID_OPTIONS_PATH (HID_CUI_START + 3) +#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) +#define HID_OPTIONS_LINGU (HID_CUI_START + 5) +#define HID_OPTIONS_SPELL (HID_CUI_START + 6) +#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) +#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) +#define HID_OPTIONS_INET (HID_CUI_START + 9) +#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) +#define HID_OPTIONS_CTL (HID_CUI_START + 11) +#define HID_OPTIONS_PROXY (HID_CUI_START + 12) +#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) +#define HID_OPTIONS_MAIL (HID_CUI_START + 14) +#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) #define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) #define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) #define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) @@ -177,37 +177,37 @@ #define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) #define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) #define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) +#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) #define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) #define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) +#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) +#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) #define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) +#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) +#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) +#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) +#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) +#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) +#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) +#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) +#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) +#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) +#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) +#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) +#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) #define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) +#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) +#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) +#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) +#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) +#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) +#define HID_DLG_NAME (HID_CUI_START + 168) +#define HID_DLG_MESSBOX (HID_CUI_START + 169) #define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) #define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) #define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) +#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) +#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) #define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) #define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) #define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) @@ -222,151 +222,151 @@ #define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) #define HID_SVX_SAVE_IN (HID_CUI_START + 187) #define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) +#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) +#define HID_SEARCH_TEXT (HID_CUI_START + 190) +#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) +#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) +#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) +#define HID_SEARCH_POSITION (HID_CUI_START + 194) +#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) +#define HID_SEARCH_CASE (HID_CUI_START + 196) +#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) +#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) +#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) +#define HID_SEARCH_REGULAR (HID_CUI_START + 200) +#define HID_SEARCH_APPROX (HID_CUI_START + 201) +#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) +#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) +#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) +#define HID_GALLERY_BROWSER (HID_CUI_START + 205) +#define HID_GALLERY_SEARCH (HID_CUI_START + 206) +#define HID_GALLERY_APPLY (HID_CUI_START + 207) #define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) +#define HID_CONFIG_ACCEL (HID_CUI_START + 209) +#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) +#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) +#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) +#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) +#define HID_MACRO_GROUP (HID_CUI_START + 214) +#define HID_MACRO_MACROS (HID_CUI_START + 215) +#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) #define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) #define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) #define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) #define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) +#define HID_MULTIPATH (HID_CUI_START + 221) +#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) #define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) +#define HID_SPELLCHECK (HID_CUI_START + 224) +#define HID_TPSIZE_CTRL (HID_CUI_START + 225) +#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) +#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) +#define HID_TRANS_ANGLE (HID_CUI_START + 228) +#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) +#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) +#define HID_TRANS_SLANT (HID_CUI_START + 232) +#define HID_TPHATCH_CTRL (HID_CUI_START + 233) +#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) +#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) +#define HID_SEARCHATTR (HID_CUI_START + 236) +#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) +#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) +#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) +#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) +#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) +#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) +#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) +#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) +#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) +#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) +#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) +#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) +#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) +#define HID_ALIGNMENT (HID_CUI_START + 250) +#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) +#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) +#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) +#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) +#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) +#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) +#define HID_BACKGROUND (HID_CUI_START + 258) +#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) +#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) +#define HID_BORDER (HID_CUI_START + 261) +#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) +#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) +#define HID_PAGE_CONNECTION (HID_CUI_START + 264) +#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) +#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) +#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) +#define HID_CAPTION (HID_CUI_START + 268) +#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) +#define HID_PAGE_MEASURE (HID_CUI_START + 270) +#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) +#define HID_NUMBERFORMAT (HID_CUI_START + 272) +#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) +#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) +#define HID_FORMAT_PAGE (HID_CUI_START + 275) +#define HID_REDLINING_DLG (HID_CUI_START + 276) +#define HID_REDLINING_EDIT (HID_CUI_START + 277) +#define HID_REDLINING_PREV (HID_CUI_START + 278) +#define HID_REDLINING_NEXT (HID_CUI_START + 279) +#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) +#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) +#define HID_VALUESET_BULLET (HID_CUI_START + 282) +#define HID_VALUESET_NUM (HID_CUI_START + 283) +#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) +#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) +#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) +#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) +#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) +#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) +#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) +#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) +#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) +#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) +#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) #define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) +#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) +#define HID_AREA_AREA (HID_CUI_START + 297) +#define HID_AREA_SHADOW (HID_CUI_START + 298) +#define HID_AREA_HATCH (HID_CUI_START + 299) +#define HID_AREA_BITMAP (HID_CUI_START + 300) +#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) +#define HID_AREA_GRADIENT (HID_CUI_START + 302) +#define HID_LINE_ENDDEF (HID_CUI_START + 303) +#define HID_LINE_LINE (HID_CUI_START + 304) +#define HID_LINE_DEF (HID_CUI_START + 305) +#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) +#define HID_TABULATOR (HID_CUI_START + 307) +#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) +#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) +#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) #define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) +#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) +#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) +#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) +#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) +#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) +#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) +#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) +#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) +#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) +#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) +#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) +#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) +#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) +#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) +#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) +#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) +#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) +#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) +#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) +#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) +#define HID_PASTE_DLG (HID_CUI_START + 333) +#define HID_LINKDLG_TABLB (HID_CUI_START + 334) #define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) #define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) #define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 0bd7309fd953..4501a602e5d5 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,19 +39,19 @@ class SvxHyperlinkNewDocTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpNewDoc; - RadioButton maRbtEditNow; - RadioButton maRbtEditLater; - FixedText maFtPath; - SvxHyperURLBox maCbbPath; - ImageButton maBtCreate; - FixedText maFtDocTypes; - ListBox maLbDocTypes; + FixedLine maGrpNewDoc; + RadioButton maRbtEditNow; + RadioButton maRbtEditLater; + FixedText maFtPath; + SvxHyperURLBox maCbbPath; + ImageButton maBtCreate; + FixedText maFtDocTypes; + ListBox maLbDocTypes; sal_Bool ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const; - void FillDocumentList (); + void FillDocumentList (); - DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New + DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New Image GetImage( USHORT nId ); void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL ); @@ -59,8 +59,8 @@ private: protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); public: @@ -69,10 +69,10 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual BOOL AskApply (); - virtual void DoApply (); + virtual BOOL AskApply (); + virtual void DoApply (); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index a8e3df5e3a2d..3f657aab474b 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,45 +39,45 @@ class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpDocument; - FixedText maFtPath; - SvxHyperURLBox maCbbPath; - ImageButton maBtFileopen; + FixedLine maGrpDocument; + FixedText maFtPath; + SvxHyperURLBox maCbbPath; + ImageButton maBtFileopen; - FixedLine maGrpTarget; - FixedText maFtTarget; - Edit maEdTarget; - FixedText maFtURL; - FixedText maFtFullURL; - ImageButton maBtBrowse; + FixedLine maGrpTarget; + FixedText maFtTarget; + Edit maEdTarget; + FixedText maFtURL; + FixedText maFtFullURL; + ImageButton maBtBrowse; - String maStrURL; + String maStrURL; - BOOL mbMarkWndOpen; + BOOL mbMarkWndOpen; - DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen - DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target + DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen + DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target - 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, + enum EPathType { Type_Unknown, Type_Invalid, + Type_ExistsFile, Type_File, Type_ExistsDir, Type_Dir }; EPathType GetPathType ( String& aStrPath ); protected: void FillDlgFields ( String& aStrURL ); - void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual BOOL ShouldOpenMarkWnd () {return mbMarkWndOpen;} virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;} - String GetCurrentURL (); + String GetCurrentURL (); public: SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet); @@ -85,9 +85,9 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( String& aStrMark ); + virtual void SetMarkStr ( String& aStrMark ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index ae784cd339ad..01c474e60c0b 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,36 +41,36 @@ class SvxHyperlinkInternetTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpLinkTyp; + FixedLine maGrpLinkTyp; RadioButton maRbtLinktypInternet; RadioButton maRbtLinktypFTP; RadioButton maRbtLinktypTelnet; FixedText maFtTarget; - SvxHyperURLBox maCbbTarget; - FixedText maFtLogin; - Edit maEdLogin; - FixedText maFtPassword; - Edit maEdPassword; - CheckBox maCbAnonymous; - ImageButton maBtBrowse; - ImageButton maBtTarget; + SvxHyperURLBox maCbbTarget; + FixedText maFtLogin; + Edit maEdLogin; + FixedText maFtPassword; + Edit maEdPassword; + CheckBox maCbAnonymous; + ImageButton maBtBrowse; + ImageButton maBtTarget; - String maStrOldUser; - String maStrOldPassword; + String maStrOldUser; + String maStrOldPassword; - BOOL mbMarkWndOpen; + BOOL mbMarkWndOpen; - String maStrStdDocURL; + String maStrStdDocURL; - DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type Internet, FTP or Telnet - DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymer Benutzer - DECL_LINK (ClickBrowseHdl_Impl , void * ); // Button : Browse - DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Ziel - DECL_LINK (ModifiedLoginHdl_Impl , void * ); // Contens of editfield "Login" modified - DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus - DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified + DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type Internet, FTP or Telnet + DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymer Benutzer + DECL_LINK (ClickBrowseHdl_Impl , void * ); // Button : Browse + DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Ziel + DECL_LINK (ModifiedLoginHdl_Impl , void * ); // Contens of editfield "Login" modified + DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus + DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified - DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout + DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout void SetScheme( const String& aScheme ); @@ -85,9 +85,9 @@ private: void RefreshMarkWindow(); protected: - virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + virtual void FillDlgFields ( String& aStrURL ); + virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;} @@ -98,10 +98,10 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( String& aStrMark ); - virtual void SetOnlineMode( BOOL bEnable ); + virtual void SetMarkStr ( String& aStrMark ); + virtual void SetOnlineMode( BOOL bEnable ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index a7bc2fe012f3..ea0bda235b83 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,18 +39,18 @@ class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase { private: - FixedLine maGrpMailNews; - RadioButton maRbtMail; - RadioButton maRbtNews; - FixedText maFtReceiver; - SvxHyperURLBox maCbbReceiver; - ImageButton maBtAdrBook; - FixedText maFtSubject; - Edit maEdSubject; + FixedLine maGrpMailNews; + RadioButton maRbtMail; + RadioButton maRbtNews; + FixedText maFtReceiver; + SvxHyperURLBox maCbbReceiver; + ImageButton maBtAdrBook; + FixedText maFtSubject; + Edit maEdSubject; - DECL_LINK (Click_SmartProtocol_Impl, void * ); // Radiobutton clicked: Type EMAIl or News - DECL_LINK (ClickAdrBookHdl_Impl , void * ); // Button : Address book - DECL_LINK (ModifiedReceiverHdl_Impl, void * ); // Combobox "receiver" modified + DECL_LINK (Click_SmartProtocol_Impl, void * ); // Radiobutton clicked: Type EMAIl or News + DECL_LINK (ClickAdrBookHdl_Impl , void * ); // Button : Address book + DECL_LINK (ModifiedReceiverHdl_Impl, void * ); // Combobox "receiver" modified void SetScheme( const String& aScheme ); void RemoveImproperProtocol(const String& aProperScheme); @@ -61,8 +61,8 @@ private: protected: virtual void FillDlgFields ( String& aStrURL ); - virtual void GetCurentItemData ( String& aStrURL, String& aStrName, - String& aStrIntName, String& aStrFrame, + virtual void GetCurentItemData ( String& aStrURL, String& aStrName, + String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); public: @@ -71,7 +71,7 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetInitFocus(); + virtual void SetInitFocus(); }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 024637e77991..f3f1156aba74 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,12 +34,12 @@ #include <vcl/button.hxx> #include <svtools/svtreebx.hxx> -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" //ADD CHINA001 class SvxHyperlinkTabPageBase; //######################################################################## //# # -//# Tree-Window # +//# Tree-Window # //# # //######################################################################## @@ -58,7 +58,7 @@ public: //######################################################################## //# # -//# Window-Class # +//# Window-Class # //# # //######################################################################## @@ -67,19 +67,19 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow private: friend class SvxHlmarkTreeLBox; - PushButton maBtApply; - PushButton maBtClose; - //SvTreeListBox maLbTree; + PushButton maBtApply; + PushButton maBtClose; + //SvTreeListBox maLbTree; SvxHlmarkTreeLBox maLbTree; - BOOL mbUserMoved; - BOOL mbFirst; + BOOL mbUserMoved; + BOOL mbFirst; SvxHyperlinkTabPageBase* mpParent; - String maStrLastURL; + String maStrLastURL; - USHORT mnError; + USHORT mnError; protected: BOOL RefreshFromDoc( ::rtl::OUString aURL ); @@ -107,6 +107,6 @@ public: }; -#endif // _SVX_BKWND_HYPERLINK_HXX +#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 b6de42439f3b..f44e6c12ffb4 100644 --- a/cui/source/inc/hlmarkwn_def.hxx +++ b/cui/source/inc/hlmarkwn_def.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ #ifndef _SVX_BKWND_HYPERLINK_DEF_HXX #define _SVX_BKWND_HYPERLINK_DEF_HXX -#define LERR_NOERROR 0 -#define LERR_NOENTRIES 1 -#define LERR_DOCNOTOPEN 2 +#define LERR_NOERROR 0 +#define LERR_NOENTRIES 1 +#define LERR_DOCNOTOPEN 2 #endif diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index f93f5f346c9e..be491bf041e7 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #ifndef _SVX_TABBASE_HYPERLINK_HXX #define _SVX_TABBASE_HYPERLINK_HXX -#define INET_TELNET_SCHEME "telnet://" +#define INET_TELNET_SCHEME "telnet://" #include <sfx2/app.hxx> #include <sfx2/tabdlg.hxx> @@ -83,7 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper private: BOOL mbAccessAddress; -// String GetAllEmailNamesFromDragItem( USHORT nItem ); +// String GetAllEmailNamesFromDragItem( USHORT nItem ); protected: @@ -110,15 +110,15 @@ class SvxHyperlinkTabPageBase : public IconChoicePage { private: FixedLine *mpGrpMore; - FixedText *mpFtFrame; - SvxFramesComboBox *mpCbbFrame; - FixedText *mpFtForm; - ListBox *mpLbForm; - FixedText *mpFtIndication; - Edit *mpEdIndication; - FixedText *mpFtText; - Edit *mpEdText; - ImageButton *mpBtScript; + FixedText *mpFtFrame; + SvxFramesComboBox *mpCbbFrame; + FixedText *mpFtForm; + ListBox *mpLbForm; + FixedText *mpFtIndication; + Edit *mpEdIndication; + FixedText *mpFtText; + Edit *mpEdText; + ImageButton *mpBtScript; sal_Bool mbIsCloseDisabled; @@ -126,13 +126,13 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + Window* mpDialog; - BOOL mbStdControlsInit; + BOOL mbStdControlsInit; - String maStrInitURL; + String maStrInitURL; - Timer maTimer; + Timer maTimer; SvxHlinkDlgMarkWnd* mpMarkWnd; @@ -144,15 +144,15 @@ protected: SvxLinkInsertMode& eMode ) = 0; virtual String CreateUiNameFromURL( const String& aStrURL ); - void GetDataFromCommonFields( String& aStrName, + void GetDataFromCommonFields( String& aStrName, String& aStrIntName, String& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK (ClickScriptHdl_Impl, void * ); // Button : Script + DECL_LINK (ClickScriptHdl_Impl, void * ); // Button : Script - String aEmptyStr; + String aEmptyStr; - BOOL FileExists( const INetURLObject& rURL ); + BOOL FileExists( const INetURLObject& rURL ); static String GetSchemeFromURL( String aStrURL ); inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; } @@ -179,10 +179,10 @@ public: virtual void Reset( const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& rItemSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); BOOL IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } - Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } + Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE ); virtual void ActivatePage(); @@ -194,7 +194,7 @@ protected: virtual void SetMarkWndShouldOpen(BOOL bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } + void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 2cdad5523d4f..6bf036962bc1 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 38725c02ecb7..bc82c8d30cb0 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ #include <tools/list.hxx> #include <tools/string.hxx> -#define CTRLS_OFFSET 3 -#define BUTTON_DISTANCE 8 -#define RET_USER 100 -#define RET_USER_CANCEL 101 +#define CTRLS_OFFSET 3 +#define BUTTON_DISTANCE 8 +#define RET_USER 100 +#define RET_USER_CANCEL 101 // forward-declarations struct IconChoicePageData; @@ -51,7 +51,7 @@ class IconChoicePage; // Create-Function typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetPageRanges)(); // liefert internationale Which-Wert +typedef USHORT* (*GetPageRanges)(); // liefert internationale Which-Wert // page-list DECLARE_LIST( IconChoicePageList, IconChoicePageData * ) @@ -67,21 +67,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom }; struct IconChoicePageData { - USHORT nId; // Die ID - CreatePage fnCreatePage; // Pointer auf die Factory + USHORT nId; // Die ID + CreatePage fnCreatePage; // Pointer auf die Factory GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion - IconChoicePage* pPage; // die TabPage selber - BOOL bOnDemand; // Flag: ItemSet onDemand - BOOL bRefresh; // Flag: Seite mu\s neu initialisiert werden + IconChoicePage* pPage; // die TabPage selber + BOOL bOnDemand; // Flag: ItemSet onDemand + BOOL bRefresh; // Flag: Seite mu\s neu initialisiert werden // Konstruktor IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand ) - : nId ( Id ), - fnCreatePage ( fnPage ), - fnGetRanges ( fnRanges ), - pPage ( NULL ), - bOnDemand ( bDemand ), - bRefresh ( FALSE ) + : nId ( Id ), + fnCreatePage ( fnPage ), + fnGetRanges ( fnRanges ), + pPage ( NULL ), + bOnDemand ( bDemand ), + bRefresh ( FALSE ) {} }; @@ -97,40 +97,40 @@ class IconChoicePage : public TabPage using TabPage::DeactivatePage; private : - const SfxItemSet* pSet; - String aUserString; - BOOL bHasExchangeSupport; - IconChoiceDialog* pDialog; - BOOL bStandard; + const SfxItemSet* pSet; + String aUserString; + BOOL bHasExchangeSupport; + IconChoiceDialog* pDialog; + BOOL bStandard; - void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } - IconChoiceDialog* GetDialog() const { return pDialog; } + void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } + IconChoiceDialog* GetDialog() const { return pDialog; } - void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } + void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } - void ImplInitSettings(); + void ImplInitSettings(); protected : IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); - USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); + USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } + USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } + const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); + const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); public : virtual ~IconChoicePage(); - const SfxItemSet& GetItemSet() const { return *pSet; } + const SfxItemSet& GetItemSet() const { return *pSet; } - virtual BOOL FillItemSet( SfxItemSet& ) = 0; - virtual void Reset( const SfxItemSet& ) = 0; + virtual BOOL FillItemSet( SfxItemSet& ) = 0; + virtual void Reset( const SfxItemSet& ) = 0; - BOOL HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( BOOL bNew = TRUE ) { bHasExchangeSupport = bNew; } + BOOL HasExchangeSupport() const { return bHasExchangeSupport; } + void SetExchangeSupport( BOOL bNew = TRUE ) { bHasExchangeSupport = bNew; } enum { - KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln + KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln // 2. F"ullen eines ItemSets f"ur die Aktualilsierung // "ubergeordneter Beispiele; dieser Pointer kann immer // NULL sein!! @@ -139,18 +139,18 @@ public : REFRESH_SET = 0x0002 }; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetUserData(const String& rString) { aUserString = rString; } - String GetUserData() { return aUserString; } - virtual void FillUserData(); - virtual BOOL IsReadOnly() const; + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + void SetUserData(const String& rString) { aUserString = rString; } + String GetUserData() { return aUserString; } + virtual void FillUserData(); + virtual BOOL IsReadOnly() const; virtual sal_Bool QueryClose(); static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ); + void DataChanged( const DataChangedEvent& rDCEvt ); }; /********************************************************************** @@ -164,63 +164,63 @@ class IconChoiceDialog : public ModalDialog private : friend class IconChoicePage; - EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's - IconChoicePageList maPageList; // Liste von PageData-Pointer + EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's + IconChoicePageList maPageList; // Liste von PageData-Pointer - SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control + SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control - USHORT mnCurrentPageId; // Id der aktuell sichtbaren Page + USHORT mnCurrentPageId; // Id der aktuell sichtbaren Page // Buttons - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - PushButton aResetBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + PushButton aResetBtn; - const SfxItemSet* pSet; - SfxItemSet* pOutSet; - SfxItemSet* pExampleSet; - USHORT* pRanges; + const SfxItemSet* pSet; + SfxItemSet* pOutSet; + SfxItemSet* pExampleSet; + USHORT* pRanges; - sal_uInt32 nResId; + sal_uInt32 nResId; - BOOL bHideResetBtn; - BOOL bModal; - BOOL bInOK; - BOOL bModified; - BOOL bItemsReset; + BOOL bHideResetBtn; + BOOL bModal; + BOOL bInOK; + BOOL bModified; + BOOL bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK ( OkHdl, Button * ); + DECL_LINK ( OkHdl, Button * ); DECL_LINK ( ResetHdl, Button * ); - DECL_LINK ( CancelHdl, Button * ); + DECL_LINK ( CancelHdl, Button * ); - IconChoicePageData* GetPageData ( USHORT nId ); - void Start_Impl(); - BOOL OK_Impl(); + IconChoicePageData* GetPageData ( USHORT nId ); + void Start_Impl(); + BOOL OK_Impl(); - void SetPosSizeCtrls ( BOOL bInit = FALSE ); - void SetPosSizePages ( USHORT nId ); + void SetPosSizeCtrls ( BOOL bInit = FALSE ); + void SetPosSizePages ( USHORT nId ); - void FocusOnIcon ( USHORT nId ); + void FocusOnIcon ( USHORT nId ); protected : - void ShowPageImpl ( IconChoicePageData* pData ); - void HidePageImpl ( IconChoicePageData* pData ); + void ShowPageImpl ( IconChoicePageData* pData ); + void HidePageImpl ( IconChoicePageData* pData ); virtual void PageCreated( USHORT nId, IconChoicePage& rPage ); - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); - inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; } - inline IconChoicePage* GetTabPage( USHORT nPageId ) + virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; } + inline IconChoicePage* GetTabPage( USHORT nPageId ) { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); } - const SfxItemSet* GetRefreshedSet(); + const SfxItemSet* GetRefreshedSet(); - void ActivatePageImpl (); - BOOL DeActivatePageImpl (); - void ResetPageImpl (); + void ActivatePageImpl (); + BOOL DeActivatePageImpl (); + void ResetPageImpl (); - short Ok(); - BOOL IsInOK() const; + short Ok(); + BOOL IsInOK() const; public : @@ -233,55 +233,55 @@ public : /////////////////////////////////////////////////////////////////////////////////// // virtuelle Methoden // - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); /////////////////////////////////////////////////////////////////////////////////// // Schnittstelle // - SvxIconChoiceCtrlEntry* AddTabPage( + SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - SvxIconChoiceCtrlEntry* AddTabPage( + SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - void RemoveTabPage( USHORT nId ); + void RemoveTabPage( USHORT nId ); - void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } - USHORT GetCurPageId() const { return mnCurrentPageId; } - void ShowPage( USHORT nId ); + void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } + USHORT GetCurPageId() const { return mnCurrentPageId; } + void ShowPage( USHORT nId ); // liefert ggf. per Map konvertierte lokale Slots - const USHORT* GetInputRanges( const SfxItemPool& ); - void SetInputSet( const SfxItemSet* pInSet ); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ); - int FillOutputItemSet(); - - const OKButton& GetOKButton() const { return aOKBtn; } - OKButton& GetOKButton() { return aOKBtn; } + const USHORT* GetInputRanges( const SfxItemPool& ); + void SetInputSet( const SfxItemSet* pInSet ); + const SfxItemSet* GetOutputItemSet() const { return pOutSet; } + const SfxItemSet* GetOutputItemSet( USHORT nId ); + int FillOutputItemSet(); + + const OKButton& GetOKButton() const { return aOKBtn; } + OKButton& GetOKButton() { return aOKBtn; } const CancelButton& GetCancelButton() const { return aCancelBtn; } - CancelButton& GetCancelButton() { return aCancelBtn; } - const HelpButton& GetHelpButton() const { return aHelpBtn; } - HelpButton& GetHelpButton() { return aHelpBtn; } + CancelButton& GetCancelButton() { return aCancelBtn; } + const HelpButton& GetHelpButton() const { return aHelpBtn; } + HelpButton& GetHelpButton() { return aHelpBtn; } - void RemoveResetButton(); + void RemoveResetButton(); - short Execute(); - void Start( BOOL bShow = TRUE ); + short Execute(); + void Start( BOOL bShow = TRUE ); sal_Bool QueryClose(); - const SfxItemSet* GetExampleSet() const { return pExampleSet; } + const SfxItemSet* GetExampleSet() const { return pExampleSet; } - void SetCtrlColor ( const Color& rColor ); - EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); + void SetCtrlColor ( const Color& rColor ); + EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); - void CreateIconTextAutoMnemonics( void ); + void CreateIconTextAutoMnemonics( void ); }; #endif //_ICCDLG_HXX diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 6959cb8b3233..f001efcd63a9 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <vcl/field.hxx> #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svmedit.hxx> // MultiLineEdit +#include <svtools/svmedit.hxx> // MultiLineEdit #include <comphelper/embeddedobjectcontainer.hxx> class INetURLObject; @@ -90,7 +90,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); } public: - static void FillObjectServerList( SvObjectServerList* ); + static void FillObjectServerList( SvObjectServerList* ); SvInsertOleDlg( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, @@ -171,29 +171,29 @@ public: class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl { private: - FixedText aFTName; - Edit aEDName; - FixedText aFTURL; - Edit aEDURL; - PushButton aBTOpen; - - RadioButton aRBScrollingOn; - RadioButton aRBScrollingOff; - RadioButton aRBScrollingAuto; + FixedText aFTName; + Edit aEDName; + FixedText aFTURL; + Edit aEDURL; + PushButton aBTOpen; + + RadioButton aRBScrollingOn; + RadioButton aRBScrollingOff; + RadioButton aRBScrollingAuto; FixedLine aFLScrolling; FixedLine aFLSepLeft; RadioButton aRBFrameBorderOn; - RadioButton aRBFrameBorderOff; + RadioButton aRBFrameBorderOff; FixedLine aFLFrameBorder; FixedLine aFLSepRight; FixedText aFTMarginWidth; - NumericField aNMMarginWidth; - CheckBox aCBMarginWidthDefault; - FixedText aFTMarginHeight; - NumericField aNMMarginHeight; - CheckBox aCBMarginHeightDefault; + NumericField aNMMarginWidth; + CheckBox aCBMarginWidthDefault; + FixedText aFTMarginHeight; + NumericField aNMMarginHeight; + CheckBox aCBMarginHeightDefault; FixedLine aFLMargin; OKButton aOKButton1; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 22bb9771e0dc..7552d919d952 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,20 +40,20 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { - FixedText aCount; - NumericField aCountEdit; + FixedText aCount; + NumericField aCountEdit; FixedLine aInsFL; - RadioButton aBeforeBtn; - RadioButton aAfterBtn; + RadioButton aBeforeBtn; + RadioButton aAfterBtn; FixedLine aPosFL; - String aRow; - String aCol; + String aRow; + String aCol; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; bool bColumn; diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx index a4372d52ddbe..52f2bbb1a1a4 100644 --- a/cui/source/inc/internationaloptions.hxx +++ b/cui/source/inc/internationaloptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,22 +38,22 @@ namespace offapp { private: struct IMPL; - IMPL* m_pImpl; + IMPL* m_pImpl; protected: InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& _rSet ); - virtual void Reset( const SfxItemSet& _rSet ); + virtual BOOL FillItemSet( SfxItemSet& _rSet ); + virtual void Reset( const SfxItemSet& _rSet ); public: - virtual ~InternationalOptionsPage(); + virtual ~InternationalOptionsPage(); - static SfxTabPage* CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet ); - static SfxTabPage* CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ); }; -} // /namespace offapp +} // /namespace offapp #endif diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index c4c9254a0894..2bc88101752d 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,65 +45,65 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3; class SvxCaptionTabPage : public SfxTabPage { private: - ValueSet aCT_CAPTTYPE; - FixedText aFT_ABSTAND; - MetricField aMF_ABSTAND; - FixedText aFT_WINKEL; - ListBox aLB_WINKEL; - FixedText aFT_ANSATZ; - ListBox aLB_ANSATZ; - FixedText aFT_UM; - MetricField aMF_ANSATZ; - FixedText aFT_ANSATZ_REL; - ListBox aLB_ANSATZ_REL; - FixedText aFT_LAENGE; - MetricField aMF_LAENGE; - CheckBox aCB_LAENGE; - - Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; - Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT]; - - String aStrHorzList; - String aStrVertList; - - short nCaptionType; - BOOL bFixedAngle; - INT32 nFixedAngle; - INT32 nGap; - short nEscDir; - BOOL bEscRel; - INT32 nEscAbs; - INT32 nEscRel; - INT32 nLineLen; - BOOL bFitLineLen; - - USHORT nAnsatzRelPos; - USHORT nAnsatzTypePos; - USHORT nWinkelTypePos; + ValueSet aCT_CAPTTYPE; + FixedText aFT_ABSTAND; + MetricField aMF_ABSTAND; + FixedText aFT_WINKEL; + ListBox aLB_WINKEL; + FixedText aFT_ANSATZ; + ListBox aLB_ANSATZ; + FixedText aFT_UM; + MetricField aMF_ANSATZ; + FixedText aFT_ANSATZ_REL; + ListBox aLB_ANSATZ_REL; + FixedText aFT_LAENGE; + MetricField aMF_LAENGE; + CheckBox aCB_LAENGE; + + Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT]; + Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT]; + + String aStrHorzList; + String aStrVertList; + + short nCaptionType; + BOOL bFixedAngle; + INT32 nFixedAngle; + INT32 nGap; + short nEscDir; + BOOL bEscRel; + INT32 nEscAbs; + INT32 nEscRel; + INT32 nLineLen; + BOOL bFitLineLen; + + USHORT nAnsatzRelPos; + USHORT nAnsatzTypePos; + USHORT nWinkelTypePos; #ifdef _SVX_LABDLG_CXX - void SetupAnsatz_Impl( USHORT nType ); - void SetupType_Impl( USHORT nType ); + void SetupAnsatz_Impl( USHORT nType ); + void SetupType_Impl( USHORT nType ); DECL_LINK( AnsatzSelectHdl_Impl, ListBox * ); DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * ); DECL_LINK( LineOptHdl_Impl, Button * ); DECL_LINK( SelectCaptTypeHdl_Impl, void * ); #endif - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; public: SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxCaptionTabPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); - void Construct(); - void SetView( const SdrView* pSdrView ) + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -115,12 +115,12 @@ public: class SvxCaptionTabDialog : public SfxTabDialog { private: -// const SfxItemSet& rOutAttrs; - const SdrView* pView; - USHORT nAnchorCtrls; +// const SfxItemSet& rOutAttrs; + const SdrView* pView; + USHORT nAnchorCtrls; Link aValidateLink; - + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -129,8 +129,8 @@ public: USHORT nAnchorTypes = 0 ); ~SvxCaptionTabDialog(); - - //link for the Writer to validate positions + + //link for the Writer to validate positions void SetValidateFramePosLink( const Link& rLink ); }; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index bcc0fd74625b..0a55ce429235 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svmedit.hxx> // MultiLineEdit +#include <svtools/svmedit.hxx> // MultiLineEdit #include <svtools/svtabbx.hxx> // MultiLineEdit /********************** SvUpdateLinksDialog ****************************** @@ -80,7 +80,7 @@ class SvBaseLinksDlg : public ModalDialog String aStrCloselinkmsgMulti; String aStrWaitinglink; sfx2::LinkManager* pLinkMgr; - BOOL bHtmlMode; + BOOL bHtmlMode; SvTabListBox aTbLinks; Timer aUpdateTimer; @@ -101,27 +101,27 @@ class SvBaseLinksDlg : public ModalDialog void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False); #endif - void StartUpdateTimer() { aUpdateTimer.Start(); } + void StartUpdateTimer() { aUpdateTimer.Start(); } - SvTabListBox& Links() { return aTbLinks; } - FixedText& FileName() { return aFtFullFileName; } - FixedText& SourceName() { return aFtFullSourceName; } - FixedText& TypeName() { return aFtFullTypeName; } - RadioButton& Automatic() { return aRbAutomatic; } - RadioButton& Manual() { return aRbManual; } - PushButton& UpdateNow() { return aPbUpdateNow; } - PushButton& OpenSource() { return aPbOpenSource; } - PushButton& ChangeSource() { return aPbChangeSource; } - PushButton& BreakLink() { return aPbBreakLink; } + SvTabListBox& Links() { return aTbLinks; } + FixedText& FileName() { return aFtFullFileName; } + FixedText& SourceName() { return aFtFullSourceName; } + FixedText& TypeName() { return aFtFullTypeName; } + RadioButton& Automatic() { return aRbAutomatic; } + RadioButton& Manual() { return aRbManual; } + PushButton& UpdateNow() { return aPbUpdateNow; } + PushButton& OpenSource() { return aPbOpenSource; } + PushButton& ChangeSource() { return aPbChangeSource; } + PushButton& BreakLink() { return aPbBreakLink; } - String& Autolink() { return aStrAutolink; } - String& Manuallink() { return aStrManuallink; } - String& Brokenlink() { return aStrBrokenlink; } - String& Graphiclink() { return aStrGraphiclink; } - String& Buttonclose() { return aStrButtonclose; } - String& Closelinkmsg() { return aStrCloselinkmsg; } - String& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } - String& Waitinglink() { return aStrWaitinglink; } + String& Autolink() { return aStrAutolink; } + String& Manuallink() { return aStrManuallink; } + String& Brokenlink() { return aStrBrokenlink; } + String& Graphiclink() { return aStrGraphiclink; } + String& Buttonclose() { return aStrButtonclose; } + String& Closelinkmsg() { return aStrCloselinkmsg; } + String& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } + String& Waitinglink() { return aStrWaitinglink; } void SetManager( sfx2::LinkManager* ); public: diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 7b8330f31db6..236d974d257c 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class _SfxMacroTabPage_Impl; class _SfxMacroTabPage : public SfxTabPage { - SvxMacroTableDtor aTbl; + SvxMacroTableDtor aTbl; DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * ); @@ -65,41 +65,41 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); protected: - _SfxMacroTabPage_Impl* mpImpl; + _SfxMacroTabPage_Impl* mpImpl; _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); - void InitAndSetHandler(); - void FillEvents(); - void FillMacroList(); - void EnableButtons( const String& rLanguage ); + void InitAndSetHandler(); + void FillEvents(); + void FillMacroList(); + void EnableButtons( const String& rLanguage ); public: - virtual ~_SfxMacroTabPage(); + virtual ~_SfxMacroTabPage(); - void AddEvent( const String & rEventName, USHORT nEventId ); + void AddEvent( const String & rEventName, USHORT nEventId ); - const SvxMacroTableDtor& GetMacroTbl() const; - void SetMacroTbl( const SvxMacroTableDtor& rTbl ); - void ClearMacroTbl(); + const SvxMacroTableDtor& GetMacroTbl() const; + void SetMacroTbl( const SvxMacroTableDtor& rTbl ); + void ClearMacroTbl(); - virtual void ScriptChanged( const String& rLanguage ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void ScriptChanged( const String& rLanguage ); + virtual void PageCreated (SfxAllItemSet aSet); // zum setzen / abfragen der Links - void SetGetRangeLink( FNGetRangeHdl pFn ); - FNGetRangeHdl GetGetRangeLink() const; - void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); - FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; + void SetGetRangeLink( FNGetRangeHdl pFn ); + FNGetRangeHdl GetGetRangeLink() const; + void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); + FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; // --------- Erben aus der Basis ------------- - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetReadOnly( BOOL bSet ); - BOOL IsReadOnly() const; - void SelectEvent( const String& rEventName, USHORT nEventId ); + void SetReadOnly( BOOL bSet ); + BOOL IsReadOnly() const; + void SelectEvent( const String& rEventName, USHORT nEventId ); }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const @@ -138,7 +138,7 @@ public: Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); - virtual ~SfxMacroAssignDlg(); + virtual ~SfxMacroAssignDlg(); }; #endif diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index c469410c4247..afdd26a01aef 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ class _SvxMacroTabPage : public SfxTabPage #endif protected: - _SvxMacroTabPage_Impl* mpImpl; + _SvxMacroTabPage_Impl* mpImpl; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocEvents; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xModifiable; @@ -89,24 +89,24 @@ protected: _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); - void EnableButtons( const String& rLanguage ); - ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); + void EnableButtons( const String& rLanguage ); + ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); public: - virtual ~_SvxMacroTabPage(); + virtual ~_SvxMacroTabPage(); void InitResources(); - void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - + void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + using SfxTabPage::Reset; - virtual void Reset(); + virtual void Reset(); - void DisplayAppEvents( bool appEvents); - void SetReadOnly( BOOL bSet ); - BOOL IsReadOnly() const; + void DisplayAppEvents( bool appEvents); + void SetReadOnly( BOOL bSet ); + BOOL IsReadOnly() const; }; class SvxMacroTabPage : public _SvxMacroTabPage @@ -124,7 +124,7 @@ public: // class SvxMacroAssignDlg -------------------------------------------------- -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte +typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte class SvxMacroAssignSingleTabDialog : public SfxModalDialog { @@ -133,24 +133,24 @@ public: virtual ~SvxMacroAssignSingleTabDialog(); - void SetTabPage( SfxTabPage* pTabPage ); - // SfxTabPage* GetTabPage() const { return pPage; } + void SetTabPage( SfxTabPage* pTabPage ); + // SfxTabPage* GetTabPage() const { return pPage; } - // OKButton* GetOKButton() const { return pOKBtn; } - // CancelButton* GetCancelButton() const { return pCancelBtn; } + // OKButton* GetOKButton() const { return pOKBtn; } + // CancelButton* GetCancelButton() const { return pCancelBtn; } private: SfxViewFrame* pFrame; - FixedLine* pFixedLine; + FixedLine* pFixedLine; - OKButton* pOKBtn; - CancelButton* pCancelBtn; - HelpButton* pHelpBtn; + OKButton* pOKBtn; + CancelButton* pCancelBtn; + HelpButton* pHelpBtn; - SfxTabPage* pPage; - const SfxItemSet* pOptions; - SfxItemSet* pOutSet; + SfxTabPage* pPage; + const SfxItemSet* pOptions; + SfxItemSet* pOutSet; #if _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -168,7 +168,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex ); - virtual ~SvxMacroAssignDlg(); + virtual ~SvxMacroAssignDlg(); }; #endif diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 035232349443..db01be96c4a8 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,43 +48,43 @@ class SvxMeasurePage : public SvxTabPage { private: - FixedLine aFlLine; - FixedText aFtLineDist; - MetricField aMtrFldLineDist; - FixedText aFtHelplineOverhang; - MetricField aMtrFldHelplineOverhang; - FixedText aFtHelplineDist; - MetricField aMtrFldHelplineDist; - FixedText aFtHelpline1Len; - MetricField aMtrFldHelpline1Len; - FixedText aFtHelpline2Len; - MetricField aMtrFldHelpline2Len; - TriStateBox aTsbBelowRefEdge; - FixedText aFtDecimalPlaces; - MetricField aMtrFldDecimalPlaces; - - FixedLine aFlLabel; + FixedLine aFlLine; + FixedText aFtLineDist; + MetricField aMtrFldLineDist; + FixedText aFtHelplineOverhang; + MetricField aMtrFldHelplineOverhang; + FixedText aFtHelplineDist; + MetricField aMtrFldHelplineDist; + FixedText aFtHelpline1Len; + MetricField aMtrFldHelpline1Len; + FixedText aFtHelpline2Len; + MetricField aMtrFldHelpline2Len; + TriStateBox aTsbBelowRefEdge; + FixedText aFtDecimalPlaces; + MetricField aMtrFldDecimalPlaces; + + FixedLine aFlLabel; FixedText aFtPosition; - SvxRectCtl aCtlPosition; - TriStateBox aTsbAutoPosV; - TriStateBox aTsbAutoPosH; - TriStateBox aTsbShowUnit; - ListBox aLbUnit; - TriStateBox aTsbParallel; + SvxRectCtl aCtlPosition; + TriStateBox aTsbAutoPosV; + TriStateBox aTsbAutoPosH; + TriStateBox aTsbShowUnit; + ListBox aLbUnit; + TriStateBox aTsbParallel; - SvxXMeasurePreview aCtlPreview; + SvxXMeasurePreview aCtlPreview; FixedLine aFlVert; - const SfxItemSet& rOutAttrs; - SfxItemSet aAttrSet; - const SdrView* pView; - SfxMapUnit eUnit; + const SfxItemSet& rOutAttrs; + SfxItemSet aAttrSet; + const SdrView* pView; + SfxMapUnit eUnit; - BOOL bPositionModified; + BOOL bPositionModified; #ifdef _SVX_MEASURE_CXX - void FillUnitLB(); + void FillUnitLB(); DECL_LINK( ClickAutoPosHdl_Impl, void * ); DECL_LINK( ChangeAttrHdl_Impl, void * ); @@ -95,17 +95,17 @@ public: SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxMeasurePage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; /************************************************************************* diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx index 83f35568516c..26c496902c8a 100644 --- a/cui/source/inc/multifil.hxx +++ b/cui/source/inc/multifil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class SvxMultiFileDialog : public SvxMultiPathDialog private: // #97807# ------------------------------------- std::map< String, ::ucbhelper::Content > aFileContentMap; - + DECL_LINK( AddHdl_Impl, PushButton * ); DECL_LINK( DelHdl_Impl, PushButton * ); @@ -51,8 +51,8 @@ public: SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); ~SvxMultiFileDialog(); - String GetFiles() const { return SvxMultiPathDialog::GetPath(); } - void SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); } + String GetFiles() const { return SvxMultiPathDialog::GetPath(); } + void SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); } }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 6a79ccbcecd7..71395e271b19 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ // different delimiter for Unix (:) and Windows (;) #ifdef UNX -#define CLASSPATH_DELIMITER ':' +#define CLASSPATH_DELIMITER ':' #else -#define CLASSPATH_DELIMITER ';' +#define CLASSPATH_DELIMITER ';' #endif // forward --------------------------------------------------------------- @@ -66,7 +66,7 @@ protected: CancelButton aCancelBtn; HelpButton aHelpButton; - MultiPath_Impl* pImpl; + MultiPath_Impl* pImpl; DECL_LINK( AddHdl_Impl, PushButton * ); DECL_LINK( DelHdl_Impl, PushButton * ); @@ -77,10 +77,10 @@ public: SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); ~SvxMultiPathDialog(); - String GetPath() const; - void SetPath( const String& rPath ); - void SetClassPathMode(); - sal_Bool IsClassPathMode() const; + String GetPath() const; + void SetPath( const String& rPath ); + void SetClassPathMode(); + sal_Bool IsClassPathMode() const; void EnableRadioButtonMode(); }; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 82432585851e..03afebbfd5b1 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,15 +38,15 @@ class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog { private: - FixedText maFtColumns; - NumericField maNumColumns; - FixedText maFtRows; - NumericField maNumRows; + FixedText maFtColumns; + NumericField maNumColumns; + FixedText maFtRows; + NumericField maNumRows; - FixedLine maFlSep; - HelpButton maHelpButton; - OKButton maOkButton; - CancelButton maCancelButton; + FixedLine maFlSep; + HelpButton maHelpButton; + OKButton maOkButton; + CancelButton maCancelButton; public: SvxNewTableDialog( Window* pWindow ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 12cac90278d6..255eb4dba53f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ #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 +//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 //------------------------------------------------------------------------ @@ -59,15 +59,15 @@ class SvxNumberInfoItem; class SvxNumberPreviewImpl : public Window { private: - String aPrevStr; - Color aPrevCol; + String aPrevStr; + Color aPrevCol; - void InitSettings( BOOL bForeground, BOOL bBackground ); + void InitSettings( BOOL bForeground, BOOL bBackground ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SvxNumberPreviewImpl( Window* pParent, const ResId& rResId ); @@ -93,83 +93,83 @@ public: # define SfxTabPage ::SfxTabPage #endif - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); - void SetInfoItem( const SvxNumberInfoItem& rItem ); - void SetNumberFormatList( const SvxNumberInfoItem& rItem ) + void SetInfoItem( const SvxNumberInfoItem& rItem ); + void SetNumberFormatList( const SvxNumberInfoItem& rItem ) { SetInfoItem( rItem ); } - void SetOkHdl( const Link& rOkHandler ); - void HideLanguage(BOOL nFlag=TRUE); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetOkHdl( const Link& rOkHandler ); + void HideLanguage(BOOL nFlag=TRUE); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 private: - SvxNumberFormatTabPage( Window* pParent, + SvxNumberFormatTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); - FixedText aFtCategory; - ListBox aLbCategory; - FixedText aFtFormat; - ListBox aLbCurrency; - SvxFontListBox aLbFormat; - FixedText aFtLanguage; - SvxLanguageBox aLbLanguage; + FixedText aFtCategory; + ListBox aLbCategory; + FixedText aFtFormat; + ListBox aLbCurrency; + SvxFontListBox aLbFormat; + FixedText aFtLanguage; + SvxLanguageBox aLbLanguage; CheckBox aCbSourceFormat; - FixedText aFtDecimals; - NumericField aEdDecimals; - FixedText aFtLeadZeroes; - NumericField aEdLeadZeroes; - CheckBox aBtnNegRed; - CheckBox aBtnThousand; + FixedText aFtDecimals; + NumericField aEdDecimals; + FixedText aFtLeadZeroes; + NumericField aEdLeadZeroes; + CheckBox aBtnNegRed; + CheckBox aBtnThousand; FixedLine aFlOptions; - FixedText aFtEdFormat; - Edit aEdFormat; - ImageButton aIbAdd; - ImageButton aIbInfo; - ImageButton aIbRemove; + FixedText aFtEdFormat; + Edit aEdFormat; + ImageButton aIbAdd; + ImageButton aIbInfo; + ImageButton aIbRemove; - FixedText aFtComment; - Edit aEdComment; - Timer aResetWinTimer; + FixedText aFtComment; + Edit aEdComment; + Timer aResetWinTimer; - SvxNumberPreviewImpl aWndPreview; + SvxNumberPreviewImpl aWndPreview; - SvxNumberInfoItem* pNumItem; - SvxNumberFormatShell* pNumFmtShell; - ULONG nInitFormat; - Link fnOkHdl; + SvxNumberInfoItem* pNumItem; + SvxNumberFormatShell* pNumFmtShell; + ULONG nInitFormat; + Link fnOkHdl; - BOOL bNumItemFlag; //Fuer Handling mit DocShell - BOOL bOneAreaFlag; - short nFixedCategory; + BOOL bNumItemFlag; //Fuer Handling mit DocShell + BOOL bOneAreaFlag; + short nFixedCategory; - long nCatHeight; + long nCatHeight; - long nCurFormatY; - long nCurFormatHeight; - long nStdFormatY; - long nStdFormatHeight; + long nCurFormatY; + long nCurFormatHeight; + long nStdFormatY; + long nStdFormatHeight; LocalizedString sAutomaticEntry; - Window* pLastActivWindow; + Window* pLastActivWindow; #ifdef _SVX_NUMFMT_CXX - void Init_Impl(); - void FillCurrencyBox(); - void FillFormatListBox_Impl( SvxDelStrgs& rEntries ); - void UpdateOptions_Impl( BOOL bCheckCatChange ); - void UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit ); - void DeleteEntryList_Impl( SvxDelStrgs& rEntries ); - void Obstructing(); + void Init_Impl(); + void FillCurrencyBox(); + void FillFormatListBox_Impl( SvxDelStrgs& rEntries ); + void UpdateOptions_Impl( BOOL bCheckCatChange ); + void UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit ); + void DeleteEntryList_Impl( SvxDelStrgs& rEntries ); + void Obstructing(); void EnableBySourceFormat_Impl(); - void SetCategory( USHORT nPos ); + void SetCategory( USHORT nPos ); String GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos ); void MakePreviewText( const String& rFormat ); void ChangePreviewText( USHORT nPos ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index c56001f196f5..af53605cb1e7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,12 +55,12 @@ class SvxBrushItem; struct SvxNumSettings_Impl { - short nNumberType; - short nParentNumbering; - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sBulletChar; - rtl::OUString sBulletFont; + short nNumberType; + short nParentNumbering; + rtl::OUString sPrefix; + rtl::OUString sSuffix; + rtl::OUString sBulletChar; + rtl::OUString sBulletFont; SvxNumSettings_Impl() : nNumberType(0), nParentNumbering(0) @@ -79,16 +79,16 @@ class SvxSingleNumPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - SvxNumSettingsArr_Impl aNumSettingsArr; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumValueSet* pExamplesVS; + SvxNumSettingsArr_Impl aNumSettingsArr; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + BOOL bModified : 1; + BOOL bPreset : 1; - String sNumCharFmtName; - USHORT nNumItemId; + String sNumCharFmtName; + USHORT nNumItemId; protected: DECL_LINK( NumSelectHdl_Impl, ValueSet*); @@ -99,15 +99,15 @@ class SvxSingleNumPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxSingleNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} + void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; /*-----------------07.02.97 11.36------------------- @@ -120,15 +120,15 @@ class SvxBulletPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - BOOL bModified : 1; - BOOL bPreset : 1; - USHORT nNumItemId; - - String sBulletCharFmtName; + SvxNumValueSet* pExamplesVS; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + BOOL bModified : 1; + BOOL bPreset : 1; + USHORT nNumItemId; + + String sBulletCharFmtName; protected: DECL_LINK(NumSelectHdl_Impl, ValueSet*); DECL_LINK( DoubleClickHdl_Impl, ValueSet* ); @@ -137,16 +137,16 @@ class SvxBulletPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxBulletPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;} + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------07.02.97 11.36------------------- @@ -160,18 +160,18 @@ class SvxNumPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxNumValueSet* pExamplesVS; - String sNumCharFmtName; - String sBulletCharFmtName; + SvxNumValueSet* pExamplesVS; + String sNumCharFmtName; + String sBulletCharFmtName; - SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // wird mit den fuenf Formaten initialisiert + SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // wird mit den fuenf Formaten initialisiert - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + USHORT nNumItemId; + BOOL bModified : 1; + BOOL bPreset : 1; protected: @@ -183,18 +183,18 @@ class SvxNumPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetCharFmtNames(const String& rCharName, const String& rBulName) - { sNumCharFmtName = rCharName; + void SetCharFmtNames(const String& rCharName, const String& rBulName) + { sNumCharFmtName = rCharName; sBulletCharFmtName = rBulName;} - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------12.02.97 07.42------------------- @@ -206,20 +206,20 @@ class SvxBitmapPickTabPage : public SfxTabPage using TabPage::DeactivatePage; FixedLine aValuesFL; - SvxBmpNumValueSet* pExamplesVS; - FixedText aErrorText; - CheckBox aLinkedCB; + SvxBmpNumValueSet* pExamplesVS; + FixedText aErrorText; + CheckBox aLinkedCB; - List aGrfNames; - String sNumCharFmtName; + List aGrfNames; + String sNumCharFmtName; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; - BOOL bModified : 1; - BOOL bPreset : 1; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; + BOOL bModified : 1; + BOOL bPreset : 1; protected: DECL_LINK( NumSelectHdl_Impl, ValueSet*); @@ -231,15 +231,15 @@ class SvxBitmapPickTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxBitmapPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} + void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;} }; /*-----------------01.12.97 16:13------------------- @@ -252,71 +252,71 @@ class SvxNumOptionsTabPage : public SfxTabPage FixedLine aFormatFL; FixedText aLevelFT; - MultiListBox aLevelLB; + MultiListBox aLevelLB; FixedText aFmtFT; - ListBox aFmtLB; - FixedText aPrefixFT; - Edit aPrefixED; - FixedText aSuffixFT; - Edit aSuffixED; - FixedText aCharFmtFT; - ListBox aCharFmtLB; - FixedText aBulColorFT; - ColorListBox aBulColLB; - FixedText aBulRelSizeFT; - MetricField aBulRelSizeMF; + ListBox aFmtLB; + FixedText aPrefixFT; + Edit aPrefixED; + FixedText aSuffixFT; + Edit aSuffixED; + FixedText aCharFmtFT; + ListBox aCharFmtLB; + FixedText aBulColorFT; + ColorListBox aBulColLB; + FixedText aBulRelSizeFT; + MetricField aBulRelSizeMF; FixedText aAllLevelFT; - NumericField aAllLevelNF; + NumericField aAllLevelNF; FixedText aStartFT; NumericField aStartED; PushButton aBulletPB; - FixedText aAlignFT; - ListBox aAlignLB; - FixedText aBitmapFT; + FixedText aAlignFT; + ListBox aAlignLB; + FixedText aBitmapFT; MenuButton aBitmapMB; - FixedText aSizeFT; - MetricField aWidthMF; - FixedText aMultFT; - MetricField aHeightMF; - CheckBox aRatioCB; - FixedText aOrientFT; - ListBox aOrientLB; + FixedText aSizeFT; + MetricField aWidthMF; + FixedText aMultFT; + MetricField aHeightMF; + CheckBox aRatioCB; + FixedText aOrientFT; + ListBox aOrientLB; FixedLine aSameLevelFL; - CheckBox aSameLevelCB; + CheckBox aSameLevelCB; - String sNumCharFmtName; - String sBulletCharFmtName; + String sNumCharFmtName; + String sBulletCharFmtName; Timer aInvalidateTimer; - SvxNumberingPreview* pPreviewWIN; + SvxNumberingPreview* pPreviewWIN; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; - Size aInitSize[SVX_MAX_NUM]; + Size aInitSize[SVX_MAX_NUM]; - BOOL bLastWidthModified : 1; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bAutomaticCharStyles: 1; - BOOL bHTMLMode : 1; - BOOL bMenuButtonInitialized : 1; + BOOL bLastWidthModified : 1; + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bAutomaticCharStyles: 1; + BOOL bHTMLMode : 1; + BOOL bMenuButtonInitialized : 1; - List aGrfNames; - Font aActBulletFont; - String sBullet; - String sStartWith; + List aGrfNames; + Font aActBulletFont; + String sBullet; + String sStartWith; - BYTE nBullet; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; + BYTE nBullet; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; - void InitControls(); - void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE ); + void InitControls(); + void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); @@ -342,25 +342,25 @@ class SvxNumOptionsTabPage : public SfxTabPage const SfxItemSet& rSet); ~SvxNumOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); -//??? void SetWrtShell(SwWrtShell* pSh); - void SetCharFmts(const String& rNumName, const String& rBulletName ) +//??? void SetWrtShell(SwWrtShell* pSh); + void SetCharFmts(const String& rNumName, const String& rBulletName ) { sNumCharFmtName = rNumName; sBulletCharFmtName = rBulletName; } - void SetMetric(FieldUnit eSet); + void SetMetric(FieldUnit eSet); - ListBox& GetCharFmtListBox() {return aCharFmtLB;} - void SetModified(BOOL bRepaint = TRUE); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + ListBox& GetCharFmtListBox() {return aCharFmtLB;} + void SetModified(BOOL bRepaint = TRUE); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /*-----------------03.12.97 10:18------------------- @@ -377,15 +377,15 @@ class SvxNumPositionTabPage : public SfxTabPage // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION - FixedText aDistBorderFT; - MetricField aDistBorderMF; - CheckBox aRelativeCB; - FixedText aIndentFT; - MetricField aIndentMF; - FixedText aDistNumFT; - MetricField aDistNumMF; - FixedText aAlignFT; - ListBox aAlignLB; + FixedText aDistBorderFT; + MetricField aDistBorderMF; + CheckBox aRelativeCB; + FixedText aIndentFT; + MetricField aIndentMF; + FixedText aDistNumFT; + MetricField aDistNumMF; + FixedText aAlignFT; + ListBox aAlignLB; // <-- // new set of controls shown for numbering rules containing list level @@ -402,23 +402,23 @@ class SvxNumPositionTabPage : public SfxTabPage MetricField aIndentAtMF; // <-- - PushButton aStandardPB; + PushButton aStandardPB; #if OSL_DEBUG_LEVEL > 1 - FixedText* pDebugFixedText; + FixedText* pDebugFixedText; #endif SvxNumberingPreview* pPreviewWIN; - SvxNumRule* pActNum; - SvxNumRule* pSaveNum; + SvxNumRule* pActNum; + SvxNumRule* pSaveNum; - USHORT nActNumLvl; - USHORT nNumItemId; - SfxMapUnit eCoreUnit; + USHORT nActNumLvl; + USHORT nNumItemId; + SfxMapUnit eCoreUnit; - BOOL bModified : 1; - BOOL bPreset : 1; - BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein + BOOL bModified : 1; + BOOL bPreset : 1; + BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein bool bLabelAlignmentPosAndSpaceModeActive; void InitControls(); @@ -442,17 +442,17 @@ public: const SfxItemSet& rSet); ~SvxNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet); + virtual int DeactivatePage(SfxItemSet *pSet); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetMetric(FieldUnit eSet); - void SetModified(BOOL bRepaint = TRUE); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetMetric(FieldUnit eSet); + void SetModified(BOOL bRepaint = TRUE); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; #endif diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index ac558573f048..50c903c3000f 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,25 +39,25 @@ struct SvxAsianLayoutPage_Impl; class SvxAsianLayoutPage : public SfxTabPage { FixedLine aKerningGB; - RadioButton aCharKerningRB; - RadioButton aCharPunctKerningRB; + RadioButton aCharKerningRB; + RadioButton aCharPunctKerningRB; FixedLine aCharDistGB; - RadioButton aNoCompressionRB; - RadioButton aPunctCompressionRB; - RadioButton aPunctKanaCompressionRB; + RadioButton aNoCompressionRB; + RadioButton aPunctCompressionRB; + RadioButton aPunctKanaCompressionRB; FixedLine aStartEndGB; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - CheckBox aStandardCB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; + CheckBox aStandardCB; - FixedText aStartFT; - Edit aStartED; - FixedText aEndFT; - Edit aEndED; - FixedText aHintFT; + FixedText aStartFT; + Edit aStartED; + FixedText aEndFT; + Edit aEndED; + FixedText aHintFT; SvxAsianLayoutPage_Impl* pImpl; @@ -70,10 +70,10 @@ public: virtual ~SvxAsianLayoutPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static UINT16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index ca1d0f395344..79632c91a10b 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,17 +62,17 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: - FixedText aNameText; - Edit aNameEdit; - FixedText aLanguageText; - SvxLanguageBox aLanguageLB; - CheckBox aExceptBtn; + FixedText aNameText; + Edit aNameEdit; + FixedText aLanguageText; + SvxLanguageBox aLanguageLB; + CheckBox aExceptBtn; FixedLine aNewDictBox; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > xNewDic; @@ -95,20 +95,20 @@ public: class SvxDictEdit : public Edit { - Link aActionLink; - sal_Bool bSpaces; + Link aActionLink; + sal_Bool bSpaces; public: SvxDictEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(sal_False){} - void SetActionHdl( const Link& rLink ) + void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(sal_Bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ); }; // class SvxEditDictionaryDialog ----------------------------------------- @@ -117,37 +117,37 @@ class SvxEditDictionaryDialog : public ModalDialog { private: - FixedText aBookFT; - ListBox aAllDictsLB; - FixedText aLangFT; - SvxLanguageBox aLangLB; - - FixedText aWordFT; - SvxDictEdit aWordED; - FixedText aReplaceFT; - SvxDictEdit aReplaceED; - SvTabListBox aWordsLB; - PushButton aNewReplacePB; - PushButton aDeletePB; + FixedText aBookFT; + ListBox aAllDictsLB; + FixedText aLangFT; + SvxLanguageBox aLangLB; + + FixedText aWordFT; + SvxDictEdit aWordED; + FixedText aReplaceFT; + SvxDictEdit aReplaceED; + SvTabListBox aWordsLB; + PushButton aNewReplacePB; + PushButton aDeletePB; FixedLine aEditDictsBox; - CancelButton aCloseBtn; - HelpButton aHelpBtn; - String sModify; - String sNew; - DecorationView aDecoView; + CancelButton aCloseBtn; + HelpButton aHelpBtn; + String sModify; + String sNew; + DecorationView aDecoView; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > > aDics; //! snapshot copy to work on + ::com::sun::star::linguistic2::XDictionary > > aDics; //! snapshot copy to work on ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - short nOld; - long nWidth; - sal_Bool bFirstSelect; - sal_Bool bDoNothing; - BOOL bDicIsReadonly; + short nOld; + long nWidth; + sal_Bool bFirstSelect; + sal_Bool bDoNothing; + BOOL bDicIsReadonly; #ifdef _SVX_OPTDICT_CXX DECL_LINK( SelectBookHdl_Impl, ListBox * ); @@ -157,20 +157,20 @@ private: DECL_LINK(ModifyHdl, Edit*); - void ShowWords_Impl( sal_uInt16 nId ); - void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); - sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } - void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< + void ShowWords_Impl( sal_uInt16 nId ); + void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); + sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } + void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &xDic ); - void RemoveDictEntry(SvLBoxEntry* pEntry); - USHORT GetLBInsertPos(const String &rDicWord); + void RemoveDictEntry(SvLBoxEntry* pEntry); + USHORT GetLBInsertPos(const String &rDicWord); #endif protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: SvxEditDictionaryDialog( Window* pParent, diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index 532a9fcc68d7..91b8a6b9e524 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 303ca2558ae3..9bc198eb05c6 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,35 +57,35 @@ class SvxLinguData_Impl; // define ---------------------------------------------------------------- -#define GROUP_MODULES ((sal_uInt16)0x0008) +#define GROUP_MODULES ((sal_uInt16)0x0008) // forward --------------------------------------------------------------- class SvxEditModulesDlg : public ModalDialog { FixedLine aModulesFL; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; + FixedText aLanguageFT; + SvxLanguageBox aLanguageLB; - SvxCheckListBox aModulesCLB; - PushButton aPrioUpPB; - PushButton aPrioDownPB; - PushButton aBackPB; + SvxCheckListBox aModulesCLB; + PushButton aPrioUpPB; + PushButton aPrioDownPB; + PushButton aBackPB; svt::FixedHyperlink aMoreDictsLink; FixedLine aButtonsFL; HelpButton aHelpPB; OKButton aClosePB; - String sSpell; - String sHyph; - String sThes; + String sSpell; + String sHyph; + String sThes; String sGrammar; SvxLinguData_Impl* pDefaultLinguData; - SvxLinguData_Impl& rLinguData; + SvxLinguData_Impl& rLinguData; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); @@ -102,7 +102,7 @@ class SvxEditModulesDlg : public ModalDialog public: SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); - virtual ~SvxEditModulesDlg(); + virtual ~SvxEditModulesDlg(); }; // class SvxLinguTabPage ------------------------------------------------- @@ -111,46 +111,46 @@ class SvxLinguTabPage : public SfxTabPage { private: FixedLine aLinguisticFL; - FixedText aLinguModulesFT; - SvxCheckListBox aLinguModulesCLB; - PushButton aLinguModulesEditPB; + FixedText aLinguModulesFT; + SvxCheckListBox aLinguModulesCLB; + PushButton aLinguModulesEditPB; FixedText aLinguDicsFT; SvxCheckListBox aLinguDicsCLB; PushButton aLinguDicsNewPB; PushButton aLinguDicsEditPB; PushButton aLinguDicsDelPB; - FixedText aLinguOptionsFT; - SvxCheckListBox aLinguOptionsCLB; - PushButton aLinguOptionsEditPB; + FixedText aLinguOptionsFT; + SvxCheckListBox aLinguOptionsCLB; + PushButton aLinguOptionsEditPB; svt::FixedHyperlink aMoreDictsLink; - String sCapitalWords; - String sWordsWithDigits; - String sCapitalization; - String sSpellSpecial; - String sSpellAuto; + String sCapitalWords; + String sWordsWithDigits; + String sCapitalization; + String sSpellSpecial; + String sSpellAuto; String sGrammarAuto; - String sNumMinWordlen; - String sNumPreBreak; - String sNumPostBreak; - String sHyphAuto; - String sHyphSpecial; + String sNumMinWordlen; + String sNumPreBreak; + String sNumPostBreak; + String sHyphAuto; + String sHyphSpecial; com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > xProp; + com::sun::star::beans::XPropertySet > xProp; com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionaryList > xDicList; + com::sun::star::linguistic2::XDictionaryList > xDicList; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionary > > aDics; + com::sun::star::linguistic2::XDictionary > > aDics; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; - SvxLinguData_Impl* pLinguData; + SvxLinguData_Impl* pLinguData; SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); + SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); @@ -168,14 +168,14 @@ private: #endif public: - virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); + virtual ~SvxLinguTabPage(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void HideGroups( sal_uInt16 nGrp ); + void HideGroups( sal_uInt16 nGrp ); }; #endif diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index ab72fe4a4773..98706556cc78 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,15 +64,15 @@ class SvxPathTabPage : public SfxTabPage { private: FixedLine aStdBox; - FixedText aTypeText; - FixedText aPathText; + FixedText aTypeText; + FixedText aPathText; SvxControlFocusHelper aPathCtrl; - PushButton aStandardBtn; - PushButton aPathBtn; + PushButton aStandardBtn; + PushButton aPathBtn; - HeaderBar* pHeaderBar; - ::svx::OptHeaderTabListBox* pPathBox; - OptPath_Impl* pImpl; + HeaderBar* pHeaderBar; + ::svx::OptHeaderTabListBox* pPathBox; + OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker; @@ -99,11 +99,11 @@ public: SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxPathTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 8fba32b2bbd1..c5b9ccaa72c8 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ //CHINA001 enum SvxModeType //CHINA001 { -//CHINA001 SVX_PAGE_MODE_STANDARD, -//CHINA001 SVX_PAGE_MODE_CENTER, -//CHINA001 SVX_PAGE_MODE_PRESENTATION +//CHINA001 SVX_PAGE_MODE_STANDARD, +//CHINA001 SVX_PAGE_MODE_CENTER, +//CHINA001 SVX_PAGE_MODE_PRESENTATION //CHINA001 }; // class SvxPageDescPage ------------------------------------------------- @@ -85,8 +85,8 @@ <SvxLRSpaceItem>: <SID_ATTR_LRSPACE> */ -struct SvxPage_Impl; -typedef USHORT MarginPosition; +struct SvxPage_Impl; +typedef USHORT MarginPosition; class SvxPageDescPage : public SfxTabPage { @@ -109,8 +109,8 @@ class SvxPageDescPage : public SfxTabPage SvxPageWindow aBspWin; - FixedText aTextFlowLbl; - svx::FrameDirectionListBox aTextFlowBox; + FixedText aTextFlowLbl; + svx::FrameDirectionListBox aTextFlowBox; FixedText aPaperTrayLbl; ListBox aPaperTrayBox; @@ -130,7 +130,7 @@ class SvxPageDescPage : public SfxTabPage FixedLine aLayoutFL; FixedText aPageText; ListBox aLayoutBox; - FixedText aNumberFormatText; + FixedText aNumberFormatText; ListBox aNumberFormatBox; FixedLine aBottomSeparatorFl; @@ -144,26 +144,26 @@ class SvxPageDescPage : public SfxTabPage CheckBox aAdaptBox; //Register Writer - CheckBox aRegisterCB; - FixedText aRegisterFT; - ListBox aRegisterLB; + CheckBox aRegisterCB; + FixedText aRegisterFT; + ListBox aRegisterLB; - String sStandardRegister; + String sStandardRegister; String aInsideText; String aOutsideText; String aLeftText; String aRightText; - String aPrintRangeQueryText; + String aPrintRangeQueryText; - long nFirstLeftMargin; - long nFirstRightMargin; - long nFirstTopMargin; - long nFirstBottomMargin; - long nLastLeftMargin; - long nLastRightMargin; - long nLastTopMargin; - long nLastBottomMargin; + long nFirstLeftMargin; + long nFirstRightMargin; + long nFirstTopMargin; + long nFirstBottomMargin; + long nLastLeftMargin; + long nLastRightMargin; + long nLastTopMargin; + long nLastBottomMargin; Size aMaxSize; BOOL bLandscape; @@ -172,43 +172,43 @@ class SvxPageDescPage : public SfxTabPage Paper ePaperStart; Paper ePaperEnd; - SvxPage_Impl* pImpl; + SvxPage_Impl* pImpl; #ifdef _SVX_PAGE_CXX void Init_Impl(); - DECL_LINK( LayoutHdl_Impl, ListBox* ); - DECL_LINK( PaperBinHdl_Impl, ListBox* ); - DECL_LINK( SwapOrientation_Impl, RadioButton* ); + DECL_LINK( LayoutHdl_Impl, ListBox* ); + DECL_LINK( PaperBinHdl_Impl, ListBox* ); + DECL_LINK( SwapOrientation_Impl, RadioButton* ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK( BorderModify_Impl, MetricField* ); + DECL_LINK( BorderModify_Impl, MetricField* ); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK( CenterHdl_Impl, CheckBox* ); + DECL_LINK( CenterHdl_Impl, CheckBox* ); void UpdateExample_Impl( bool bResetbackground = false ); // Papiergroesse - DECL_LINK( PaperSizeSelect_Impl, ListBox* ); - DECL_LINK( PaperSizeModify_Impl, Edit* ); + DECL_LINK( PaperSizeSelect_Impl, ListBox* ); + DECL_LINK( PaperSizeModify_Impl, Edit* ); - DECL_LINK( FrameDirectionModify_Impl, ListBox* ); + DECL_LINK( FrameDirectionModify_Impl, ListBox* ); // Hintergrund void ResetBackground_Impl( const SfxItemSet& rSet ); // Grenzwerte - DECL_LINK( RangeHdl_Impl, Edit* ); + DECL_LINK( RangeHdl_Impl, Edit* ); void CalcMargin_Impl(); // Registerhaltigkeit - DECL_LINK( RegisterModify, CheckBox * ); + DECL_LINK( RegisterModify, CheckBox * ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ void DisableVerticalPageDir(); - bool IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin, + bool IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin, long nLastMargin, MarginPosition nPos ); - void CheckMarginEdits( bool _bClear ); - bool IsMarginOutOfRange(); + void CheckMarginEdits( bool _bClear ); + bool IsMarginOutOfRange(); #endif SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); @@ -231,8 +231,8 @@ public: void SetPaperFormatRanges( Paper eStart, Paper eEnd ) { ePaperStart = eStart, ePaperEnd = eEnd; } - void SetCollectionList(const List* pList); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + void SetCollectionList(const List* pList); + virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 }; #endif // #ifndef _SVX_PAGE_HXX diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 579ea4a4a6ad..ccca337aff9c 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/relfld.hxx> // SvxRelativeField -#include <svx/paraprev.hxx> // Preview +#include <svx/relfld.hxx> // SvxRelativeField +#include <svx/paraprev.hxx> // Preview #include <svx/frmdirlbox.hxx> #include <vcl/lstbox.hxx> #include <svx/flagsdef.hxx> @@ -52,7 +52,7 @@ class SvxParagraphControllerItem; // class SvxStdParagraphTabPage ------------------------------------------ -/* {k:\svx\prototyp\dialog\parastd.bmp} +/* {k:\svx\prototyp\dialog\parastd.bmp} [Beschreibung] Mit dieser TabPage koennen Standard-Attribute eines Absatzes eingestellt @@ -73,49 +73,49 @@ private: SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); // Einzug - FixedText aLeftLabel; - SvxRelativeField aLeftIndent; + FixedText aLeftLabel; + SvxRelativeField aLeftIndent; - FixedText aRightLabel; - SvxRelativeField aRightIndent; + FixedText aRightLabel; + SvxRelativeField aRightIndent; - FixedText aFLineLabel; - SvxRelativeField aFLineIndent; - CheckBox aAutoCB; + FixedText aFLineLabel; + SvxRelativeField aFLineIndent; + CheckBox aAutoCB; FixedLine aIndentFrm; // Abstaende - FixedText aTopLabel; - SvxRelativeField aTopDist; - FixedText aBottomLabel; - SvxRelativeField aBottomDist; + FixedText aTopLabel; + SvxRelativeField aTopDist; + FixedText aBottomLabel; + SvxRelativeField aBottomDist; FixedLine aDistFrm; // Zeilenabstand - ListBox aLineDist; - FixedText aLineDistAtLabel; - MetricField aLineDistAtPercentBox; - MetricField aLineDistAtMetricBox; + ListBox aLineDist; + FixedText aLineDistAtLabel; + MetricField aLineDistAtPercentBox; + MetricField aLineDistAtMetricBox; FixedLine aLineDistFrm; - String sAbsDist; - SvxParaPrevWindow aExampleWin; + String sAbsDist; + SvxParaPrevWindow aExampleWin; //Registerhaltigkeit - nur Writer - CheckBox aRegisterCB; + CheckBox aRegisterCB; FixedLine aRegisterFL; - Edit* pActLineDistFld; - long nAbst; - long nWidth; - long nMinFixDist; - BOOL bRelativeMode; + Edit* pActLineDistFld; + long nAbst; + long nWidth; + long nMinFixDist; + BOOL bRelativeMode; BOOL bNegativeIndents; #ifdef _SVX_PARAGRPH_CXX - void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); - void Init_Impl(); - void UpdateExample_Impl( BOOL bAll = FALSE ); + void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); + void Init_Impl(); + void UpdateExample_Impl( BOOL bAll = FALSE ); DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK( ModifyHdl_Impl, SvxRelativeField* ); @@ -123,26 +123,26 @@ private: #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: DECL_LINK( ELRLoseFocusHdl, Edit* ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void SetPageWidth( USHORT nPageWidth ); - void SetMaxDistance( USHORT nMaxDist ); - void EnableRelativeMode(); - void EnableRegisterMode(); - void EnableAutoFirstLine(); - void EnableAbsLineDist(long nMinTwip); - void EnableNegativeMode(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void SetPageWidth( USHORT nPageWidth ); + void SetMaxDistance( USHORT nMaxDist ); + void EnableRelativeMode(); + void EnableRegisterMode(); + void EnableAutoFirstLine(); + void EnableAbsLineDist(long nMinTwip); + void EnableNegativeMode(); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; // class SvxParaAlignTabPage ------------------------------------------------ @@ -154,55 +154,55 @@ class SvxParaAlignTabPage : public SfxTabPage // Ausrichtung FixedLine aAlignFrm; RadioButton aLeft; - RadioButton aRight; - RadioButton aCenter; - RadioButton aJustify; - FixedText aLastLineFT; - ListBox aLastLineLB; - CheckBox aExpandCB; + RadioButton aRight; + RadioButton aCenter; + RadioButton aJustify; + FixedText aLastLineFT; + ListBox aLastLineLB; + CheckBox aExpandCB; CheckBox aSnapToGridCB; //preview - SvxParaPrevWindow aExampleWin; + SvxParaPrevWindow aExampleWin; //vertical alignment FixedLine aVertAlignFL; FixedText aVertAlignFT; ListBox aVertAlignLB; - FixedLine aPropertiesFL; - FixedText aTextDirectionFT; - svx::FrameDirectionListBox aTextDirectionLB; + FixedLine aPropertiesFL; + FixedText aTextDirectionFT; + svx::FrameDirectionListBox aTextDirectionLB; #ifdef _SVX_PARAGRPH_CXX - DECL_LINK( AlignHdl_Impl, RadioButton* ); - DECL_LINK( LastLineHdl_Impl, ListBox* ); - DECL_LINK( TextDirectionHdl_Impl, ListBox* ); + DECL_LINK( AlignHdl_Impl, RadioButton* ); + DECL_LINK( LastLineHdl_Impl, ListBox* ); + DECL_LINK( TextDirectionHdl_Impl, ListBox* ); - void UpdateExample_Impl( BOOL bAll = FALSE ); + void UpdateExample_Impl( BOOL bAll = FALSE ); #endif SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxParaAlignTabPage(); + virtual ~SvxParaAlignTabPage(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void EnableJustifyExt(); - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + void EnableJustifyExt(); + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; // class SvxExtParagraphTabPage ------------------------------------------ -/* {k:\svx\prototyp\dialog\paraext.bmp} +/* {k:\svx\prototyp\dialog\paraext.bmp} [Beschreibung] Mit dieser TabPage koennen Spezial-Attribute eines Absatzes eingestellt @@ -221,65 +221,65 @@ class SvxExtParagraphTabPage: public SfxTabPage using TabPage::DeactivatePage; public: - virtual ~SvxExtParagraphTabPage(); + virtual ~SvxExtParagraphTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void DisablePageBreak(); + void DisablePageBreak(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); // Silbentrennung - TriStateBox aHyphenBox; - FixedText aBeforeText; - NumericField aExtHyphenBeforeBox; -// FixedText aHyphenBeforeLabel; - FixedText aAfterText; - NumericField aExtHyphenAfterBox; -// FixedText aHyphenAfterLabel; - FixedText aMaxHyphenLabel; + TriStateBox aHyphenBox; + FixedText aBeforeText; + NumericField aExtHyphenBeforeBox; +// FixedText aHyphenBeforeLabel; + FixedText aAfterText; + NumericField aExtHyphenAfterBox; +// FixedText aHyphenAfterLabel; + FixedText aMaxHyphenLabel; NumericField aMaxHyphenEdit; FixedLine aExtFL; // Seitenumbruch - FixedLine aBreaksFL; - TriStateBox aPageBreakBox; + FixedLine aBreaksFL; + TriStateBox aPageBreakBox; FixedText aBreakTypeFT; ListBox aBreakTypeLB; FixedText aBreakPositionFT; ListBox aBreakPositionLB; - TriStateBox aApplyCollBtn; - ListBox aApplyCollBox; + TriStateBox aApplyCollBtn; + ListBox aApplyCollBox; FixedText aPagenumText; - NumericField aPagenumEdit; + NumericField aPagenumEdit; FixedLine aExtendFL; // Absatzteilung - TriStateBox aKeepTogetherBox; - TriStateBox aKeepParaBox; + TriStateBox aKeepTogetherBox; + TriStateBox aKeepParaBox; // Witwen/Waisen - TriStateBox aOrphanBox; - NumericField aOrphanRowNo; - FixedText aOrphanRowLabel; + TriStateBox aOrphanBox; + NumericField aOrphanRowNo; + FixedText aOrphanRowLabel; - TriStateBox aWidowBox; - NumericField aWidowRowNo; - FixedText aWidowRowLabel; + TriStateBox aWidowBox; + NumericField aWidowRowNo; + FixedText aWidowRowLabel; BOOL bPageBreak; - BOOL bHtmlMode; - USHORT nStdPos; + BOOL bHtmlMode; + USHORT nStdPos; #ifdef _SVX_PARAGRPH_CXX DECL_LINK( PageBreakHdl_Impl, TriStateBox* ); @@ -291,7 +291,7 @@ private: DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; /* -----------------------------29.11.00 11:33-------------------------------- @@ -300,10 +300,10 @@ class SvxAsianTabPage : public SfxTabPage { FixedLine aOptionsFL; - TriStateBox aForbiddenRulesCB; - TriStateBox aHangingPunctCB; + TriStateBox aForbiddenRulesCB; + TriStateBox aHangingPunctCB; - TriStateBox aScriptSpaceCB; + TriStateBox aScriptSpaceCB; SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -314,12 +314,12 @@ public: ~SvxAsianTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 27e964c5b28a..3b9258462ce9 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ struct PasswordToOpenModifyDialog_Impl; class PasswordToOpenModifyDialog : public SfxModalDialog { std::auto_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; - + // disallow use of copy c-tor and assignment operator PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ); PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); - + public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, - sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, + PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 924edae728a5..2686287776b1 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,22 +61,22 @@ class SvPasteObjectDialog : public ModalDialog CancelButton aCancelButton1; HelpButton aHelpButton1; String aSObject; - Table aSupplementTable; - SvGlobalName aObjClassName; - String aObjName; - USHORT nAspect; - BOOL bLink; + Table aSupplementTable; + SvGlobalName aObjClassName; + String aObjName; + USHORT nAspect; + BOOL bLink; - ListBox& ObjectLB() { return aLbInsertList; } - FixedText& ObjectSource() { return aFtObjectSource; } - RadioButton& PasteLink() { return aRbPasteLink; } - CheckBox& AsIconBox() { return aCbDisplayAsIcon; } + ListBox& ObjectLB() { return aLbInsertList; } + FixedText& ObjectSource() { return aFtObjectSource; } + RadioButton& PasteLink() { return aRbPasteLink; } + CheckBox& AsIconBox() { return aCbDisplayAsIcon; } - const String& GetObjString() { return aSObject; } - void SelectObject(); + const String& GetObjString() { return aSObject; } + void SelectObject(); DECL_LINK( SelectHdl, ListBox * ); DECL_LINK( DoubleClickHdl, ListBox * ); - void SetDefault(); + void SetDefault(); USHORT GetAspect() const { return nAspect; } BOOL ShouldLink() const { return bLink; } diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 4648fd3a0a0c..4fda9c7699cb 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,20 +69,20 @@ public: void SetNextHdl( const Link& rLink ) { aNextHdlLink = rLink; } - void EnableTravel(BOOL bNext, BOOL bPrev); - inline String GetNote() { return aEditED.GetText(); } - inline void SetNote(const String& rTxt) { aEditED.SetText(rTxt); } + void EnableTravel(BOOL bNext, BOOL bPrev); + inline String GetNote() { return aEditED.GetText(); } + inline void SetNote(const String& rTxt) { aEditED.SetText(rTxt); } - void ShowLastAuthor(const String& rAuthor, const String& rDate); - inline void DontChangeAuthor() { aAuthorBtn.Enable(FALSE); } - inline void HideAuthor() { aAuthorBtn.Hide(); } - inline void SetReadonlyPostIt(BOOL bDisable) + void ShowLastAuthor(const String& rAuthor, const String& rDate); + inline void DontChangeAuthor() { aAuthorBtn.Enable(FALSE); } + inline void HideAuthor() { aAuthorBtn.Hide(); } + inline void SetReadonlyPostIt(BOOL bDisable) { aOKBtn.Enable( !bDisable ); aEditED.SetReadOnly( bDisable ); aAuthorBtn.Enable( !bDisable ); } - inline BOOL IsOkEnabled() const { return aOKBtn.IsEnabled(); } + inline BOOL IsOkEnabled() const { return aOKBtn.IsEnabled(); } private: FixedLine aPostItFL; diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 0a67dcf9fd95..50296e172a58 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 685de4367180..a8ce19ba1cf6 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,37 +46,37 @@ #include <hash_map> -#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 - -#define BROWSEMODE_MODULES 0x01 -#define BROWSEMODE_SUBS 0x02 -#define BROWSEMODE_OBJS 0x04 -#define BROWSEMODE_PROPS 0x08 -#define BROWSEMODE_SUBOBJS 0x10 - -#define INPUTMODE_NEWLIB 1 -#define INPUTMODE_NEWMACRO 2 -#define INPUTMODE_RENAME 3 - -typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , +#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 + +#define BROWSEMODE_MODULES 0x01 +#define BROWSEMODE_SUBS 0x02 +#define BROWSEMODE_OBJS 0x04 +#define BROWSEMODE_PROPS 0x08 +#define BROWSEMODE_SUBOBJS 0x10 + +#define INPUTMODE_NEWLIB 1 +#define INPUTMODE_NEWMACRO 2 +#define INPUTMODE_RENAME 3 + +typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; class SFEntry; class SFTreeListBox : public SvTreeListBox { - friend class SvxScriptOrgDialog; + friend class SvxScriptOrgDialog; private: - USHORT nMode; + USHORT nMode; Image m_hdImage; Image m_hdImage_hc; Image m_libImage; @@ -95,33 +95,33 @@ private: ::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 ); protected: - void ExpandTree( SvLBoxEntry* pRootEntry ); - virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual void ExpandedHdl(); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); - virtual long ExpandingHdl(); - static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, + void ExpandTree( SvLBoxEntry* pRootEntry ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void ExpandedHdl(); + SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); + virtual long ExpandingHdl(); + static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, + static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); public: - void Init( const ::rtl::OUString& language ); - void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, + void Init( const ::rtl::OUString& language ); + void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox( Window* pParent, const ResId& rRes ); ~SFTreeListBox(); - void UpdateEntries(); + void UpdateEntries(); - void ExpandAllTrees(); + void ExpandAllTrees(); SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, bool bChildrenOnDemand, - std::auto_ptr< SFEntry > aUserData, + std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL ); SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap, SvLBoxEntry * pParent, @@ -134,54 +134,54 @@ public: class InputDialog : public ModalDialog { private: - FixedText aText; - Edit aEdit; - OKButton aOKButton; - CancelButton aCancelButton; + FixedText aText; + Edit aEdit; + OKButton aOKButton; + CancelButton aCancelButton; public: InputDialog( Window * pParent, USHORT nMode ); ~InputDialog(); - String GetObjectName() const { return aEdit.GetText(); } - void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} + String GetObjectName() const { return aEdit.GetText(); } + void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} }; class SFEntry { private: - BYTE nType; + BYTE nType; bool loaded; - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model; + ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model; SFEntry(){} public: - SFEntry( BYTE nT ) { nType = nT; loaded=false; } - SFEntry( BYTE nT, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , + SFEntry( BYTE nT ) { nType = nT; loaded=false; } + SFEntry( BYTE nT, + const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; } - virtual ~SFEntry() {} + virtual ~SFEntry() {} ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;} ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;}; - BYTE GetType() const { return nType; } - bool isLoaded() const { return loaded; } - void setLoaded() { loaded=true; } + BYTE GetType() const { return nType; } + bool isLoaded() const { return loaded; } + void setLoaded() { loaded=true; } }; class SvxScriptOrgDialog : public SfxModalDialog { protected: - FixedText aScriptsTxt; - SFTreeListBox aScriptsBox; + FixedText aScriptsTxt; + SFTreeListBox aScriptsBox; - PushButton aRunButton; - CancelButton aCloseButton; - PushButton aCreateButton; - PushButton aEditButton; - PushButton aRenameButton; - PushButton aDelButton; - HelpButton aHelpButton; + PushButton aRunButton; + CancelButton aCloseButton; + PushButton aCreateButton; + PushButton aEditButton; + PushButton aRenameButton; + PushButton aDelButton; + HelpButton aHelpButton; ::rtl::OUString m_sLanguage; static Selection_hash m_lastSelection; @@ -200,22 +200,22 @@ protected: DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - 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 ); - + 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 ); + ::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 createEntry( SvLBoxEntry* pEntry ); void renameEntry( SvLBoxEntry* pEntry ); void deleteEntry( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getBrowseNode( SvLBoxEntry* pEntry ); + getBrowseNode( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry ); - void EnableButton( Button& rButton, BOOL bEnable ); + void EnableButton( Button& rButton, BOOL bEnable ); String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); - //String GetInfo( SbxVariable* pVar ); + //String GetInfo( SbxVariable* pVar ); public: // prob need another arg in the ctor @@ -223,7 +223,7 @@ public: SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language ); ~SvxScriptOrgDialog(); - virtual short Execute(); + virtual short Execute(); //DECL_LINK( ActivatePageHdl, TabControl * ); }; @@ -243,7 +243,7 @@ public: ~SvxScriptErrorDialog(); - short Execute(); + short Execute(); }; #endif // _SCRIPTDLG_HXX diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 645a45da7d61..5a1e0166c577 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class SdrModel; class SvxFormatCellsDialog : public SfxTabDialog { private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; XColorTable* mpColorTab; XGradientList* mpGradientList; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 5ea0be27a980..fa1e6b840cb7 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #define SVX_CFGGROUP_FUNCTION 1 @@ -51,13 +51,13 @@ struct SvxGroupInfo_Impl { - USHORT nKind; - USHORT nOrd; + USHORT nKind; + USHORT nOrd; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > xBrowseNode; ::rtl::OUString sURL; ::rtl::OUString sHelpText; - BOOL bWasOpened; + BOOL bWasOpened; SvxGroupInfo_Impl( USHORT n, USHORT nr ) :nKind( n ) @@ -104,44 +104,44 @@ public: class SvxConfigFunctionListBox_Impl : public SvTreeListBox { friend class SvxConfigGroupListBox_Impl; - Timer aTimer; - SvLBoxEntry* pCurEntry; - SvxGroupInfoArr_Impl aArr; - SvLBoxEntry* m_pDraggingEntry; + Timer aTimer; + SvLBoxEntry* pCurEntry; + SvxGroupInfoArr_Impl aArr; + SvLBoxEntry* m_pDraggingEntry; - DECL_LINK( TimerHdl, Timer* ); - virtual void MouseMove( const MouseEvent& rMEvt ); + DECL_LINK( TimerHdl, Timer* ); + virtual void MouseMove( const MouseEvent& rMEvt ); public: SvxConfigFunctionListBox_Impl( Window*, const ResId& ); ~SvxConfigFunctionListBox_Impl(); - void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); - String GetHelpText( SvLBoxEntry *pEntry ); + void ClearAll(); + SvLBoxEntry* GetEntry_Impl( USHORT nId ); + SvLBoxEntry* GetEntry_Impl( const String& ); + USHORT GetId( SvLBoxEntry *pEntry ); + String GetHelpText( SvLBoxEntry *pEntry ); using Window::GetHelpText; - USHORT GetCurId() + USHORT GetCurId() { return GetId( FirstSelected() ); } - SvLBoxEntry* GetLastSelectedEntry(); - void FunctionSelected(); + SvLBoxEntry* GetLastSelectedEntry(); + void FunctionSelected(); // drag n drop methods - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual DragDropMode NotifyStartDrag( + virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ); }; class SvxConfigGroupListBox_Impl : public SvTreeListBox { - SvxGroupInfoArr_Impl aArr; + SvxGroupInfoArr_Impl aArr; bool m_bShowSlots; - SvxConfigFunctionListBox_Impl* pFunctionListBox; - ImageProvider* m_pImageProvider; + SvxConfigFunctionListBox_Impl* pFunctionListBox; + ImageProvider* m_pImageProvider; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -170,8 +170,8 @@ private: ); protected: - virtual void RequestingChilds( SvLBoxEntry *pEntry); - virtual BOOL Expand( SvLBoxEntry* pParent ); + virtual void RequestingChilds( SvLBoxEntry *pEntry); + virtual BOOL Expand( SvLBoxEntry* pParent ); using SvListView::Expand; public: @@ -184,40 +184,40 @@ public: ~SvxConfigGroupListBox_Impl(); - void Init(); - void Open( SvLBoxEntry*, BOOL ); - void ClearAll(); - void GroupSelected(); + void Init(); + void Open( SvLBoxEntry*, BOOL ); + void ClearAll(); + void GroupSelected(); - void SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox ) + void SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox ) { pFunctionListBox = pBox; } - void SetImageProvider( ImageProvider* provider ) + void SetImageProvider( ImageProvider* provider ) { m_pImageProvider = provider; } }; class SvxScriptSelectorDialog : public ModelessDialog { - FixedText aDialogDescription; - FixedText aGroupText; - SvxConfigGroupListBox_Impl aCategories; - FixedText aFunctionText; - SvxConfigFunctionListBox_Impl aCommands; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; - FixedLine aDescription; - FixedText aDescriptionText; - - BOOL m_bShowSlots; - Link m_aAddHdl; + FixedText aDialogDescription; + FixedText aGroupText; + SvxConfigGroupListBox_Impl aCategories; + FixedText aFunctionText; + SvxConfigFunctionListBox_Impl aCommands; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; + FixedLine aDescription; + FixedText aDescriptionText; + + BOOL m_bShowSlots; + Link m_aAddHdl; DECL_LINK( ClickHdl, Button * ); DECL_LINK( SelectHdl, Control* ); DECL_LINK( FunctionDoubleClickHdl, Control* ); - void UpdateUI(); - void ResizeControls(); + void UpdateUI(); + void ResizeControls(); public: @@ -230,18 +230,18 @@ public: ~SvxScriptSelectorDialog ( ); - void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } - const Link& GetAddHdl() const { return m_aAddHdl; } + void SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; } + const Link& GetAddHdl() const { return m_aAddHdl; } - void SetImageProvider( ImageProvider* provider ) + void SetImageProvider( ImageProvider* provider ) { aCategories.SetImageProvider( provider ); } - USHORT GetSelectedId(); - String GetScriptURL() const; - String GetSelectedDisplayName(); - String GetSelectedHelpText(); - void SetRunLabel(); - void SetDialogDescription(const String& rDescription); + USHORT GetSelectedId(); + String GetScriptURL() const; + String GetSelectedDisplayName(); + String GetSelectedHelpText(); + void SetRunLabel(); + void SetDialogDescription(const String& rDescription); }; #endif diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index cb0dd228daba..d65987548a8b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,17 +39,17 @@ #include <com/sun/star/container/XIndexContainer.hpp> //========================================================================== -// FmShowColsDialog +// FmShowColsDialog //========================================================================== class FmShowColsDialog : public ModalDialog { - ListBox m_aList; - FixedText m_aLabel; - OKButton m_aOK; - CancelButton m_aCancel; + ListBox m_aList; + FixedText m_aLabel; + OKButton m_aOK; + CancelButton m_aCancel; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: FmShowColsDialog( Window* pParent ); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index e451ddba36cc..5f3ddaab2805 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog { - FixedText maCountLbl; - NumericField maCountEdit; + FixedText maCountLbl; + NumericField maCountEdit; FixedLine maCountFL; - ImageRadioButton maHorzBox; + ImageRadioButton maHorzBox; ImageRadioButton maVertBox; CheckBox maPropCB; FixedLine maDirFL; - OKButton maOKBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; + OKButton maOKBtn; + CancelButton maCancelBtn; + HelpButton maHelpBtn; - long mnMaxVertical; - long mnMaxHorizontal; + long mnMaxVertical; + long mnMaxHorizontal; protected: virtual void Apply(); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index bbb01fe9dbf2..093183223b5e 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ public: ~SvxSearchFormatDialog(); protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); private: - FontList* pFontList; + FontList* pFontList; }; // class SvxSearchFormatDialog ------------------------------------------- @@ -62,13 +62,13 @@ public: private: FixedText aAttrFL; - SvxCheckListBox aAttrLB; + SvxCheckListBox aAttrLB; - OKButton aOKBtn; - CancelButton aEscBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aEscBtn; + HelpButton aHelpBtn; - SearchAttrItemList& rList; + SearchAttrItemList& rList; DECL_LINK( OKHdl, Button * ); }; @@ -79,29 +79,29 @@ class SvxSearchSimilarityDialog : public ModalDialog { private: FixedLine aFixedLine; - FixedText aOtherTxt; - NumericField aOtherFld; - FixedText aLongerTxt; - NumericField aLongerFld; - FixedText aShorterTxt; - NumericField aShorterFld; - CheckBox aRelaxBox; - - OKButton aOKBtn; - CancelButton aEscBtn; - HelpButton aHelpBtn; + FixedText aOtherTxt; + NumericField aOtherFld; + FixedText aLongerTxt; + NumericField aLongerFld; + FixedText aShorterTxt; + NumericField aShorterFld; + CheckBox aRelaxBox; + + OKButton aOKBtn; + CancelButton aEscBtn; + HelpButton aHelpBtn; public: - SvxSearchSimilarityDialog( Window* pParent, + SvxSearchSimilarityDialog( Window* pParent, BOOL bRelax, USHORT nOther, USHORT nShorter, USHORT nLonger ); - USHORT GetOther() { return (USHORT)aOtherFld.GetValue(); } - USHORT GetShorter() { return (USHORT)aShorterFld.GetValue(); } - USHORT GetLonger() { return (USHORT)aLongerFld.GetValue(); } - BOOL IsRelaxed() { return aRelaxBox.IsChecked(); } + USHORT GetOther() { return (USHORT)aOtherFld.GetValue(); } + USHORT GetShorter() { return (USHORT)aShorterFld.GetValue(); } + USHORT GetLonger() { return (USHORT)aLongerFld.GetValue(); } + BOOL IsRelaxed() { return aRelaxBox.IsChecked(); } }; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 79d63daa8b9f..c20c3531332f 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,18 +46,18 @@ 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 +//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 --------------------------------------------- /* @@ -80,64 +80,64 @@ class SvxTabulatorTabPage : public SfxTabPage public: ~SvxTabulatorTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - void DisableControls( const USHORT nFlag ); + void DisableControls( const USHORT nFlag ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); // Tabulatoren und Positionen - MetricBox aTabBox; + MetricBox aTabBox; FixedLine aTabLabel; FixedLine aTabLabelVert; // TabType - RadioButton aLeftTab; - RadioButton aRightTab; - RadioButton aCenterTab; - RadioButton aDezTab; - - TabWin_Impl* pLeftWin; - TabWin_Impl* pRightWin; - TabWin_Impl* pCenterWin; - TabWin_Impl* pDezWin; - - FixedText aDezCharLabel; - Edit aDezChar; + RadioButton aLeftTab; + RadioButton aRightTab; + RadioButton aCenterTab; + RadioButton aDezTab; + + TabWin_Impl* pLeftWin; + TabWin_Impl* pRightWin; + TabWin_Impl* pCenterWin; + TabWin_Impl* pDezWin; + + FixedText aDezCharLabel; + Edit aDezChar; FixedLine aTabTypeLabel; // Fuellzeichen - RadioButton aNoFillChar; - RadioButton aFillPoints; - RadioButton aFillDashLine ; - RadioButton aFillSolidLine; - RadioButton aFillSpecial; - Edit aFillChar; + RadioButton aNoFillChar; + RadioButton aFillPoints; + RadioButton aFillDashLine ; + RadioButton aFillSolidLine; + RadioButton aFillSpecial; + Edit aFillChar; FixedLine aFillLabel; // Buttons - PushButton aNewBtn; - PushButton aDelAllBtn; - PushButton aDelBtn; + PushButton aNewBtn; + PushButton aDelAllBtn; + PushButton aDelBtn; // lokale Variablen, interne Funktionen - SvxTabStop aAktTab; - SvxTabStopItem aNewTabs; - long nDefDist; - FieldUnit eDefUnit; - BOOL bCheck; + SvxTabStop aAktTab; + SvxTabStopItem aNewTabs; + long nDefDist; + FieldUnit eDefUnit; + BOOL bCheck; #ifdef _SVX_TABSTPGE_CXX - void InitTabPos_Impl( USHORT nPos = 0 ); - void SetFillAndTabType_Impl(); + void InitTabPos_Impl( USHORT nPos = 0 ); + void SetFillAndTabType_Impl(); // Handler DECL_LINK( NewHdl_Impl, Button* ); @@ -152,7 +152,7 @@ private: DECL_LINK( GetFillCharHdl_Impl, Edit* ); DECL_LINK( GetDezCharHdl_Impl, Edit* ); #endif - virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 + virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001 }; #endif // #ifndef _SVX_TABSTPGE_HXX diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 427e94e26870..0c6961db7855 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,36 +48,36 @@ class SdrView; class SvxTextAnimationPage : public SfxTabPage { private: - FixedLine aFlEffect; - FixedText aFtEffects; - ListBox aLbEffect; - //ValueSet aCtlEffect; - FixedText aFtDirection; - ImageButton aBtnUp; - ImageButton aBtnLeft; - ImageButton aBtnRight; - ImageButton aBtnDown; - - FixedLine aFlProperties; - TriStateBox aTsbStartInside; - TriStateBox aTsbStopInside; - - FixedText aFtCount; - TriStateBox aTsbEndless; - NumericField aNumFldCount; - - FixedText aFtAmount; - TriStateBox aTsbPixel; - MetricField aMtrFldAmount; - - FixedText aFtDelay; - TriStateBox aTsbAuto; - MetricField aMtrFldDelay; - - const SfxItemSet& rOutAttrs; - SdrTextAniKind eAniKind; - FieldUnit eFUnit; - SfxMapUnit eUnit; + FixedLine aFlEffect; + FixedText aFtEffects; + ListBox aLbEffect; + //ValueSet aCtlEffect; + FixedText aFtDirection; + ImageButton aBtnUp; + ImageButton aBtnLeft; + ImageButton aBtnRight; + ImageButton aBtnDown; + + FixedLine aFlProperties; + TriStateBox aTsbStartInside; + TriStateBox aTsbStopInside; + + FixedText aFtCount; + TriStateBox aTsbEndless; + NumericField aNumFldCount; + + FixedText aFtAmount; + TriStateBox aTsbPixel; + MetricField aMtrFldAmount; + + FixedText aFtDelay; + TriStateBox aTsbAuto; + MetricField aMtrFldDelay; + + const SfxItemSet& rOutAttrs; + SdrTextAniKind eAniKind; + FieldUnit eFUnit; + SfxMapUnit eUnit; #ifdef _SVX_TEXTANIM_CXX DECL_LINK( SelectEffectHdl_Impl, void * ); @@ -86,8 +86,8 @@ private: DECL_LINK( ClickPixelHdl_Impl, void * ); DECL_LINK( ClickDirectionHdl_Impl, ImageButton * ); - void SelectDirection( SdrTextAniDirection nValue ); - USHORT GetSelectedDirection(); + void SelectDirection( SdrTextAniDirection nValue ); + USHORT GetSelectedDirection(); #endif public: @@ -95,13 +95,13 @@ public: SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxTextAnimationPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - void Construct(); + void Construct(); }; /************************************************************************* @@ -112,10 +112,10 @@ public: class SvxTextTabDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 258477dc5a5e..a8314998b0ca 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,36 +48,36 @@ class SdrView; class SvxTextAttrPage : public SvxTabPage { private: - FixedLine aFlText; + FixedLine aFlText; TriStateBox aTsbAutoGrowWidth; TriStateBox aTsbAutoGrowHeight; - TriStateBox aTsbFitToSize; - TriStateBox aTsbContour; + TriStateBox aTsbFitToSize; + TriStateBox aTsbContour; TriStateBox aTsbWordWrapText; TriStateBox aTsbAutoGrowSize; - FixedLine aFlDistance; - FixedText aFtLeft; - MetricField aMtrFldLeft; - FixedText aFtRight; - MetricField aMtrFldRight; - FixedText aFtTop; - MetricField aMtrFldTop; - FixedText aFtBottom; - MetricField aMtrFldBottom; + FixedLine aFlDistance; + FixedText aFtLeft; + MetricField aMtrFldLeft; + FixedText aFtRight; + MetricField aMtrFldRight; + FixedText aFtTop; + MetricField aMtrFldTop; + FixedText aFtBottom; + MetricField aMtrFldBottom; - FixedLine aFlSeparator; + FixedLine aFlSeparator; - FixedLine aFlPosition; - SvxRectCtl aCtlPosition; - TriStateBox aTsbFullWidth; + FixedLine aFlPosition; + SvxRectCtl aCtlPosition; + TriStateBox aTsbFullWidth; - const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SfxItemSet& rOutAttrs; + const SdrView* pView; - BOOL bAutoGrowSizeEnabled; - BOOL bContourEnabled; + BOOL bAutoGrowSizeEnabled; + BOOL bContourEnabled; BOOL bAutoGrowWidthEnabled; BOOL bAutoGrowHeightEnabled; BOOL bWordWrapTextEnabled; @@ -98,16 +98,16 @@ public: SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); ~SvxTextAttrPage(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window*, const SfxItemSet& ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual BOOL FillItemSet( SfxItemSet& ); + virtual void Reset( const SfxItemSet & ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } virtual void PageCreated(SfxAllItemSet aSet); }; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 8a3dc22d1715..6ea7bc591abc 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 8c427bef17d1..6083a0d56928 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,12 +57,12 @@ const USHORT SVX_OBJ_NOPROTECT = 0x0200; class SvxTransformTabDialog : public SfxTabDialog { private: - const SdrView* pView; + const SdrView* pView; - USHORT nAnchorCtrls; + USHORT nAnchorCtrls; Link aValidateLink; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: @@ -70,8 +70,8 @@ public: const SdrView* pView, USHORT nAnchorTypes = 0); ~SvxTransformTabDialog(); - - //link for the Writer to validate positions + + //link for the Writer to validate positions void SetValidateFramePosLink( const Link& rLink ); }; @@ -88,60 +88,60 @@ class SvxPositionSizeTabPage : public SvxTabPage private: // position - FixedLine maFlPosition; - FixedText maFtPosX; - MetricField maMtrPosX; - FixedText maFtPosY; - MetricField maMtrPosY; - FixedText maFtPosReference; - SvxRectCtl maCtlPos; + FixedLine maFlPosition; + FixedText maFtPosX; + MetricField maMtrPosX; + FixedText maFtPosY; + MetricField maMtrPosY; + FixedText maFtPosReference; + SvxRectCtl maCtlPos; // size - FixedLine maFlSize; - FixedText maFtWidth; - MetricField maMtrWidth; - FixedText maFtHeight; - MetricField maMtrHeight; - CheckBox maCbxScale; - FixedText maFtSizeReference; - SvxRectCtl maCtlSize; + FixedLine maFlSize; + FixedText maFtWidth; + MetricField maMtrWidth; + FixedText maFtHeight; + MetricField maMtrHeight; + CheckBox maCbxScale; + FixedText maFtSizeReference; + SvxRectCtl maCtlSize; // protect - FixedLine maFlProtect; - TriStateBox maTsbPosProtect; - TriStateBox maTsbSizeProtect; + FixedLine maFlProtect; + TriStateBox maTsbPosProtect; + TriStateBox maTsbSizeProtect; // adjust - FixedLine maFlAdjust; + FixedLine maFlAdjust; TriStateBox maTsbAutoGrowWidth; TriStateBox maTsbAutoGrowHeight; - FixedLine maFlDivider; + FixedLine maFlDivider; private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; - const SdrView* mpView; + const SdrView* mpView; // #i75273# - basegfx::B2DRange maRange; - basegfx::B2DRange maWorkRange; - basegfx::B2DPoint maAnchor; - - SfxMapUnit mePoolUnit; - FieldUnit meDlgUnit; - MapUnit meMapUnit; - TriState mnProtectSizeState; - bool mbPageDisabled; - bool mbProtectDisabled; - bool mbSizeDisabled; - bool mbAdjustDisabled; + basegfx::B2DRange maRange; + basegfx::B2DRange maWorkRange; + basegfx::B2DPoint maAnchor; + + SfxMapUnit mePoolUnit; + FieldUnit meDlgUnit; + MapUnit meMapUnit; + TriState mnProtectSizeState; + bool mbPageDisabled; + bool mbProtectDisabled; + bool mbSizeDisabled; + bool mbAdjustDisabled; // frome size // #i75273# - double mfOldWidth; - double mfOldHeight; - RECT_POINT meRP; + double mfOldWidth; + double mfOldHeight; + RECT_POINT meRP; //------------------------------------ #if _SOLAR__PRIVATE @@ -162,15 +162,15 @@ private: DECL_LINK( ClickSizeProtectHdl, void * ); DECL_LINK( ClickAutoHdl, void * ); - void SetMaxSize( Rectangle aRect ); - Rectangle GetRect(); + void SetMaxSize( Rectangle aRect ); + Rectangle GetRect(); #endif public: SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -180,16 +180,16 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } // void ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen virtual void FillUserData(); - void DisableResize(); - void DisableProtect(); + void DisableResize(); + void DisableProtect(); - void UpdateControlStates(); + void UpdateControlStates(); }; /************************************************************************* @@ -203,30 +203,30 @@ class SvxAngleTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - FixedLine aFlPosition; - FixedText aFtPosX; - MetricField aMtrPosX; - FixedText aFtPosY; - MetricField aMtrPosY; - FixedText aFtPosPresets; - SvxRectCtl aCtlRect; - - FixedLine aFlAngle; - FixedText aFtAngle; - MetricField aMtrAngle; - FixedText aFtAnglePresets; - SvxRectCtl aCtlAngle; - - const SfxItemSet& rOutAttrs; - const SdrView* pView; + FixedLine aFlPosition; + FixedText aFtPosX; + MetricField aMtrPosX; + FixedText aFtPosY; + MetricField aMtrPosY; + FixedText aFtPosPresets; + SvxRectCtl aCtlRect; + + FixedLine aFlAngle; + FixedText aFtAngle; + MetricField aMtrAngle; + FixedText aFtAnglePresets; + SvxRectCtl aCtlAngle; + + const SfxItemSet& rOutAttrs; + const SdrView* pView; // #i75273# - basegfx::B2DRange maRange; - basegfx::B2DPoint maAnchor; + basegfx::B2DRange maRange; + basegfx::B2DPoint maAnchor; - SfxMapUnit ePoolUnit; - FieldUnit eDlgUnit; - MapUnit eMapUnit; + SfxMapUnit ePoolUnit; + FieldUnit eDlgUnit; + MapUnit eMapUnit; //------------------------------------ #if _SOLAR__PRIVATE DECL_LINK( ModifiedHdl, void * ); @@ -235,7 +235,7 @@ public: SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -245,8 +245,8 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } }; /************************************************************************* @@ -260,31 +260,31 @@ class SvxSlantTabPage : public SvxTabPage using TabPage::DeactivatePage; private: - FixedLine aFlRadius; - FixedText aFtRadius; - MetricField aMtrRadius; - //TriStateBox aTsbVertical; - FixedLine aFlAngle; - FixedText aFtAngle; - MetricField aMtrAngle; - //SvxRectCtl aCtlAngle; + FixedLine aFlRadius; + FixedText aFtRadius; + MetricField aMtrRadius; + //TriStateBox aTsbVertical; + FixedLine aFlAngle; + FixedText aFtAngle; + MetricField aMtrAngle; + //SvxRectCtl aCtlAngle; - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; - const SdrView* pView; + const SdrView* pView; // #i75273# - basegfx::B2DRange maRange; + basegfx::B2DRange maRange; - SfxMapUnit ePoolUnit; - FieldUnit eDlgUnit; - MapUnit eMapUnit; + SfxMapUnit ePoolUnit; + FieldUnit eDlgUnit; + MapUnit eMapUnit; //------------------------------------ public: SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -294,8 +294,8 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void Construct(); + void SetView( const SdrView* pSdrView ) { pView = pSdrView; } }; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 35f51d7b0183..27c13d5fdba4 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,14 +54,14 @@ class OfaOptionsTreeListBox : public SvTreeListBox using SvListView::Collapse; private: - BOOL bInCollapse; + BOOL bInCollapse; public: OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {} virtual BOOL Collapse( SvLBoxEntry* pParent ); - BOOL IsInCollapse()const {return bInCollapse;} + BOOL IsInCollapse()const {return bInCollapse;} }; // struct OrderedEntry --------------------------------------------------- @@ -177,40 +177,40 @@ typedef std::vector< ExtensionsTabPage* > VectorOfPages; class OfaTreeOptionsDialog : public SfxModalDialog { private: - OKButton aOkPB; + OKButton aOkPB; CancelButton aCancelPB; - HelpButton aHelpPB; - PushButton aBackPB; + HelpButton aHelpPB; + PushButton aBackPB; - FixedBorder aHiddenGB; - FixedText aPageTitleFT; - FixedLine aLine1FL; - FixedText aHelpFT; - FixedImage aHelpImg; + FixedBorder aHiddenGB; + FixedText aPageTitleFT; + FixedLine aLine1FL; + FixedText aHelpFT; + FixedImage aHelpImg; ImageList aPageImages; ImageList aPageImagesHC; - ResStringArray aHelpTextsArr; + ResStringArray aHelpTextsArr; - OfaOptionsTreeListBox aTreeLB; + OfaOptionsTreeListBox aTreeLB; - String sTitle; - String sNotLoadedError; + String sTitle; + String sNotLoadedError; SvLBoxEntry* pCurrentPageEntry; // for the ColorTabPage - SfxItemSet* pColorPageItemSet; - XColorTable* pColorTab; - USHORT nChangeType; - USHORT nUnknownType; - USHORT nUnknownPos; - BOOL bIsAreaTP; - - BOOL bForgetSelection; - BOOL bExternBrowserActive; - BOOL bImageResized; + SfxItemSet* pColorPageItemSet; + XColorTable* pColorTab; + USHORT nChangeType; + USHORT nUnknownType; + USHORT nUnknownPos; + BOOL bIsAreaTP; + + BOOL bForgetSelection; + BOOL bExternBrowserActive; + BOOL bImageResized; bool bInSelectHdl_Impl; bool bIsFromExtensionManager; @@ -224,11 +224,11 @@ private: static LastPageSaver* pLastPageSaver; - SfxItemSet* CreateItemSet( USHORT nId ); - void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + SfxItemSet* CreateItemSet( USHORT nId ); + void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); void InitTreeAndHandler(); void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); - void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar + void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar void LoadExtensionOptions( const rtl::OUString& rExtensionId ); rtl::OUString GetModuleIdentifier( const com::sun::star::uno::Reference< @@ -284,34 +284,34 @@ public: class OfaPageResource : public Resource { - ResStringArray aGeneralDlgAry; - ResStringArray aInetDlgAry; + ResStringArray aGeneralDlgAry; + ResStringArray aInetDlgAry; ResStringArray aLangDlgAry; ResStringArray aTextDlgAry; - ResStringArray aHTMLDlgAry; - ResStringArray aCalcDlgAry; - ResStringArray aStarMathDlgAry; - ResStringArray aImpressDlgAry; - ResStringArray aDrawDlgAry; - ResStringArray aChartDlgAry; - ResStringArray aFilterDlgAry; - ResStringArray aDatasourcesDlgAry; + ResStringArray aHTMLDlgAry; + ResStringArray aCalcDlgAry; + ResStringArray aStarMathDlgAry; + ResStringArray aImpressDlgAry; + ResStringArray aDrawDlgAry; + ResStringArray aChartDlgAry; + ResStringArray aFilterDlgAry; + ResStringArray aDatasourcesDlgAry; public: OfaPageResource(); - ResStringArray& GetGeneralArray() {return aGeneralDlgAry;} - ResStringArray& GetInetArray() {return aInetDlgAry;} - ResStringArray& GetLangArray() {return aLangDlgAry;} - ResStringArray& GetTextArray() {return aTextDlgAry;} - ResStringArray& GetHTMLArray() {return aHTMLDlgAry;} - ResStringArray& GetCalcArray() {return aCalcDlgAry;} - ResStringArray& GetStarMathArray() {return aStarMathDlgAry;} - ResStringArray& GetImpressArray() {return aImpressDlgAry;} - ResStringArray& GetDrawArray() {return aDrawDlgAry;} - ResStringArray& GetChartArray() {return aChartDlgAry;} - ResStringArray& GetFilterArray() {return aFilterDlgAry;} - ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;} + ResStringArray& GetGeneralArray() {return aGeneralDlgAry;} + ResStringArray& GetInetArray() {return aInetDlgAry;} + ResStringArray& GetLangArray() {return aLangDlgAry;} + ResStringArray& GetTextArray() {return aTextDlgAry;} + ResStringArray& GetHTMLArray() {return aHTMLDlgAry;} + ResStringArray& GetCalcArray() {return aCalcDlgAry;} + ResStringArray& GetStarMathArray() {return aStarMathDlgAry;} + ResStringArray& GetImpressArray() {return aImpressDlgAry;} + ResStringArray& GetDrawArray() {return aDrawDlgAry;} + ResStringArray& GetChartArray() {return aChartDlgAry;} + ResStringArray& GetFilterArray() {return aFilterDlgAry;} + ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;} }; // class ExtensionsTabPage ----------------------------------------------- diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 87fbb8a2f74d..88d3d44793ae 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ private: FixedLine aZoomFl; RadioButton aOptimalBtn; RadioButton aWholePageBtn; - RadioButton aPageWidthBtn; + RadioButton aPageWidthBtn; RadioButton a100Btn; RadioButton aUserBtn; - MetricField aUserEdit; + MetricField aUserEdit; FixedLine aViewLayoutFl; RadioButton aAutomaticBtn; @@ -58,12 +58,12 @@ private: FixedLine aBottomFl; OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - const SfxItemSet& rSet; - SfxItemSet* pOutSet; - BOOL bModified; + const SfxItemSet& rSet; + SfxItemSet* pOutSet; + BOOL bModified; #ifdef _SVX_ZOOM_CXX DECL_LINK( UserHdl, RadioButton* ); @@ -78,16 +78,16 @@ public: SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); ~SvxZoomDialog(); - static USHORT* GetRanges(); - const SfxItemSet* GetOutputItemSet() const { return pOutSet; } + static USHORT* GetRanges(); + const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - USHORT GetFactor() const; - void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); + USHORT GetFactor() const; + void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); - void SetButtonText( USHORT nBtnId, const String& aNewTxt ); - void HideButton( USHORT nBtnId ); - void SetLimits( USHORT nMin, USHORT nMax ); - void SetSpinSize( USHORT nNewSpin ); + void SetButtonText( USHORT nBtnId, const String& aNewTxt ); + void HideButton( USHORT nBtnId ); + void SetLimits( USHORT nMin, USHORT nMax ); + void SetSpinSize( USHORT nNewSpin ); }; #include <layout/layout-post.hxx> diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index e80e1fd867a7..a9e916c0cc63 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 6e9eaf40fa4d..fdfff88fe6fe 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,8 +70,8 @@ public: class SvxChartOptions : public ::utl::ConfigItem { private: - SvxChartColorTable maDefColors; - BOOL mbIsInitialized; + SvxChartColorTable maDefColors; + BOOL mbIsInitialized; ::com::sun::star::uno::Sequence< ::rtl::OUString > maPropertyNames; @@ -84,10 +84,10 @@ public: SvxChartOptions(); virtual ~SvxChartOptions(); - const SvxChartColorTable& GetDefaultColors(); - void SetDefaultColors( const SvxChartColorTable& aCol ); + const SvxChartColorTable& GetDefaultColors(); + void SetDefaultColors( const SvxChartColorTable& aCol ); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; @@ -101,9 +101,9 @@ public: SvxChartColorTableItem( USHORT nWhich, const SvxChartColorTable& ); SvxChartColorTableItem( const SvxChartColorTableItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - void SetOptions( SvxChartOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + void SetOptions( SvxChartOptions* pOpts ) const; const SvxChartColorTable & GetColorTable() const ; SvxChartColorTable & GetColorTable(); @@ -113,6 +113,6 @@ private: SvxChartColorTable m_aColorTable; }; -#endif // _SVX_CFGCHART_HXX +#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 6caab1652ff1..41366d10314e 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ namespace offapp DriverPoolingSettings aSettings; // first get all the drivers register at the driver manager ODriverEnumeration aEnumDrivers; - for ( ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin(); + for ( ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin(); aLoopDrivers != aEnumDrivers.end(); ++aLoopDrivers ) @@ -134,7 +134,7 @@ namespace offapp // look if we (resp. the driver manager) know this driver // doing O(n) search here, which is expensive, but this doesn't matter in this small case ... DriverPoolingSettings::iterator aLookup; - for ( aLookup = aSettings.begin(); + for ( aLookup = aSettings.begin(); aLookup != aSettings.end(); ++aLookup ) @@ -142,7 +142,7 @@ namespace offapp break; if (aLookup == aSettings.end()) - { // do not know the driver - add it + { // do not know the driver - add it aSettings.push_back(DriverPooling(sThisDriverName, sal_False, 120)); // and the position of the new entry @@ -192,7 +192,7 @@ namespace offapp OConfigurationNode aThisDriverSettings; const DriverPoolingSettings& rNewSettings = pDriverSettings->getSettings(); - for ( DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin(); + for ( DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin(); aLoop != rNewSettings.end(); ++aLoop ) @@ -218,7 +218,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx index f834f2e90f03..774c5a744f68 100644 --- a/cui/source/options/connpoolconfig.hxx +++ b/cui/source/options/connpoolconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace offapp }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLCONFIG_HXX_ diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 9c37502c5ff4..c476a9b3c84a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,19 +52,19 @@ namespace offapp { using Window::Update; protected: - DriverPoolingSettings m_aSavedSettings; - DriverPoolingSettings m_aSettings; - DriverPoolingSettings::const_iterator m_aSeekRow; + DriverPoolingSettings m_aSavedSettings; + DriverPoolingSettings m_aSettings; + DriverPoolingSettings::const_iterator m_aSeekRow; - String m_sYes; - String m_sNo; + String m_sYes; + String m_sNo; - Link m_aRowChangeHandler; + Link m_aRowChangeHandler; public: DriverListControl( Window* _pParent, const ResId& _rId); - virtual void Init(); + virtual void Init(); void Update(const DriverPoolingSettings& _rSettings); virtual String GetCellText( long nRow, USHORT nColId ) const; @@ -75,12 +75,12 @@ namespace offapp const DriverPooling* getCurrentRow() const; DriverPooling* getCurrentRow(); - void updateCurrentRow(); + void updateCurrentRow(); const DriverPoolingSettings& getSettings() const { return m_aSettings; } - void saveValue() { m_aSavedSettings = m_aSettings; } - sal_Bool isModified() const; + void saveValue() { m_aSavedSettings = m_aSettings; } + sal_Bool isModified() const; protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol ); @@ -107,7 +107,7 @@ 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, 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())) @@ -331,15 +331,15 @@ namespace offapp //-------------------------------------------------------------------- ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet) - ,m_aFrame (this, CUI_RES(FL_POOLING)) - ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS)) - ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS)) + ,m_aFrame (this, CUI_RES(FL_POOLING)) + ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS)) + ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS)) ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST))) - ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL)) - ,m_aDriver (this, CUI_RES(FT_DRIVER)) - ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING)) - ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT)) - ,m_aTimeout (this, CUI_RES(NF_TIMEOUT)) + ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL)) + ,m_aDriver (this, CUI_RES(FT_DRIVER)) + ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING)) + ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT)) + ,m_aTimeout (this, CUI_RES(NF_TIMEOUT)) { m_pDriverList->Init(); m_pDriverList->Show(); @@ -444,7 +444,7 @@ namespace offapp m_aTimeout.Enable(bValidRow); if (!bValidRow) - { // positioned on an invalid row + { // positioned on an invalid row m_aDriver.SetText(String()); } else @@ -502,7 +502,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpooloptions.hrc b/cui/source/options/connpooloptions.hrc index ec12b61b8aea..88b36f0ed40e 100644 --- a/cui/source/options/connpooloptions.hrc +++ b/cui/source/options/connpooloptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,21 +28,21 @@ #ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_ #define _OFFAPP_CONNPOOLOPTIONS_HRC_ -#define FL_POOLING 1 -#define CB_POOL_CONNS 2 -#define FT_DRIVERS 3 -#define CTRL_DRIVER_LIST 4 -#define FT_DRIVERLABEL 5 -#define FT_DRIVER 6 -#define CB_DRIVERPOOLING 7 -#define FT_TIMEOUT 8 -#define NF_TIMEOUT 9 +#define FL_POOLING 1 +#define CB_POOL_CONNS 2 +#define FT_DRIVERS 3 +#define CTRL_DRIVER_LIST 4 +#define FT_DRIVERLABEL 5 +#define FT_DRIVER 6 +#define CB_DRIVERPOOLING 7 +#define FT_TIMEOUT 8 +#define NF_TIMEOUT 9 -#define STR_DRIVER_NAME 1 -#define STR_POOLED_FLAG 2 -#define STR_POOL_TIMEOUT 3 -#define STR_YES 4 -#define STR_NO 5 +#define STR_DRIVER_NAME 1 +#define STR_POOLED_FLAG 2 +#define STR_POOL_TIMEOUT 3 +#define STR_YES 4 +#define STR_NO 5 #endif // _OFFAPP_CONNPOOLOPTIONS_HRC_ diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 9b4e58255575..0f3bea310045 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,30 +50,30 @@ namespace offapp using TabPage::ActivatePage; protected: - FixedLine m_aFrame; - CheckBox m_aEnablePooling; - FixedText m_aDriversLabel; - DriverListControl* m_pDriverList; - FixedText m_aDriverLabel; - FixedText m_aDriver; - CheckBox m_aDriverPoolingEnabled; - FixedText m_aTimeoutLabel; - NumericField m_aTimeout; + FixedLine m_aFrame; + CheckBox m_aEnablePooling; + FixedText m_aDriversLabel; + DriverListControl* m_pDriverList; + FixedText m_aDriverLabel; + FixedText m_aDriver; + CheckBox m_aDriverPoolingEnabled; + FixedText m_aTimeoutLabel; + NumericField m_aTimeout; protected: ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet); public: - static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); + static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); ~ConnectionPoolOptionsPage(); protected: - virtual long Notify( NotifyEvent& _rNEvt ); + virtual long Notify( NotifyEvent& _rNEvt ); - virtual BOOL FillItemSet(SfxItemSet& _rSet); - virtual void Reset(const SfxItemSet& _rSet); - virtual void ActivatePage( const SfxItemSet& _rSet); + virtual BOOL FillItemSet(SfxItemSet& _rSet); + virtual void Reset(const SfxItemSet& _rSet); + virtual void ActivatePage( const SfxItemSet& _rSet); protected: DECL_LINK( OnEnabledDisabled, const CheckBox* ); @@ -85,7 +85,7 @@ namespace offapp }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLOPTIONS_HXX_ diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src index 08e4f2043a40..cd4cad5f1d6e 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ #include "connpooloptions.hrc" #include <cuires.hrc> -#define PAGE_SIZE_X 260 -#define PAGE_SIZE_Y 185 +#define PAGE_SIZE_X 260 +#define PAGE_SIZE_Y 185 -#define LIST_SIZE_Y 100 +#define LIST_SIZE_Y 100 TabPage RID_OFAPAGE_CONNPOOLOPTIONS { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ; SVLook = TRUE ; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 8c32ad12f40d..f3756627ea07 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,9 +57,9 @@ namespace offapp //-------------------------------------------------------------------- sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const { - return (sName == _rR.sName) - && (bEnabled == _rR.bEnabled) - && (nTimeoutSeconds == _rR.nTimeoutSeconds); + return (sName == _rR.sName) + && (bEnabled == _rR.bEnabled) + && (nTimeoutSeconds == _rR.nTimeoutSeconds); } //==================================================================== @@ -115,7 +115,7 @@ namespace offapp //-------------------------------------------------------------------- //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index a347d1588c4e..8534d2f8b525 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ namespace offapp //==================================================================== struct DriverPooling { - String sName; - sal_Bool bEnabled; - sal_Int32 nTimeoutSeconds; + String sName; + sal_Bool bEnabled; + sal_Int32 nTimeoutSeconds; DriverPooling(); DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); @@ -61,22 +61,22 @@ namespace offapp { protected: DECLARE_STL_VECTOR( DriverPooling, DriverSettings ); - DriverSettings m_aDrivers; + DriverSettings m_aDrivers; public: - typedef ConstDriverSettingsIterator const_iterator; - typedef DriverSettingsIterator iterator; + typedef ConstDriverSettingsIterator const_iterator; + typedef DriverSettingsIterator iterator; public: DriverPoolingSettings(); sal_Int32 size() const { return m_aDrivers.size(); } - const_iterator begin() const { return m_aDrivers.begin(); } - const_iterator end() const { return m_aDrivers.end(); } + const_iterator begin() const { return m_aDrivers.begin(); } + const_iterator end() const { return m_aDrivers.end(); } - iterator begin() { return m_aDrivers.begin(); } - iterator end() { return m_aDrivers.end(); } + iterator begin() { return m_aDrivers.begin(); } + iterator end() { return m_aDrivers.end(); } void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); } }; @@ -87,7 +87,7 @@ namespace offapp class DriverPoolingSettingsItem : public SfxPoolItem { protected: - DriverPoolingSettings m_aSettings; + DriverPoolingSettings m_aSettings; public: TYPEINFO(); @@ -97,11 +97,11 @@ namespace offapp virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const DriverPoolingSettings& getSettings() const { return m_aSettings; } + const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLSETTINGS_HXX_ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 40f0158404cc..50644fb8d6e7 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include <cuires.hrc> -#define ITEMID_SETITEM 0 +#define ITEMID_SETITEM 0 #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> @@ -66,12 +66,12 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog( Window *pParent, const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) : - SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), + SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), nInitialTlFlags( nInitialFlags ) { pPage = (SvxJSearchOptionsPage *) SvxJSearchOptionsPage::Create( this, rOptionsSet ); - SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! + SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! pPage->EnableSaveOptions( FALSE ); } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index bc856f37ad20..1730276ca208 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ #include "dbregisterednamesconfig.hxx" #include <svx/dialogs.hrc> -#define TAB_WIDTH1 80 +#define TAB_WIDTH1 80 #define TAB_WIDTH_MIN 10 -#define TAB_WIDTH2 1000 +#define TAB_WIDTH2 1000 #define ITEMID_TYPE 1 #define ITEMID_PATH 2 //........................................................................ @@ -119,18 +119,18 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ), - aStdBox ( this, CUI_RES( GB_STD ) ), - aTypeText ( this, CUI_RES( FT_TYPE ) ), - aPathText ( this, CUI_RES( FT_PATH ) ), - aPathCtrl ( this, CUI_RES( LB_PATH ) ), - m_aNew ( this, CUI_RES( BTN_NEW ) ), - m_aEdit ( this, CUI_RES( BTN_EDIT ) ), - m_aDelete ( this, CUI_RES( BTN_DELETE ) ), - pHeaderBar ( NULL ), - pPathBox ( NULL ), - m_pCurEntry ( NULL ), - m_nOldCount ( 0 ), - m_bModified ( FALSE ) + aStdBox ( this, CUI_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + m_aNew ( this, CUI_RES( BTN_NEW ) ), + m_aEdit ( this, CUI_RES( BTN_EDIT ) ), + m_aDelete ( this, CUI_RES( BTN_DELETE ) ), + pHeaderBar ( NULL ), + pPathBox ( NULL ), + m_pCurEntry ( NULL ), + m_nOldCount ( 0 ), + m_bModified ( FALSE ) { m_aNew.SetClickHdl( LINK( this, DbRegistrationOptionsPage, NewHdl ) ); m_aEdit.SetClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) ); @@ -195,7 +195,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage() // ----------------------------------------------------------------------- -SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, +SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) ); @@ -258,7 +258,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) HeaderEndDrag_Impl( NULL ); // Sortierrichtung restaurieren BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32(); - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); if ( bUp ) { @@ -281,7 +281,7 @@ void DbRegistrationOptionsPage::FillUserData() { String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) ); aUserData += ';'; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? '1' : '0'; SetUserData( aUserData ); @@ -334,7 +334,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE ) return 0; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; @@ -519,7 +519,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) return 1L; } //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ diff --git a/cui/source/options/dbregister.hrc b/cui/source/options/dbregister.hrc index 492913c0a251..eb53ca07f22e 100644 --- a/cui/source/options/dbregister.hrc +++ b/cui/source/options/dbregister.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,15 +28,15 @@ #define SVX_DBREGISTER_HRC // defines --------------------------------------------------------------- -#define FT_TYPE 10 -#define FT_PATH 11 -#define LB_PATH 12 -#define BTN_NEW 13 -#define BTN_EDIT 14 -#define GB_STD 15 +#define FT_TYPE 10 +#define FT_PATH 11 +#define LB_PATH 12 +#define BTN_NEW 13 +#define BTN_EDIT 14 +#define GB_STD 15 #define IMG_LOCK 16 #define IMG_LOCK_HC 17 -#define BTN_DELETE 18 +#define BTN_DELETE 18 #endif // SVX_DBREGISTER_HRC diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index 444d4faac22d..7da53884d465 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 9505cb52e9c5..064533ac1889 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ namespace svx aContext.createComponent( "com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW ); const DatabaseRegistrations& rNewRegistrations = pRegistrations->getRegistrations(); - for ( DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin(); + for ( DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin(); reg != rNewRegistrations.end(); ++reg ) @@ -139,7 +139,7 @@ namespace svx } //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index 8bda35b4f0d1..1754d4c810a8 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace svx }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTEREDNAMESCONFIG_HXX diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 97c9cf0b2587..9950f059b659 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace svx //-------------------------------------------------------------------- //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 4b096ecf4543..531eac7a08fa 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ namespace svx //==================================================================== class DatabaseMapItem : public SfxPoolItem { - protected: + protected: DatabaseRegistrations m_aRegistrations; public: @@ -90,7 +90,7 @@ namespace svx }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTERSETTING_HXX diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index f2fcf7aa2550..b0abcdaa129b 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,11 +59,11 @@ namespace svx ,m_aURL (this, CUI_RES(CMB_URL)) ,m_aBrowseFile (this, CUI_RES(PB_BROWSEFILE)) ,m_aNameLabel (this, CUI_RES(FT_NAME)) - ,m_aName (this, CUI_RES(ET_NAME)) + ,m_aName (this, CUI_RES(ET_NAME)) ,m_aBottomLine (this, CUI_RES(FL_BOTTOM)) - ,m_aOK (this, CUI_RES(BTN_OK)) + ,m_aOK (this, CUI_RES(BTN_OK)) ,m_aCancel (this, CUI_RES(BTN_CANCEL)) - ,m_aHelp (this, CUI_RES(BTN_HELP)) + ,m_aHelp (this, CUI_RES(BTN_HELP)) ,m_bCreatingNew(_bCreateNew) { String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) ); @@ -83,7 +83,7 @@ namespace svx validate(); - // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); + // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); m_aURL.SetDropDownLineCount( 5 ); } @@ -105,7 +105,7 @@ namespace svx //------------------------------------------------------------------ void ODocumentLinkDialog::validate( ) { - + m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) ); } @@ -156,7 +156,7 @@ namespace svx sMsg.SearchAndReplaceAscii("$file$", sCurrentText); InfoBox aError(this, sMsg); aError.Execute(); - + m_aName.SetSelection(Selection(0,sCurrentText.Len())); m_aName.GrabFocus(); return 0L; @@ -190,7 +190,7 @@ namespace svx return 0L; if (0 == m_aName.GetText().Len()) - { // default the name to the base of the chosen URL + { // default the name to the base of the chosen URL INetURLObject aParser; aParser.SetSmartProtocol(INET_PROT_FILE); @@ -220,7 +220,7 @@ namespace svx } //...................................................................... -} // namespace svx +} // namespace svx //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.hrc b/cui/source/options/doclinkdialog.hrc index cdcc636a78ad..2ad812e7348a 100644 --- a/cui/source/options/doclinkdialog.hrc +++ b/cui/source/options/doclinkdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef _SVX_DOCLINKDIALOG_HRC_ #define _SVX_DOCLINKDIALOG_HRC_ -#define FT_NAME 1 -#define FT_URL 2 +#define FT_NAME 1 +#define FT_URL 2 -#define ET_NAME 1 +#define ET_NAME 1 -#define CMB_URL 1 +#define CMB_URL 1 -#define PB_BROWSEFILE 1 +#define PB_BROWSEFILE 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 -#define FL_BOTTOM 1 +#define FL_BOTTOM 1 -#define STR_EDIT_LINK 1 -#define STR_NEW_LINK 2 +#define STR_EDIT_LINK 1 +#define STR_NEW_LINK 2 #endif // _SVX_DOCLINKDIALOG_HRC_ diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 044fba2d37d4..298d15c99817 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,20 +49,20 @@ namespace svx class ODocumentLinkDialog : public ModalDialog { protected: - FixedText m_aURLLabel; - ::svt::OFileURLControl m_aURL; - PushButton m_aBrowseFile; - FixedText m_aNameLabel; - Edit m_aName; + FixedText m_aURLLabel; + ::svt::OFileURLControl m_aURL; + PushButton m_aBrowseFile; + FixedText m_aNameLabel; + Edit m_aName; - FixedLine m_aBottomLine; - OKButton m_aOK; - CancelButton m_aCancel; - HelpButton m_aHelp; + FixedLine m_aBottomLine; + OKButton m_aOK; + CancelButton m_aCancel; + HelpButton m_aHelp; - sal_Bool m_bCreatingNew; + sal_Bool m_bCreatingNew; - Link m_aNameValidator; + Link m_aNameValidator; public: ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ); @@ -70,11 +70,11 @@ namespace svx // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not // acceptable - void setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; } - Link getNameValidator( ) const { return m_aNameValidator; } + void setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; } + Link getNameValidator( ) const { return m_aNameValidator; } - void set( const String& _rName, const String& _rURL ); - void get( String& _rName, String& _rURL ) const; + void set( const String& _rName, const String& _rURL ); + void get( String& _rName, String& _rURL ) const; protected: DECL_LINK( OnTextModified, Control* ); @@ -85,7 +85,7 @@ namespace svx }; //...................................................................... -} // namespace svx +} // namespace svx //...................................................................... #endif // _SVX_DOCLINKDIALOG_HXX_ diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index f61f23092f37..eb3dadcdeeae 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,32 +30,32 @@ #include "doclinkdialog.hrc" #endif -#define DIALOG_SIZE_X 200 -#define DIALOG_SIZE_Y 94 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define DIALOG_SIZE_X 200 +#define DIALOG_SIZE_Y 94 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define LABEL_WIDTH 50 +#define LABEL_WIDTH 50 -#define HEIGHT_LABEL 8 -#define HEIGHT_EDIT 12 +#define HEIGHT_LABEL 8 +#define HEIGHT_EDIT 12 -#define LINE_1_Y 6 -#define LINE_2_Y LINE_1_Y + HEIGHT_EDIT + 4 -#define OFFSET_Y 6 +#define LINE_1_Y 6 +#define LINE_2_Y LINE_1_Y + HEIGHT_EDIT + 4 +#define OFFSET_Y 6 ModalDialog DLG_DOCUMENTLINK { OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - + Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_URL { - + Pos = MAP_APPFONT ( 6, LINE_1_Y ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; Group = TRUE; @@ -95,7 +95,7 @@ ModalDialog DLG_DOCUMENTLINK TabStop = TRUE ; Border = TRUE ; }; - + FixedLine FL_BOTTOM { Pos = MAP_APPFONT ( 4, LINE_1_Y + 4*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y + HEIGHT_EDIT - 6); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e9da5da794db..617c18f35100 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,23 +42,23 @@ /*********************************************************************/ /* */ -/* TabPage Fontersetzung */ +/* TabPage Fontersetzung */ /* */ /*********************************************************************/ -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet), - aUseTableCB (this, CUI_RES(CB_USETABLE)), + aUseTableCB (this, CUI_RES(CB_USETABLE)), aFont1FT (this, CUI_RES(FT_FONT1)), - aFont1CB (this, CUI_RES(CB_FONT1)), - aFont2FT (this, CUI_RES(FT_FONT2)), - aFont2CB (this, CUI_RES(CB_FONT2)), - aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)), + aFont1CB (this, CUI_RES(CB_FONT1)), + aFont2FT (this, CUI_RES(FT_FONT2)), + aFont2CB (this, CUI_RES(CB_FONT2)), + aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)), aCheckLB (this, CUI_RES(CLB_SUBSTITUTES)), aSourceViewFontsFL (this, CUI_RES(FL_SOURCEVIEW )), @@ -68,16 +68,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aFontHeightFT (this, CUI_RES(FT_FONTHEIGHT )), aFontHeightLB (this, CUI_RES(LB_FONTHEIGHT )), - aImageList (CUI_RES(IL_ICON)), + aImageList (CUI_RES(IL_ICON)), sAutomatic (CUI_RES( STR_AUTOMATIC )), pConfig(new SvtFontSubstConfig), pSourceViewConfig(new utl::SourceViewConfig), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sHeader3 (CUI_RES( STR_HEADER3 )), - sHeader4 (CUI_RES( STR_HEADER4 )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sHeader3 (CUI_RES( STR_HEADER3 )), + sHeader4 (CUI_RES( STR_HEADER4 )), sFontGroup ("FontSubstitution"), pCheckButtonData(0) @@ -171,7 +171,7 @@ SvLBoxEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, @@ -415,7 +415,7 @@ void SvxFontSubstTabPage::CheckEnable() sEntry += '\t'; sEntry += aFont2CB.GetText(); -/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || +/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || aFont1CB.GetText() == aFont2CB.GetText() || aCheckLB.GetEntryPos(sEntry) != 0xffffffff || (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0)) diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc index e23bcf2365a3..73830cf2b00f 100644 --- a/cui/source/options/fontsubs.hrc +++ b/cui/source/options/fontsubs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ // defines ------------------------------------------------------------------ #define CLB_SUBSTITUTES 1 -#define FT_FONT1 2 +#define FT_FONT1 2 #define CB_FONT1 3 #define FT_FONT2 4 #define CB_FONT2 5 @@ -46,8 +46,8 @@ #define STR_HEADER3 12 #define STR_HEADER4 13 -#define IL_ICON 20 -#define CB_USETABLE 21 +#define IL_ICON 20 +#define CB_USETABLE 21 #define FL_SOURCEVIEW 22 #define FT_FONTNAME 23 diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index ddae7a3af68e..e02bb70bc9d4 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,22 +49,22 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); + virtual void SetTabs(); virtual void KeyInput( const KeyEvent& rKEvt ); public: SvxFontSubstCheckListBox(Window* pParent, const ResId& rResId ) : SvxSimpleTable( pParent, rResId ){} - inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); } - inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } + inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); } + inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - BOOL IsChecked(ULONG nPos, USHORT nCol = 0); - BOOL IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0); - void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); - void CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + BOOL IsChecked(ULONG nPos, USHORT nCol = 0); + BOOL IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0); + void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); + void CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked); + SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); }; // class SvxFontSubstTabPage ---------------------------------------------------- @@ -72,12 +72,12 @@ class SvtFontSubstConfig; namespace svt {class SourceViewConfig;} class SvxFontSubstTabPage : public SfxTabPage { - CheckBox aUseTableCB; + CheckBox aUseTableCB; FixedText aFont1FT; - FontNameBox aFont1CB; - FixedText aFont2FT; - FontNameBox aFont2CB; - ToolBox aNewDelTBX; + FontNameBox aFont1CB; + FixedText aFont2FT; + FontNameBox aFont2CB; + ToolBox aNewDelTBX; SvxFontSubstCheckListBox aCheckLB; FixedLine aSourceViewFontsFL; @@ -90,24 +90,24 @@ class SvxFontSubstTabPage : public SfxTabPage ImageList aImageList; String sAutomatic; - SvtFontSubstConfig* pConfig; + SvtFontSubstConfig* pConfig; utl::SourceViewConfig* pSourceViewConfig; - String sHeader1; - String sHeader2; - String sHeader3; - String sHeader4; + String sHeader1; + String sHeader2; + String sHeader3; + String sHeader4; - Color aTextColor; - ByteString sFontGroup; + Color aTextColor; + ByteString sFontGroup; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); - SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); - void CheckEnable(); + SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); + void CheckEnable(); SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 1b5f3298913e..0d4bce1c9c88 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 9166eabe3996..96afb1a701e4 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,33 +42,33 @@ namespace offapp struct InternationalOptionsPage::IMPL { - FixedLine m_aFL_DefaultTextDirection; - RadioButton m_aRB_TxtDirLeft2Right; - RadioButton m_aRB_TxtDirRight2Left; - FixedLine m_aFL_SheetView; - CheckBox m_aCB_ShtVwRight2Left; - CheckBox m_aCB_ShtVwCurrentDocOnly; + FixedLine m_aFL_DefaultTextDirection; + RadioButton m_aRB_TxtDirLeft2Right; + RadioButton m_aRB_TxtDirRight2Left; + FixedLine m_aFL_SheetView; + CheckBox m_aCB_ShtVwRight2Left; + CheckBox m_aCB_ShtVwCurrentDocOnly; - BOOL m_bEnable_SheetView_Opt : 1; + BOOL m_bEnable_SheetView_Opt : 1; - inline IMPL( Window* _pParent ); + inline IMPL( Window* _pParent ); - inline void EnableOption_SheetView( BOOL _bEnable = TRUE ); - void ShowOption_SheetView( BOOL _bShow = TRUE ); + inline void EnableOption_SheetView( BOOL _bEnable = TRUE ); + void ShowOption_SheetView( BOOL _bShow = TRUE ); - BOOL FillItemSet( SfxItemSet& _rSet ); - void Reset( const SfxItemSet& _rSet ); + BOOL FillItemSet( SfxItemSet& _rSet ); + void Reset( const SfxItemSet& _rSet ); }; inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) : - m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) ) - ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) ) - ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) ) - ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) ) - ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) ) - ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) ) - - ,m_bEnable_SheetView_Opt ( FALSE ) + m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) ) + ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) ) + ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) ) + ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) ) + ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) ) + ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) ) + + ,m_bEnable_SheetView_Opt ( FALSE ) { ShowOption_SheetView( m_bEnable_SheetView_Opt ); } @@ -95,14 +95,14 @@ namespace offapp DBG_ASSERT( _rSet.GetPool(), "-InternationalOptionsPage::FillItemSet(): no pool gives rums!" ); // handling of DefaultTextDirection stuff - _rSet.Put( SfxBoolItem( _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ), + _rSet.Put( SfxBoolItem( _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ), m_aRB_TxtDirLeft2Right.IsChecked() ), SID_ATTR_PARA_LEFT_TO_RIGHT ); // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// } +// if( m_bEnable_SheetView_Opt ) +// { +// } return TRUE; } @@ -110,26 +110,26 @@ namespace offapp void InternationalOptionsPage::IMPL::Reset( const SfxItemSet& _rSet ) { // handling of DefaultTextDirection stuff - const SfxBoolItem* pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) ); + const SfxBoolItem* pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) ); DBG_ASSERT( pLeft2RightItem, "+InternationalOptionsPage::Reset(): SID_ATTR_PARA_LEFT_TO_RIGHT not set!" ); - BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE; + BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE; m_aRB_TxtDirLeft2Right.Check( bLeft2Right ); // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// m_aCB_ShtVwRight2Left.Check( FALSE ); +// if( m_bEnable_SheetView_Opt ) +// { +// m_aCB_ShtVwRight2Left.Check( FALSE ); // -// m_aCB_ShtVwCurrentDocOnly.Check( FALSE ); -// } +// m_aCB_ShtVwCurrentDocOnly.Check( FALSE ); +// } } InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) : - SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) + SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) - ,m_pImpl ( new IMPL( this ) ) + ,m_pImpl ( new IMPL( this ) ) { FreeResource(); } @@ -141,8 +141,8 @@ namespace offapp SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ) { - InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); -// p->m_pImpl->EnableOption_SheetView(); + InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); +// p->m_pImpl->EnableOption_SheetView(); return p; } @@ -161,6 +161,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.hrc b/cui/source/options/internationaloptions.hrc index 14e3ebb4c525..13d17f01be8d 100644 --- a/cui/source/options/internationaloptions.hrc +++ b/cui/source/options/internationaloptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,42 +31,42 @@ #include <svtools/controldims.hrc> // general sizes -#define PAGE_SIZE_X 260 -#define PAGE_SIZE_Y 185 +#define PAGE_SIZE_X 260 +#define PAGE_SIZE_Y 185 // x-positions -#define COL_0 RSC_SP_TBPG_INNERBORDER_LEFT -#define COL_1 (COL_0 + RSC_SP_FLGR_SPACE_X) -#define COL_2 (COL_1 + RSC_SP_CHK_TEXTINDENT) -#define COL_LAST (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT) +#define COL_0 RSC_SP_TBPG_INNERBORDER_LEFT +#define COL_1 (COL_0 + RSC_SP_FLGR_SPACE_X) +#define COL_2 (COL_1 + RSC_SP_CHK_TEXTINDENT) +#define COL_LAST (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT) // heights -#define HEIGHT_FL RSC_CD_FIXEDLINE_HEIGHT -#define HEIGHT_RB RSC_CD_RADIOBUTTON_HEIGHT -#define HEIGHT_CB RSC_CD_CHECKBOX_HEIGHT +#define HEIGHT_FL RSC_CD_FIXEDLINE_HEIGHT +#define HEIGHT_RB RSC_CD_RADIOBUTTON_HEIGHT +#define HEIGHT_CB RSC_CD_CHECKBOX_HEIGHT // vertical spacing -#define SPACE_FL_NEXTCTRL_Y RSC_SP_CTRL_DESC_Y +#define SPACE_FL_NEXTCTRL_Y RSC_SP_CTRL_DESC_Y // y-positions -#define ROW_0 RSC_SP_TBPG_INNERBORDER_TOP -#define ROW_1 (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) -#define ROW_2 (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y) -#define ROW_3 (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y) -#define ROW_4 (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) -#define ROW_5 (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y) +#define ROW_0 RSC_SP_TBPG_INNERBORDER_TOP +#define ROW_1 (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) +#define ROW_2 (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y) +#define ROW_3 (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y) +#define ROW_4 (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) +#define ROW_5 (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y) // misc calculation makros -#define WIDTH2END( startcol ) (COL_LAST - startcol) +#define WIDTH2END( startcol ) (COL_LAST - startcol) // resource IDs -#define FL_DEFTXTDIRECTION 1 -#define RB_TXTDIR_LEFT2RIGHT 2 -#define RB_TXTDIR_RIGHT2LEFT 3 -#define FL_SHEETVIEW 4 -#define CB_SHTVW_RIGHT2LEFT 5 -#define CB_SHTVW_CURRENTDOCONLY 6 +#define FL_DEFTXTDIRECTION 1 +#define RB_TXTDIR_LEFT2RIGHT 2 +#define RB_TXTDIR_RIGHT2LEFT 3 +#define FL_SHEETVIEW 4 +#define CB_SHTVW_RIGHT2LEFT 5 +#define CB_SHTVW_CURRENTDOCONLY 6 #endif diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index 3acd1ac2766c..9e804b34ee7a 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 63cb9bcc0d3e..7b514df507d5 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index 30c0fe9ddde8..b09ebd4bfcd4 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 02678936e05e..b0e92a28a597 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,39 +39,39 @@ static void MovePosY( Window& _rWin, long _nDelta ) { - Point aPoint = _rWin.GetPosPixel(); + Point aPoint = _rWin.GetPosPixel(); aPoint.Y() += _nDelta; - + _rWin.SetPosPixel( aPoint ); } struct SvxAccessibilityOptionsTabPage_Impl { - SvtAccessibilityOptions m_aConfig; + SvtAccessibilityOptions m_aConfig; SvxAccessibilityOptionsTabPage_Impl() : m_aConfig(){} }; SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet) - ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS )) - ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL )) - ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION )) - ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS )) - ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS )) - ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP )) - ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP )) - ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP )) - ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS )) - ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC )) - ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR)) - ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS )) + ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS )) + ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL )) + ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION )) + ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS )) + ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS )) + ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP )) + ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP )) + ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP )) + ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS )) + ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC )) + ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR)) + ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS )) ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl) { FreeResource(); m_aTipHelpCB.SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl)); - long nHeightDelta = 0; // to correct positions _under_ m_aAccessibilityTool + long nHeightDelta = 0; // to correct positions _under_ m_aAccessibilityTool #ifdef UNX { @@ -97,7 +97,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, #endif if( nHeightDelta ) - { //adjust positions of controls under m_aAccessibilityTool + { //adjust positions of controls under m_aAccessibilityTool Size aSize = m_aAccessibilityTool.LogicToPixel( Size( 0, nHeightDelta ), MAP_APPFONT ); nHeightDelta = aSize.Height(); @@ -119,7 +119,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage() delete m_pImpl; } -SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet); } @@ -133,7 +133,7 @@ BOOL SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_aTipHelpNF.GetValue() ); m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_aAnimatedGraphics.IsChecked() ); m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_aAnimatedTexts.IsChecked() ); - m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() ); + m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() ); m_pImpl->m_aConfig.SetSelectionInReadonly( m_aTextSelectionInReadonly.IsChecked()); m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_aAutoDetectHC.IsChecked()); @@ -156,15 +156,15 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) { //set controls from aConfig.Get... - m_aPagePreviews.Check( m_pImpl->m_aConfig.GetIsForPagePreviews() ); - EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() ); - m_aTipHelpNF.SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() ); - 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_aPagePreviews.Check( m_pImpl->m_aConfig.GetIsForPagePreviews() ); + EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() ); + m_aTipHelpNF.SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() ); + 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() ); + m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() ); AllSettings aAllSettings = Application::GetSettings(); diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc index 35c02cc3e756..acb1d37ac932 100644 --- a/cui/source/options/optaccessibility.hrc +++ b/cui/source/options/optaccessibility.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,44 +31,44 @@ // defines for positions and sizes -#define GB_WIDTH 248 -#define CB_WIDTH 240 -#define EDIT_WIDTH 25 +#define GB_WIDTH 248 +#define CB_WIDTH 240 +#define EDIT_WIDTH 25 -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL1+(CB_WIDTH * 2/3)) -#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X) +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+10) +#define COL3 (COL1+(CB_WIDTH * 2/3)) +#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X) #define UNIT_WIDTH (COL1+CB_WIDTH-COL4) -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define LINESPACE 1 -#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2 -#define ROWA_0 3 -#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define LINESPACE 1 +#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2 +#define ROWA_0 3 +#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) +#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE ) -#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE ) +#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) +#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define WHOLE_HEIGHT 185 +#define WHOLE_HEIGHT 185 #define LASTTEXT_HEIGHT (WHOLE_HEIGHT-ROWB_8) -#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define DIFF(v1,v2) (v2-v1) -#define SUM(v1,v2) (v2+v1) +#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define DIFF(v1,v2) (v2-v1) +#define SUM(v1,v2) (v2+v1) // -#define FL_MISCELLANEOUS 1 +#define FL_MISCELLANEOUS 1 #define CB_PAGE_PREVIEWS 2 -#define FL_HC_OPTIONS 3 +#define FL_HC_OPTIONS 3 #define CB_TIPHELP 4 #define NF_TIPHELP 5 #define FT_TIPHELP 6 @@ -78,7 +78,7 @@ #define CB_SYSTEM_FONT 10 #define CB_ACCESSIBILITY_TOOL 11 #define CB_TEXTSELECTION 12 -#define CB_AUTO_DETECT_HC 13 +#define CB_AUTO_DETECT_HC 13 #endif diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 3e3b0deafaba..3fbd5da0db26 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,18 +34,18 @@ struct SvxAccessibilityOptionsTabPage_Impl; class SvxAccessibilityOptionsTabPage : public SfxTabPage { - FixedLine m_aMiscellaneousLabel; // FL_MISCELLANEOUS - CheckBox m_aAccessibilityTool; // CB_ACCESSIBILITY_TOOL - CheckBox m_aTextSelectionInReadonly; // CB_TEXTSELECTION - CheckBox m_aAnimatedGraphics; // CB_ANIMATED_GRAPHICS - CheckBox m_aAnimatedTexts; // CB_ANIMATED_TEXTS - CheckBox m_aTipHelpCB; // CB_TIPHELP - NumericField m_aTipHelpNF; // NF_TIPHELP - FixedText m_aTipHelpFT; // FT_TIPHELP - FixedLine m_aHCOptionsLabel; // FL_HC_OPTIONS - CheckBox m_aAutoDetectHC; // CB_AUTO_DETECT_HC - CheckBox m_aAutomaticFontColor; // CB_AUTOMATIC_FONT_COLOR - CheckBox m_aPagePreviews; // CB_PAGEPREVIEWS + FixedLine m_aMiscellaneousLabel; // FL_MISCELLANEOUS + CheckBox m_aAccessibilityTool; // CB_ACCESSIBILITY_TOOL + CheckBox m_aTextSelectionInReadonly; // CB_TEXTSELECTION + CheckBox m_aAnimatedGraphics; // CB_ANIMATED_GRAPHICS + CheckBox m_aAnimatedTexts; // CB_ANIMATED_TEXTS + CheckBox m_aTipHelpCB; // CB_TIPHELP + NumericField m_aTipHelpNF; // NF_TIPHELP + FixedText m_aTipHelpFT; // FT_TIPHELP + FixedLine m_aHCOptionsLabel; // FL_HC_OPTIONS + CheckBox m_aAutoDetectHC; // CB_AUTO_DETECT_HC + CheckBox m_aAutomaticFontColor; // CB_AUTOMATIC_FONT_COLOR + CheckBox m_aPagePreviews; // CB_PAGEPREVIEWS DECL_LINK(TipHelpHdl, CheckBox*); void EnableTipHelp(sal_Bool bCheck); @@ -57,9 +57,9 @@ public: virtual ~SvxAccessibilityOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index 4d7e1985d838..36a4cad6372c 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 154ccb9d59d0..713751937dc2 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; struct SvxForbiddenChars_Impl { - sal_Bool bRemoved; - ForbiddenCharacters* pCharacters; + sal_Bool bRemoved; + ForbiddenCharacters* pCharacters; }; DECLARE_TABLE( _SvxForbiddenCharacterTable_Impl, SvxForbiddenChars_Impl* ) @@ -79,18 +79,18 @@ public: struct SvxAsianLayoutPage_Impl { - SvxAsianConfig aConfig; + SvxAsianConfig aConfig; SvxAsianLayoutPage_Impl() : aConfig(sal_False){} - Reference< XForbiddenCharacters > xForbidden; + Reference< XForbiddenCharacters > xForbidden; Reference< XPropertySet > xPrSet; Reference< XPropertySetInfo > xPrSetInfo; SvxForbiddenCharacterTable_Impl aChangedLanguagesTbl; - sal_Bool hasForbiddenCharacters(LanguageType eLang); + sal_Bool hasForbiddenCharacters(LanguageType eLang); SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); - void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); + void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; /* -----------------------------24.01.01 14:50-------------------------------- @@ -106,7 +106,7 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() /* -----------------------------24.01.01 14:50-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) +sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return 0 != aChangedLanguagesTbl.Get(eLang); } @@ -150,22 +150,22 @@ static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet), - aKerningGB( this, CUI_RES(GB_KERNING )), - aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )), - aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )), - aCharDistGB( this, CUI_RES(GB_CHAR_DIST )), - aNoCompressionRB( this, CUI_RES(RB_NO_COMP )), - aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )), - aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )), - aStartEndGB( this, CUI_RES(GB_START_END )), - aLanguageFT( this, CUI_RES(FT_LANGUAGE )), - aLanguageLB( this, CUI_RES(LB_LANGUAGE )), - aStandardCB( this, CUI_RES(CB_STANDARD )), - aStartFT( this, CUI_RES(FT_START )), - aStartED( this, CUI_RES(ED_START )), - aEndFT( this, CUI_RES(FT_END )), - aEndED( this, CUI_RES(ED_END )), - aHintFT( this, CUI_RES(FT_HINT )), + aKerningGB( this, CUI_RES(GB_KERNING )), + aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )), + aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )), + aCharDistGB( this, CUI_RES(GB_CHAR_DIST )), + aNoCompressionRB( this, CUI_RES(RB_NO_COMP )), + aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )), + aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )), + aStartEndGB( this, CUI_RES(GB_START_END )), + aLanguageFT( this, CUI_RES(FT_LANGUAGE )), + aLanguageLB( this, CUI_RES(LB_LANGUAGE )), + aStandardCB( this, CUI_RES(CB_STANDARD )), + aStartFT( this, CUI_RES(FT_START )), + aStartED( this, CUI_RES(ED_START )), + aEndFT( this, CUI_RES(FT_END )), + aEndED( this, CUI_RES(ED_END )), + aHintFT( this, CUI_RES(FT_HINT )), pImpl(new SvxAsianLayoutPage_Impl) { FreeResource(); @@ -188,7 +188,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage() /*-- 09.01.01 13:29:02--------------------------------------------------- -----------------------------------------------------------------------*/ -SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAsianLayoutPage(pParent, rAttrSet); } @@ -258,7 +258,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0; - Reference< XModel > xModel; + Reference< XModel > xModel; if(pDocSh) xModel = pDocSh->GetModel(); Reference<XMultiServiceFactory> xFact(xModel, UNO_QUERY); @@ -303,7 +303,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) aEndFT.Enable(FALSE); aEndED.Enable(FALSE); aHintFT.Enable(FALSE); - } + } if(bKernWesternText) aCharKerningRB.Check(TRUE); else @@ -442,12 +442,12 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) ForbiddenCharacters aSet; aSet.beginLine = sStart; aSet.endLine = sEnd; -// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); +// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); pImpl->addForbiddenCharacters(eSelectLanguage, &aSet); } else pImpl->addForbiddenCharacters(eSelectLanguage, 0); -// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); +// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); } catch(Exception&) { diff --git a/cui/source/options/optasian.hrc b/cui/source/options/optasian.hrc index 4dfa4d2f82b5..089b8a616116 100644 --- a/cui/source/options/optasian.hrc +++ b/cui/source/options/optasian.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,23 +27,23 @@ #ifndef _SVX_OPTASIAN_HRC #define _SVX_OPTASIAN_HRC -#define GB_KERNING 1 -#define RB_CHAR_KERNING 2 -#define RB_CHAR_PUNCT 3 -#define GB_CHAR_DIST 4 -#define RB_NO_COMP 5 -#define RB_PUNCT_COMP 6 +#define GB_KERNING 1 +#define RB_CHAR_KERNING 2 +#define RB_CHAR_PUNCT 3 +#define GB_CHAR_DIST 4 +#define RB_NO_COMP 5 +#define RB_PUNCT_COMP 6 #define RB_PUNCT_KANA_COMP 7 -#define GB_START_END 8 -#define CB_STANDARD 9 +#define GB_START_END 8 +#define CB_STANDARD 9 -#define FT_LANGUAGE 11 -#define LB_LANGUAGE 12 -#define FT_START 13 -#define ED_START 14 -#define FT_END 15 -#define ED_END 16 -#define FT_HINT 17 +#define FT_LANGUAGE 11 +#define LB_LANGUAGE 12 +#define FT_START 13 +#define ED_START 14 +#define FT_END 15 +#define ED_END 16 +#define FT_HINT 17 #endif diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index c9a2c9606c98..ee735f9069a4 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 509313d4c719..cc7dc50db9b7 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,11 +58,11 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ), - aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ), - aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ), - aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ), - aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ), - aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ) + aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ), + aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ), + aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ), + aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ), + aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ) { FreeResource(); @@ -160,7 +160,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) long nCount = pColorTab->Count(); XColorEntry* pColorEntry; - for( long i = nCount - 1; i >= 0; i-- ) // default chart colors are at the end of the table + for( long i = nCount - 1; i >= 0; i-- ) // default chart colors are at the end of the table { pColorEntry = pColorTab->GetColor( i ); if( pColorEntry && pColorEntry->GetColor() == rCol ) @@ -203,13 +203,13 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, pColorList ) long nIndex = GetColorIndex( aCol ); - if( nIndex == -1 ) // not found + if( nIndex == -1 ) // not found { aValSetColorBox.SetNoSelection(); } else { - aValSetColorBox.SelectItem( (USHORT)nIndex + 1 ); // ValueSet is 1-based + aValSetColorBox.SelectItem( (USHORT)nIndex + 1 ); // ValueSet is 1-based } return 0L; @@ -229,7 +229,7 @@ IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG ) aLbChartColors.Modify( & aEntry, nIdx ); pColorConfig->ReplaceColorByIndex( nIdx, aEntry ); - aLbChartColors.SelectEntryPos( nIdx ); // reselect entry + aLbChartColors.SelectEntryPos( nIdx ); // reselect entry } return 0L; diff --git a/cui/source/options/optchart.hrc b/cui/source/options/optchart.hrc index d2e1a312e15d..0fee26854759 100644 --- a/cui/source/options/optchart.hrc +++ b/cui/source/options/optchart.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,11 +27,11 @@ // tab page for setting the default colors used for new charts -#define FL_CHART_COLOR_LIST 1 -#define LB_CHART_COLOR_LIST 2 +#define FL_CHART_COLOR_LIST 1 +#define LB_CHART_COLOR_LIST 2 -#define FL_COLOR_BOX 3 -#define CT_COLOR_BOX 4 +#define FL_COLOR_BOX 3 +#define CT_COLOR_BOX 4 -#define PB_RESET_TO_DEFAULT 5 +#define PB_RESET_TO_DEFAULT 5 diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index efbb14086588..f5001aa85c6b 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,15 +56,15 @@ public: class SvxDefaultColorOptPage : public SfxTabPage { private: - FixedLine aGbChartColors; - ChartColorLB aLbChartColors; - FixedLine aGbColorBox; - ValueSet aValSetColorBox; - PushButton aPBDefault; + FixedLine aGbChartColors; + ChartColorLB aLbChartColors; + FixedLine aGbColorBox; + ValueSet aValSetColorBox; + PushButton aPBDefault; - SvxChartOptions* pChartOptions; - SvxChartColorTableItem* pColorConfig; - XColorTable* pColorTab; + SvxChartOptions* pChartOptions; + SvxChartColorTableItem* pColorConfig; + XColorTable* pColorTab; DECL_LINK( ResetToDefaults, void * ); DECL_LINK( ListClickedHdl, ChartColorLB * ); @@ -77,7 +77,7 @@ public: SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxDefaultColorOptPage(); - void Construct(); + void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 374828b329c1..32a7aaa7b11c 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,38 +33,38 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS { - HelpID = HID_OPTIONS_CHART_DEFCOLORS; - Size = MAP_APPFONT ( 260 , 185 ) ; - Hide = TRUE; + HelpID = HID_OPTIONS_CHART_DEFCOLORS; + Size = MAP_APPFONT ( 260 , 185 ) ; + Hide = TRUE; Text [ en-US ] = "Default Colors"; FixedLine FL_CHART_COLOR_LIST { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 80 , 8 ) ; Text [ en-US ] = "Chart colors"; Text [ x-comment ] = " "; }; ListBox LB_CHART_COLOR_LIST { - Border = TRUE; - Pos = MAP_APPFONT ( 12 , 15 ); - Size = MAP_APPFONT ( 68 , 152 ); - DropDown = FALSE; - TabStop = TRUE ; + Border = TRUE; + Pos = MAP_APPFONT ( 12 , 15 ); + Size = MAP_APPFONT ( 68 , 152 ); + DropDown = FALSE; + TabStop = TRUE ; }; FixedLine FL_COLOR_BOX { - Pos = MAP_APPFONT ( 92 , 3 ) ; + Pos = MAP_APPFONT ( 92 , 3 ) ; Size = MAP_APPFONT ( 106 , 8 ) ; Text [ en-US ] = "Color table" ; Text [ x-comment ] = " "; }; Control CT_COLOR_BOX { - Border = TRUE; - Pos = MAP_APPFONT ( 98 , 15 ); - Size = MAP_APPFONT ( 94 , 152 ); - TabStop = TRUE ; + Border = TRUE; + Pos = MAP_APPFONT ( 98 , 15 ); + Size = MAP_APPFONT ( 94 , 152 ); + TabStop = TRUE ; }; PushButton PB_RESET_TO_DEFAULT { diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f13f6f659cc1..3ea5678ec8b0 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ using namespace ::svtools; #define GROUP_CALC 3 #define GROUP_DRAW 4 #define GROUP_BASIC 5 -#define GROUP_SQL 6 +#define GROUP_SQL 6 class SvxExtFixedText_Impl : public FixedText { @@ -228,13 +228,13 @@ class ColorConfigWindow_Impl : public Window ColorListBox aSQLCommentLB; Window aSQLCommentWN; - ::std::vector< SvxExtFixedText_Impl*> aChapters; - ::std::vector< Window* > aChapterWins; - ::std::vector< FixedText* > aFixedTexts; - ::std::vector< CheckBox* > aCheckBoxes; - ::std::vector< ColorListBox* > aColorBoxes; - ::std::vector< Window* > aWindows; // [ColorConfigEntryCount] - ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> > m_aExtensionTitles; + ::std::vector< SvxExtFixedText_Impl*> aChapters; + ::std::vector< Window* > aChapterWins; + ::std::vector< FixedText* > aFixedTexts; + ::std::vector< CheckBox* > aCheckBoxes; + ::std::vector< ColorListBox* > aColorBoxes; + ::std::vector< Window* > aWindows; // [ColorConfigEntryCount] + ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> > m_aExtensionTitles; SvtModuleOptions m_aModuleOptions; @@ -581,14 +581,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aFixedTexts[BASICSTRING ] = &aBasicStringFT; aFixedTexts[BASICOPERATOR ] = &aBasicOperatorFT; aFixedTexts[BASICKEYWORD ] = &aBasicKeywordFT; - aFixedTexts[BASICERROR ] = &aBasicErrorFT; - aFixedTexts[SQLIDENTIFIER ] = &aSQLIdentifierFT; - aFixedTexts[SQLNUMBER ] = &aSQLNumberFT; - aFixedTexts[SQLSTRING ] = &aSQLStringFT; - aFixedTexts[SQLOPERATOR ] = &aSQLOperatorFT; - aFixedTexts[SQLKEYWORD ] = &aSQLKeywordFT; - aFixedTexts[SQLPARAMETER ] = &aSQLParameterFT; - aFixedTexts[SQLCOMMENT ] = &aSQLCommentFT; + aFixedTexts[BASICERROR ] = &aBasicErrorFT; + aFixedTexts[SQLIDENTIFIER ] = &aSQLIdentifierFT; + aFixedTexts[SQLNUMBER ] = &aSQLNumberFT; + aFixedTexts[SQLSTRING ] = &aSQLStringFT; + aFixedTexts[SQLOPERATOR ] = &aSQLOperatorFT; + aFixedTexts[SQLKEYWORD ] = &aSQLKeywordFT; + aFixedTexts[SQLPARAMETER ] = &aSQLParameterFT; + aFixedTexts[SQLCOMMENT ] = &aSQLCommentFT; aColorBoxes[DOCCOLOR ] = &aDocColorLB ; aColorBoxes[DOCBOUNDARIES ] = &aDocBoundLB ; @@ -620,20 +620,20 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aColorBoxes[CALCREFERENCE ] = &aCalcReferenceLB ; aColorBoxes[CALCNOTESBACKGROUND ] = &aCalcNotesBackLB ; aColorBoxes[DRAWGRID ] = &aDrawGridLB ; - aColorBoxes[BASICIDENTIFIER ] = &aBasicIdentifierLB; - aColorBoxes[BASICCOMMENT ] = &aBasicCommentLB; - aColorBoxes[BASICNUMBER ] = &aBasicNumberLB; - aColorBoxes[BASICSTRING ] = &aBasicStringLB; - aColorBoxes[BASICOPERATOR ] = &aBasicOperatorLB; - aColorBoxes[BASICKEYWORD ] = &aBasicKeywordLB; - aColorBoxes[BASICERROR ] = &aBasicErrorLB; - aColorBoxes[SQLIDENTIFIER ] = &aSQLIdentifierLB; - aColorBoxes[SQLNUMBER ] = &aSQLNumberLB; - aColorBoxes[SQLSTRING ] = &aSQLStringLB; - aColorBoxes[SQLOPERATOR ] = &aSQLOperatorLB; - aColorBoxes[SQLKEYWORD ] = &aSQLKeywordLB; - aColorBoxes[SQLPARAMETER ] = &aSQLParameterLB; - aColorBoxes[SQLCOMMENT ] = &aSQLCommentLB; + aColorBoxes[BASICIDENTIFIER ] = &aBasicIdentifierLB; + aColorBoxes[BASICCOMMENT ] = &aBasicCommentLB; + aColorBoxes[BASICNUMBER ] = &aBasicNumberLB; + aColorBoxes[BASICSTRING ] = &aBasicStringLB; + aColorBoxes[BASICOPERATOR ] = &aBasicOperatorLB; + aColorBoxes[BASICKEYWORD ] = &aBasicKeywordLB; + aColorBoxes[BASICERROR ] = &aBasicErrorLB; + aColorBoxes[SQLIDENTIFIER ] = &aSQLIdentifierLB; + aColorBoxes[SQLNUMBER ] = &aSQLNumberLB; + aColorBoxes[SQLSTRING ] = &aSQLStringLB; + aColorBoxes[SQLOPERATOR ] = &aSQLOperatorLB; + aColorBoxes[SQLKEYWORD ] = &aSQLKeywordLB; + aColorBoxes[SQLPARAMETER ] = &aSQLParameterLB; + aColorBoxes[SQLCOMMENT ] = &aSQLCommentLB; aWindows[DOCCOLOR ] = &aDocColorWN ; aWindows[DOCBOUNDARIES ] = &aDocBoundWN ; @@ -672,13 +672,13 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aWindows[BASICOPERATOR ] = &aBasicOperatorWN; aWindows[BASICKEYWORD ] = &aBasicKeywordWN; aWindows[BASICERROR ] = &aBasicErrorWN; - aWindows[SQLIDENTIFIER ] = &aSQLIdentifierWN; - aWindows[SQLNUMBER ] = &aSQLNumberWN; - aWindows[SQLSTRING ] = &aSQLStringWN; - aWindows[SQLOPERATOR ] = &aSQLOperatorWN; - aWindows[SQLKEYWORD ] = &aSQLKeywordWN; - aWindows[SQLPARAMETER ] = &aSQLParameterWN; - aWindows[SQLCOMMENT ] = &aSQLCommentWN; + aWindows[SQLIDENTIFIER ] = &aSQLIdentifierWN; + aWindows[SQLNUMBER ] = &aSQLNumberWN; + aWindows[SQLSTRING ] = &aSQLStringWN; + aWindows[SQLOPERATOR ] = &aSQLOperatorWN; + aWindows[SQLKEYWORD ] = &aSQLKeywordWN; + aWindows[SQLPARAMETER ] = &aSQLParameterWN; + aWindows[SQLCOMMENT ] = &aSQLCommentWN; aChapters.push_back(&aGeneralFT); aChapterWins.push_back(&aGeneralBackWN); aChapters.push_back(&aWriterFT); aChapterWins.push_back(&aWriterBackWN); @@ -961,8 +961,8 @@ class ColorConfigCtrl_Impl : public Control String sPreview; ColorConfigWindow_Impl aScrollWindow; - EditableColorConfig* pColorConfig; - EditableExtendedColorConfig* pExtColorConfig; + EditableColorConfig* pColorConfig; + EditableExtendedColorConfig* pExtColorConfig; long nScrollPos; @@ -1329,7 +1329,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) } else { - Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! + Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! aColorEntry.nColor = aColor.GetColor(); if(aScrollWindow.aWindows[i]) aScrollWindow.aWindows[i]->SetBackground(Wallpaper(aColor)); @@ -1354,7 +1354,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) if(pBox && aScrollWindow.aColorBoxes[i] == pBox) { ExtendedColorConfigValue aColorEntry = pExtColorConfig->GetComponentColorConfigValue(sComponentName,k); - Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! + Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! aColorEntry.setColor(aColor.GetColor()); if( !pBox->GetSelectEntryPos() ) // auto color { diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc index d8bb17b54e39..37478e098c6a 100644 --- a/cui/source/options/optcolor.hrc +++ b/cui/source/options/optcolor.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ #define LB_BASICERROR 164 #define WN_BASICERROR 165 -#define FT_SQL_COMMAND 173 +#define FT_SQL_COMMAND 173 #define FT_SQLIDENTIFIER 174 #define LB_SQLIDENTIFIER 175 #define WN_SQLIDENTIFIER 176 @@ -182,26 +182,26 @@ #define FT_SQLPARAMETER 189 #define LB_SQLPARAMETER 190 #define WN_SQLPARAMETER 191 -#define FT_SQLCOMMENT 192 -#define LB_SQLCOMMENT 193 -#define WN_SQLCOMMENT 194 - -#define ST_EXTENSION 166 - - - -#define _FT_WIDTH 120 -#define _LINE_HEIGHT 15 -#define _FT_HEIGHT 10 -#define _CB_WIDTH 130 -#define _FT_XPOS 14 -#define _CB_XPOS 6 -#define _LB_XPOS 139 -#define _LB_WIDTH 50 -#define _LB_HEIGHT 50 -#define _WN_WIDTH 30 -#define _WN_HEIGHT 12 -#define _WN_XPOS 195 +#define FT_SQLCOMMENT 192 +#define LB_SQLCOMMENT 193 +#define WN_SQLCOMMENT 194 + +#define ST_EXTENSION 166 + + + +#define _FT_WIDTH 120 +#define _LINE_HEIGHT 15 +#define _FT_HEIGHT 10 +#define _CB_WIDTH 130 +#define _FT_XPOS 14 +#define _CB_XPOS 6 +#define _LB_XPOS 139 +#define _LB_WIDTH 50 +#define _LB_HEIGHT 50 +#define _WN_WIDTH 30 +#define _WN_HEIGHT 12 +#define _WN_XPOS 195 #define FT_SMARTTAGS 168 #define LB_SMARTTAGS 169 diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 1f31a3da6420..f72338b68456 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,12 +68,12 @@ public: SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxColorOptionsTabPage( ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); virtual void FillUserData(); }; diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 5b4a58bd59c4..b2e9c1513584 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,24 +111,24 @@ TabPage RID_SVXPAGE_COLORCONFIG // misc defines to shorten defining of standard elements // standard sizes -#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH , 8 ) -#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT ) -#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT ) -#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT ) -#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT ) +#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH , 8 ) +#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT ) +#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT ) +#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT ) +#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT ) // combination of position and size -#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE +#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE // ... for special types -#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE ) -#define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE ) -#define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE ) -#define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE ) -#define CB_POS_SIZE( LINENUM ) POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE ) +#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE ) +#define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE ) +#define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE ) +#define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE ) +#define CB_POS_SIZE( LINENUM ) POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE ) // combination of a listbox (color chooser) and window (color preview) -#define LB_WN( ID_POST, LINENUM ) ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;}; +#define LB_WN( ID_POST, LINENUM ) ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;}; OutputSize = TRUE ; Pos = MAP_APPFONT ( 0 , 10 ) ; @@ -430,55 +430,55 @@ TabPage RID_SVXPAGE_COLORCONFIG Text [ en-US ] = "Error"; }; LB_WN( BASICERROR, 42 ) - + FixedText FT_SQL_COMMAND { FT_SEP_POS_SIZE( 43 ); Text [ en-US ] = "SQL Syntax Highlighting"; }; - + FixedText FT_SQLIDENTIFIER { FT_POS_SIZE( 44 ); Text [ en-US ] = "Identifier"; }; LB_WN( SQLIDENTIFIER, 44 ) - + FixedText FT_SQLNUMBER { FT_POS_SIZE( 45 ); Text [ en-US ] = "Number"; }; LB_WN( SQLNUMBER, 45 ) - + FixedText FT_SQLSTRING { FT_POS_SIZE( 46 ); Text [ en-US ] = "String"; }; LB_WN( SQLSTRING, 46 ) - + FixedText FT_SQLOPERATOR { FT_POS_SIZE( 47 ); Text [ en-US ] = "Operator"; }; LB_WN( SQLOPERATOR, 47 ) - + FixedText FT_SQLKEYWORD { FT_POS_SIZE( 48 ); Text [ en-US ] = "Keyword"; }; LB_WN( SQLKEYWORD, 48 ) - + FixedText FT_SQLPARAMETER { FT_POS_SIZE( 49 ); Text [ en-US ] = "Parameter"; }; LB_WN( SQLPARAMETER, 49 ) - + FixedText FT_SQLCOMMENT { FT_POS_SIZE( 50 ); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 0096b032cfa7..a4bebf70b9f7 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG ) m_aTypeReplaceCB.Enable( bIsSequenceChecking ); // #i48117#: by default restricted and type&replace have to be switched on if(bIsSequenceChecking) - { + { m_aTypeReplaceCB.Check( sal_True ); m_aRestrictedCB.Check( sal_True ); } @@ -54,17 +54,17 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ), - m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ), - m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ), - m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ), + m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ), + m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ), + m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ), m_aTypeReplaceCB ( this, CUI_RES( CB_TYPE_REPLACE ) ), - m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ), - m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ), - m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ), - m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ), - m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ), - m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ), - m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) ) + m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ), + m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ), + m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ), + m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ), + m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ), + m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ), + m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) ) { FreeResource(); @@ -78,7 +78,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage() { } // ----------------------------------------------------------------------------- -SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxCTLOptionsPage( pParent, rAttrSet ); } diff --git a/cui/source/options/optctl.hrc b/cui/source/options/optctl.hrc index 1bdea7bb44c8..d3dcd14d8ade 100644 --- a/cui/source/options/optctl.hrc +++ b/cui/source/options/optctl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,30 +29,30 @@ #include <svtools/controldims.hrc> -#define FL_SEQUENCECHECKING 10 -#define CB_SEQUENCECHECKING 11 -#define CB_RESTRICTED 12 +#define FL_SEQUENCECHECKING 10 +#define CB_SEQUENCECHECKING 11 +#define CB_RESTRICTED 12 #define CB_TYPE_REPLACE 13 -#define FL_CURSORCONTROL 20 -#define FT_MOVEMENT 21 -#define RB_MOVEMENT_LOGICAL 22 -#define RB_MOVEMENT_VISUAL 23 +#define FL_CURSORCONTROL 20 +#define FT_MOVEMENT 21 +#define RB_MOVEMENT_LOGICAL 22 +#define RB_MOVEMENT_VISUAL 23 -#define FL_GENERAL 30 -#define FT_NUMERALS 31 -#define LB_NUMERALS 32 +#define FL_GENERAL 30 +#define FT_NUMERALS 31 +#define LB_NUMERALS 32 -#define EXTRA_SPACE_Y 16 -#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP) -#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define EXTRA_SPACE_Y 16 +#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP) +#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) +#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) +#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #endif // #ifndef _SVX_OPTCTL_HRC diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index a3b455478750..218193bdd973 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ class SvxCTLOptionsPage : public SfxTabPage { private: - FixedLine m_aSequenceCheckingFL; - CheckBox m_aSequenceCheckingCB; - CheckBox m_aRestrictedCB; + FixedLine m_aSequenceCheckingFL; + CheckBox m_aSequenceCheckingCB; + CheckBox m_aRestrictedCB; CheckBox m_aTypeReplaceCB; - FixedLine m_aCursorControlFL; - FixedText m_aMovementFT; - RadioButton m_aMovementLogicalRB; - RadioButton m_aMovementVisualRB; + FixedLine m_aCursorControlFL; + FixedText m_aMovementFT; + RadioButton m_aMovementLogicalRB; + RadioButton m_aMovementVisualRB; - FixedLine m_aGeneralFL; - FixedText m_aNumeralsFT; - ListBox m_aNumeralsLB; + FixedLine m_aGeneralFL; + FixedText m_aNumeralsFT; + ListBox m_aNumeralsLB; DECL_LINK( SequenceCheckingCB_Hdl, void* ); @@ -60,9 +60,9 @@ public: virtual ~SvxCTLOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_OPTCTL_HXX diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index defc62c95011..2da8925a5959 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b3e6e7ccba64..42d0d05e7fc4 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 ) if (rText1 == rText2) eRes = CDE_EQUAL; else - { // similar = equal up to trailing '.' and hyphenation positions + { // similar = equal up to trailing '.' and hyphenation positions // marked with '=' if (getNormDicEntry_Impl( rText1 ) == getNormDicEntry_Impl( rText2 )) eRes = CDE_SIMILAR; @@ -102,15 +102,15 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ), - aNameText ( this, CUI_RES( FT_DICTNAME ) ), - aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), - aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), - aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), - aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), - aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), - aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), - aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ), + aNameText ( this, CUI_RES( FT_DICTNAME ) ), + aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), + aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), + aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), + aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), + aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), + aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), + aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ), xSpell( xSpl ) { // Handler installieren @@ -227,23 +227,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ), - aBookFT ( this, CUI_RES( FT_BOOK ) ), - aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ), - aLangFT ( this, CUI_RES( FT_DICTLANG ) ), - aLangLB ( this, CUI_RES( LB_DICTLANG ) ), - aWordFT ( this, CUI_RES( FT_WORD ) ), - aWordED ( this, CUI_RES( ED_WORD ) ), - aReplaceFT ( this, CUI_RES( FT_REPLACE ) ), - aReplaceED ( this, CUI_RES( ED_REPLACE ) ), - aWordsLB ( this, CUI_RES( TLB_REPLACE ) ), - aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ), - aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ), - aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ), - aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ), - aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ), - sModify (CUI_RES(STR_MODIFY)), - sNew (aNewReplacePB.GetText()), - aDecoView ( this), + aBookFT ( this, CUI_RES( FT_BOOK ) ), + aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ), + aLangFT ( this, CUI_RES( FT_DICTLANG ) ), + aLangLB ( this, CUI_RES( LB_DICTLANG ) ), + aWordFT ( this, CUI_RES( FT_WORD ) ), + aWordED ( this, CUI_RES( ED_WORD ) ), + aReplaceFT ( this, CUI_RES( FT_REPLACE ) ), + aReplaceED ( this, CUI_RES( ED_REPLACE ) ), + aWordsLB ( this, CUI_RES( TLB_REPLACE ) ), + aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ), + aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ), + aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ), + aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ), + aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ), + sModify (CUI_RES(STR_MODIFY)), + sNew (aNewReplacePB.GetText()), + aDecoView ( this), xSpell ( xSpl ), nOld ( NOACTDICT ), bFirstSelect (sal_True), @@ -324,7 +324,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( SetDicReadonly_Impl(xDic); sal_Bool bEnable = !IsDicReadonly_Impl(); aNewReplacePB .Enable( sal_False ); - aDeletePB .Enable( sal_False ); + aDeletePB .Enable( sal_False ); aLangFT.Enable( bEnable ); aLangLB.Enable( bEnable ); ShowWords_Impl( nPos ); @@ -333,7 +333,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( else { aNewReplacePB.Disable(); - aDeletePB .Disable(); + aDeletePB .Disable(); } FreeResource(); } @@ -366,8 +366,8 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( if (xDic.is()) { Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); - if ( !xStor.is() // non persistent dictionary - || !xStor->hasLocation() // not yet persistent + if ( !xStor.is() // non persistent dictionary + || !xStor->hasLocation() // not yet persistent || !xStor->isReadonly() ) { bDicIsReadonly = sal_False; @@ -400,7 +400,7 @@ USHORT SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) if( COMPARE_LESS == eCmpRes ) break; } - if (j < aWordsLB.GetEntryCount()) // entry found? + if (j < aWordsLB.GetEntryCount()) // entry found? nPos = j; return nPos; @@ -415,7 +415,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry) String sTmpShort(aWordsLB.GetEntryText(pEntry, 0)); Reference< XDictionary > xDic = aDics.getConstArray()[ nLBPos ]; - if (xDic->remove( sTmpShort )) // sal_True on success + if (xDic->remove( sTmpShort )) // sal_True on success { aWordsLB.GetModel()->Remove(pEntry); } @@ -431,7 +431,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG ) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { aNewReplacePB.Enable( sal_False ); - aDeletePB .Enable( sal_False ); + aDeletePB .Enable( sal_False ); // Dictionary anzeigen ShowWords_Impl( nPos ); // enable or disable new and delete button according to file attributes @@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if (aWordsLB.GetEntryCount()) { - aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); + aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) ); } @@ -576,7 +576,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) // entries in the list box should exactly correspond to those from the // dictionary. Thus: aNewReplacePB.Enable(sal_False); - aDeletePB .Enable( sal_True && !IsDicReadonly_Impl() ); + aDeletePB .Enable( sal_True && !IsDicReadonly_Impl() ); } return 0; }; @@ -596,7 +596,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) aReplaceED.SetText(aStr); aDeletePB.Disable(); - RemoveDictEntry(pEntry); // remove entry from dic and list-box + RemoveDictEntry(pEntry); // remove entry from dic and list-box } if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled()) { @@ -690,9 +690,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) xub_StrLen nWordLen=rEntry.Len(); const String& rRepString = aReplaceED.GetText(); - BOOL bEnableNewReplace = FALSE; - BOOL bEnableDelete = FALSE; - String aNewReplaceText = sNew; + BOOL bEnableNewReplace = FALSE; + BOOL bEnableDelete = FALSE; + String aNewReplaceText = sNew; if(pEdt == &aWordED) { @@ -761,9 +761,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { String aReplaceText; String aWordText; - if (pFirstSel) // a aWordsLB entry is selected + if (pFirstSel) // a aWordsLB entry is selected { - aWordText = aWordsLB.GetEntryText( pFirstSel, 0 ); + aWordText = aWordsLB.GetEntryText( pFirstSel, 0 ); aReplaceText = aWordsLB.GetEntryText( pFirstSel, 1 ); aNewReplaceText = sModify; @@ -778,7 +778,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) aNewReplacePB.SetText( aNewReplaceText ); aNewReplacePB.Enable( bEnableNewReplace && !IsDicReadonly_Impl() ); - aDeletePB .Enable( bEnableDelete && !IsDicReadonly_Impl() ); + aDeletePB .Enable( bEnableDelete && !IsDicReadonly_Impl() ); return 0; } diff --git a/cui/source/options/optdict.hrc b/cui/source/options/optdict.hrc index e7233f2b67ef..e2f7bb1d5b01 100644 --- a/cui/source/options/optdict.hrc +++ b/cui/source/options/optdict.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ // defines ------------------------------------------------------------------ -#define FT_DICTNAME 10 -#define ED_DICTNAME 11 -#define FT_DICTLANG 12 -#define LB_DICTLANG 13 -#define BTN_EXCEPT 14 -#define GB_NEWDICT 15 +#define FT_DICTNAME 10 +#define ED_DICTNAME 11 +#define FT_DICTLANG 12 +#define LB_DICTLANG 13 +#define BTN_EXCEPT 14 +#define GB_NEWDICT 15 -#define BTN_NEWDICT_OK 20 +#define BTN_NEWDICT_OK 20 #define BTN_NEWDICT_ESC 21 #define BTN_NEWDICT_HLP 22 -#define FT_BOOK 30 -#define FT_CONTENT 31 -#define LB_ALLDICTS 32 -#define GB_EDITDICTS 34 -#define FT_WORD 35 -#define ED_WORD 36 -#define FT_REPLACE 37 -#define ED_REPLACE 38 -#define PB_NEW_REPLACE 39 -#define PB_DELETE_REPLACE 40 -#define TLB_REPLACE 41 -#define STR_MODIFY 42 +#define FT_BOOK 30 +#define FT_CONTENT 31 +#define LB_ALLDICTS 32 +#define GB_EDITDICTS 34 +#define FT_WORD 35 +#define ED_WORD 36 +#define FT_REPLACE 37 +#define ED_REPLACE 38 +#define PB_NEW_REPLACE 39 +#define PB_DELETE_REPLACE 40 +#define TLB_REPLACE 41 +#define STR_MODIFY 42 -#define BTN_EDITCLOSE 50 -#define BTN_EDITNEW 51 -#define BTN_EDITCHANGE 52 -#define BTN_EDITREMOVE 53 -#define BTN_EDITHELP 54 +#define BTN_EDITCLOSE 50 +#define BTN_EDITNEW 51 +#define BTN_EDITCHANGE 52 +#define BTN_EDITREMOVE 53 +#define BTN_EDITHELP 54 diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index b5d31ce90fe9..11d33db1732a 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 7a03329d209f..e4bfc2423189 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,17 +46,17 @@ enum MSFltrPg2_CheckBoxEntries { InvalidCBEntry }; -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 // ----------------------------------------------------------------------- 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 ) ), + 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 ) ), + aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ), @@ -87,7 +87,7 @@ IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG return 0; } -SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMSFilterTabPage( pParent, rAttrSet ); @@ -157,15 +157,15 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& ) OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), - aCheckLB ( this, CUI_RES( CLB_SETTINGS )), - aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )), + aCheckLB ( this, CUI_RES( CLB_SETTINGS )), + aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )), aHeader2FT ( this, CUI_RES( FT_HEADER2_EXPLANATION )), sHeader1 ( CUI_RES( ST_HEADER1 )), sHeader2 ( CUI_RES( ST_HEADER2 )), - sChgToFromMath ( CUI_RES( ST_CHG_MATH )), - sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )), - sChgToFromCalc ( CUI_RES( ST_CHG_CALC )), - sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )), + sChgToFromMath ( CUI_RES( ST_CHG_MATH )), + sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )), + sChgToFromCalc ( CUI_RES( ST_CHG_CALC )), + sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )), pCheckButtonData(0) { FreeResource(); @@ -187,7 +187,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2() delete pCheckButtonData; } -SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMSFilterTabPage2( pParent, rAttrSet ); @@ -203,21 +203,21 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) BOOL (SvtFilterOptions:: *FnIs)() const; void (SvtFilterOptions:: *FnSet)( BOOL bFlag ); } aChkArr[] = { - { Math, &SvtFilterOptions::IsMathType2Math, - &SvtFilterOptions::SetMathType2Math }, - { Math, &SvtFilterOptions::IsMath2MathType, + { Math, &SvtFilterOptions::IsMathType2Math, + &SvtFilterOptions::SetMathType2Math }, + { Math, &SvtFilterOptions::IsMath2MathType, &SvtFilterOptions::SetMath2MathType }, - { Writer, &SvtFilterOptions::IsWinWord2Writer, + { Writer, &SvtFilterOptions::IsWinWord2Writer, &SvtFilterOptions::SetWinWord2Writer }, - { Writer, &SvtFilterOptions::IsWriter2WinWord, + { Writer, &SvtFilterOptions::IsWriter2WinWord, &SvtFilterOptions::SetWriter2WinWord }, - { Calc, &SvtFilterOptions::IsExcel2Calc, + { Calc, &SvtFilterOptions::IsExcel2Calc, &SvtFilterOptions::SetExcel2Calc }, - { Calc, &SvtFilterOptions::IsCalc2Excel, + { Calc, &SvtFilterOptions::IsCalc2Excel, &SvtFilterOptions::SetCalc2Excel }, - { Impress, &SvtFilterOptions::IsPowerPoint2Impress, + { Impress, &SvtFilterOptions::IsPowerPoint2Impress, &SvtFilterOptions::SetPowerPoint2Impress }, - { Impress, &SvtFilterOptions::IsImpress2PowerPoint, + { Impress, &SvtFilterOptions::IsImpress2PowerPoint, &SvtFilterOptions::SetImpress2PowerPoint }, { InvalidCBEntry, 0, 0 } }; diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc index a9411b576674..40204b717a42 100644 --- a/cui/source/options/optfltr.hrc +++ b/cui/source/options/optfltr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ // defines ------------------------------------------------------------------ -#define GB_WORD 1 +#define GB_WORD 1 #define GB_EXCEL 2 #define GB_PPOINT 3 @@ -40,16 +40,16 @@ #define CB_EBAS_STG 5 #define CB_PBAS_CODE 6 #define CB_PBAS_STG 7 -#define CB_WBAS_WBCTBL 8 +#define CB_WBAS_WBCTBL 8 #define CLB_SETTINGS 1 #define ST_CHG_MATH 1 #define ST_CHG_WRITER 2 #define ST_CHG_CALC 3 -#define ST_CHG_IMPRESS 4 -#define ST_HEADER1 5 +#define ST_CHG_IMPRESS 4 +#define ST_HEADER1 5 #define ST_HEADER2 6 -#define FT_HEADER1_EXPLANATION 1 +#define FT_HEADER1_EXPLANATION 1 #define FT_HEADER2_EXPLANATION 2 #endif diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 466ab25a2c54..695863f06fc9 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,16 @@ class OfaMSFilterTabPage : public SfxTabPage { FixedLine aMSWordGB; - CheckBox aWBasicCodeCB; - CheckBox aWBasicWbctblCB; - CheckBox aWBasicStgCB; + CheckBox aWBasicCodeCB; + CheckBox aWBasicWbctblCB; + CheckBox aWBasicStgCB; FixedLine aMSExcelGB; - CheckBox aEBasicCodeCB; - CheckBox aEBasicExectblCB; - CheckBox aEBasicStgCB; + CheckBox aEBasicCodeCB; + CheckBox aEBasicExectblCB; + CheckBox aEBasicStgCB; FixedLine aMSPPointGB; - CheckBox aPBasicCodeCB; - CheckBox aPBasicStgCB; + CheckBox aPBasicCodeCB; + CheckBox aPBasicStgCB; OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); @@ -57,11 +57,11 @@ class OfaMSFilterTabPage : public SfxTabPage DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -74,10 +74,10 @@ class OfaMSFilterTabPage2 : public SfxTabPage void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); protected: - virtual void SetTabs(); - virtual void HBarClick(); + virtual void SetTabs(); + virtual void HBarClick(); virtual void KeyInput( const KeyEvent& rKEvt ); public: @@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage sChgToFromWriter, sChgToFromCalc, sChgToFromImpress; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); @@ -104,8 +104,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index b586bb454503..60b1e4d727bd 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ // RID_OFAPAGE_MSFILTEROPT ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; @@ -119,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT // RID_OFAPAGE_MSFILTEROPT2 ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT2 { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 2cf7c77ddaf7..36090d189948 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -115,7 +115,7 @@ using ::rtl::OUString; #define C2U(cChar) OUString::createFromAscii(cChar) -#define MAX_PROGRAM_ENTRIES 3 +#define MAX_PROGRAM_ENTRIES 3 // class OfaMiscTabPage -------------------------------------------------- @@ -197,26 +197,26 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ), - aHelpFL ( this, CUI_RES( FL_HELP ) ), - aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), - aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), - aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), - aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), - aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ), - aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ), - aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), + aHelpFL ( this, CUI_RES( FL_HELP ) ), + aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), + aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), + aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), + aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), + aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ), + aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ), + 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 ) ), + 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 ) ), + aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), + aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), + aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), + aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ) { FreeResource(); @@ -373,7 +373,7 @@ OfaMiscTabPage::~OfaMiscTabPage() // ----------------------------------------------------------------------- -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMiscTabPage( pParent, rAttrSet ); } @@ -740,12 +740,12 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ), aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ), aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ), - m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), + m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), #if defined( UNX ) - aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), - aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), - aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), - aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), + aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), + aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), + aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), + aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), #endif aMenuFL ( this, CUI_RES( FL_MENU ) ), aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )), @@ -755,7 +755,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ), aRenderingFL ( this, CUI_RES( FL_RENDERING ) ), aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ), - aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), + aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), aMouseFL ( this, CUI_RES( FL_MOUSE ) ), aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ), aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ), @@ -786,7 +786,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : sLabel.EraseAllChars('~'); sal_Int32 nLabelWidth = aAAPointLimitLabel.GetTextWidth( sLabel ); - nLabelWidth += 3; // small gap + nLabelWidth += 3; // small gap // pixels to move both controls to the left Size aSize = aAAPointLimitLabel.GetSizePixel(); sal_Int32 nMoveLeft = aSize.Width() - nLabelWidth; @@ -815,7 +815,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : }; // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos) - CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); + CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y(); DELETEZ( pFontAntiAliasing ); @@ -922,7 +922,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) --------------------------------------------------*/ -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaViewTabPage(pParent, rAttrSet); } @@ -1088,7 +1088,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& ) } } - SvtAccessibilityOptions aAccessibilityOptions; + SvtAccessibilityOptions aAccessibilityOptions; if( aAccessibilityOptions.GetIsSystemFont() != m_aSystemFont.IsChecked() && m_aSystemFont.IsEnabled() ) { @@ -1241,16 +1241,16 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) ---------------------------------------------------------------------------*/ class LangConfigItem_Impl : public ConfigItem { - Any aValue; - OUString aPropertyName; + Any aValue; + OUString aPropertyName; public: LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty); ~LangConfigItem_Impl(); - virtual void Commit(); + virtual void Commit(); - const Any& GetValue() const {return aValue;} - void SetValue(Any& rValue) {aValue = rValue; SetModified();} + const Any& GetValue() const {return aValue;} + void SetValue(Any& rValue) {aValue = rValue; SetModified();} }; /* -----------------------------23.11.00 15:06-------------------------------- @@ -1311,7 +1311,7 @@ static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ), - aUILanguageGB(this, CUI_RES(FL_UI_LANG )), + aUILanguageGB(this, CUI_RES(FL_UI_LANG )), aLocaleSettingFI(this, CUI_RES(FI_LOCALESETTING)), aUserInterfaceFT(this, CUI_RES(FT_USERINTERFACE)), aUserInterfaceLB(this, CUI_RES(LB_USERINTERFACE)), @@ -1322,17 +1322,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)), aCurrencyFT( this, CUI_RES(FT_CURRENCY )), aCurrencyLB( this, CUI_RES(LB_CURRENCY )), - aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )), + aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )), aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )), aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )), - aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )), + aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )), aAsianLanguageFI(this, CUI_RES(FI_ASIAN_LANG )), aAsianLanguageFT(this, CUI_RES(FT_ASIAN_LANG )), - aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )), + aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )), aComplexLanguageFI(this, CUI_RES(FI_COMPLEX_LANG )), aComplexLanguageFT(this, CUI_RES(FT_COMPLEX_LANG )), - aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )), - aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )), + aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )), + aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )), aEnhancedFL(this, CUI_RES(FL_ENHANCED )), aAsianSupportFI(this, CUI_RES(FI_ASIANSUPPORT )), aAsianSupportCB(this, CUI_RES(CB_ASIANSUPPORT )), @@ -1476,7 +1476,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() /*-- 23.11.00 13:06:40--------------------------------------------------- -----------------------------------------------------------------------*/ -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaLanguagesTabPage(pParent, rAttrSet); } @@ -1959,7 +1959,7 @@ namespace else _rCB.Check( _bOldValue ); // #i15082# do not call SaveValue() in running dialog... -// _rCB.SaveValue(); +// _rCB.SaveValue(); _rCB.Enable( !_bNewValue ); } } diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 5e54e0bfafe7..4247de3e77ac 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,51 +32,51 @@ #define ENABLE_HELP_FORMATTING 0 -#define WHOLE_WIDTH 248 -#define EDIT_WIDTH 30 -#define UNIT_WIDTH 40 - -#define COLSPACE RSC_SP_CTRL_DESC_X -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL2+100) -#define COL4 (COL3+COLSPACE) -#define COL5 (COL4+EDIT_WIDTH) -#define COL6 (COL5+COLSPACE) - -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define ROW0 3 -#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define WHOLE_WIDTH 248 +#define EDIT_WIDTH 30 +#define UNIT_WIDTH 40 + +#define COLSPACE RSC_SP_CTRL_DESC_X +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+10) +#define COL3 (COL2+100) +#define COL4 (COL3+COLSPACE) +#define COL5 (COL4+EDIT_WIDTH) +#define COL6 (COL5+COLSPACE) + +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define ROW0 3 +#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #if ENABLE_HELP_FORMATTING -#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) #else -#define ROW2 (ROW1) +#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) -//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#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) +//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #define ROW_MF_SCALING (13) #define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE) #define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_FIXEDLINE_HEIGHT) +ROWSPACE) -#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X) #define ROW_FT_MENU_ICONS (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) @@ -99,20 +99,20 @@ #define ROW_LB_MOUSEMIDDLE (ROW_FT_MOUSEMIDDLE + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) // #i97672# -#define ROW_FL_SELECTION (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X) +#define ROW_FL_SELECTION (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X) #define ROW_CB_SELECTION (ROW_FL_SELECTION + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) // tabpage general ------------------------------------------------------- -#define FL_HELP 10 -#define CB_TOOLTIP 11 -#define CB_EXTHELP 12 -#define CB_HELPAGENT 13 -#define PB_HELPAGENT_RESET 14 -#define FT_HELPFORMAT 15 -#define LB_HELPFORMAT 16 -#define FT_EXPERIMENTAL 17 -#define CB_EXPERIMENTAL 18 +#define FL_HELP 10 +#define CB_TOOLTIP 11 +#define CB_EXTHELP 12 +#define CB_HELPAGENT 13 +#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 @@ -120,70 +120,70 @@ //#define FL_DOCSTATUS 30 //#define CB_DOCSTATUS 31 -#define FL_TWOFIGURE 40 -#define FT_INTERPRET 41 -#define NF_YEARVALUE 42 -#define FT_TOYEAR 43 +#define FL_TWOFIGURE 40 +#define FT_INTERPRET 41 +#define NF_YEARVALUE 42 +#define FT_TOYEAR 43 #define FL_PRINTDLG 44 #define CB_PRINTDLG 45 // tabpage view ---------------------------------------------------------- // #i95644# 10 .. 14 freed, may be reused -#define FL_USERINTERFACE 20 -#define FT_WINDOWSIZE 21 -#define MF_WINDOWSIZE 22 +#define FL_USERINTERFACE 20 +#define FT_WINDOWSIZE 21 +#define MF_WINDOWSIZE 22 -#define FL_MOUSE 30 -#define LB_MOUSEPOS 31 -#define FT_MOUSEPOS 32 -#define FT_MOUSEMIDDLE 33 -#define LB_MOUSEMIDDLE 34 +#define FL_MOUSE 30 +#define LB_MOUSEPOS 31 +#define FT_MOUSEPOS 32 +#define FT_MOUSEMIDDLE 33 +#define LB_MOUSEMIDDLE 34 -#define FT_MENU_ICONS 40 -#define LB_MENU_ICONS 41 -#define FL_MENU 42 -#define FL_FONTLISTS 43 +#define FT_MENU_ICONS 40 +#define LB_MENU_ICONS 41 +#define FL_MENU 42 +#define FL_FONTLISTS 43 -#define LB_ICONSIZE 54 -#define FT_ICONSIZESTYLE 55 -#define LB_ICONSTYLE 56 -#define CB_SYSTEM_FONT 57 -#define STR_ICONSIZE 58 +#define LB_ICONSIZE 54 +#define FT_ICONSIZESTYLE 55 +#define LB_ICONSTYLE 56 +#define CB_SYSTEM_FONT 57 +#define STR_ICONSIZE 58 -#define CB_FONT_SHOW 60 -#define CB_FONT_HISTORY 62 +#define CB_FONT_SHOW 60 +#define CB_FONT_HISTORY 62 -#define CB_FONTANTIALIASING 63 -#define NF_AA_POINTLIMIT 64 -#define FT_POINTLIMIT_LABEL 65 -#define FT_POINTLIMIT_UNIT 66 +#define CB_FONTANTIALIASING 63 +#define NF_AA_POINTLIMIT 64 +#define FT_POINTLIMIT_LABEL 65 +#define FT_POINTLIMIT_UNIT 66 #define FL_RENDERING 67 #define CB_USE_HARDACCELL 68 -#define CB_USE_ANTIALIASE 69 +#define CB_USE_ANTIALIASE 69 // #i97672# -#define FL_SELECTION 70 -#define CB_SELECTION 71 -#define MF_SELECTION 72 +#define FL_SELECTION 70 +#define CB_SELECTION 71 +#define MF_SELECTION 72 // tabpage languages ----------------------------------------------------- -#define FL_UI_LANG 1 +#define FL_UI_LANG 1 #define FT_UI_LANG 2 #define LB_UI_LANG 3 -#define FL_LINGU_LANG 4 -#define FT_WEST_LANG 5 -#define LB_WEST_LANG 6 -#define FT_ASIAN_LANG 7 -#define LB_ASIAN_LANG 8 +#define FL_LINGU_LANG 4 +#define FT_WEST_LANG 5 +#define LB_WEST_LANG 6 +#define FT_ASIAN_LANG 7 +#define LB_ASIAN_LANG 8 #define FT_COMPLEX_LANG 9 #define LB_COMPLEX_LANG 10 -#define CB_CURRENT_DOC 11 +#define CB_CURRENT_DOC 11 #define FL_ENHANCED 12 #define CB_ASIANSUPPORT 13 -#define CB_CTLSUPPORT 15 +#define CB_CTLSUPPORT 15 #define FT_LOCALESETTING 16 #define LB_LOCALESETTING 17 #define FT_CURRENCY 18 diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 72402ce7f7ed..013a454865af 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class OfaMiscTabPage : public SfxTabPage using TabPage::DeactivatePage; private: FixedLine aHelpFL; - CheckBox aToolTipsCB; + CheckBox aToolTipsCB; CheckBox aExtHelpCB; CheckBox aHelpAgentCB; PushButton aHelpAgentResetBtn; @@ -89,10 +89,10 @@ public: OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaMiscTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // class OfaViewTabPage -------------------------------------------------- @@ -107,13 +107,13 @@ private: FixedText aIconSizeStyleFT; ListBox aIconSizeLB; ListBox aIconStyleLB; - CheckBox m_aSystemFont; + CheckBox m_aSystemFont; #if defined( UNX ) - CheckBox aFontAntiAliasing; - FixedText aAAPointLimitLabel; - NumericField aAAPointLimit; - FixedText aAAPointLimitUnits; + CheckBox aFontAntiAliasing; + FixedText aAAPointLimitLabel; + NumericField aAAPointLimit; + FixedText aAAPointLimitUnits; #endif FixedLine aMenuFL; @@ -121,34 +121,34 @@ private: ListBox aMenuIconsLB; FixedLine aFontListsFL; - CheckBox aFontShowCB; + CheckBox aFontShowCB; CheckBox aFontHistoryCB; FixedLine aRenderingFL; CheckBox aUseHardwareAccell; CheckBox aUseAntiAliase; - FixedLine aMouseFL; - FixedText aMousePosFT; - ListBox aMousePosLB; - FixedText aMouseMiddleFT; - ListBox aMouseMiddleLB; + FixedLine aMouseFL; + FixedText aMousePosFT; + ListBox aMousePosLB; + FixedText aMouseMiddleFT; + ListBox aMouseMiddleLB; // #i97672# FixedLine maSelectionFL; CheckBox maSelectionCB; MetricField maSelectionMF; - UINT16 nSizeLB_InitialSelection; - UINT16 nStyleLB_InitialSelection; - BOOL bSfxSymbolsAuto; + UINT16 nSizeLB_InitialSelection; + UINT16 nStyleLB_InitialSelection; + BOOL bSfxSymbolsAuto; // item ID for the given icon theme // might be zero when the theme is not installed and the item is removed - ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX]; - SvtTabAppearanceCfg* pAppearanceCfg; - CanvasSettings* pCanvasSettings; - SvtOptionsDrawinglayer* mpDrawinglayerOpt; + ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX]; + SvtTabAppearanceCfg* pAppearanceCfg; + CanvasSettings* pCanvasSettings; + SvtOptionsDrawinglayer* mpDrawinglayerOpt; #if defined( UNX ) DECL_LINK( OnAntialiasingToggled, void* ); @@ -160,10 +160,10 @@ public: OfaViewTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaViewTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /* -----------------------------23.11.00 13:04-------------------------------- @@ -185,14 +185,14 @@ class OfaLanguagesTabPage : public SfxTabPage FixedLine aLinguLanguageGB; ReadOnlyImage aWesternLanguageFI; - FixedText aWesternLanguageFT; - SvxLanguageBox aWesternLanguageLB; + FixedText aWesternLanguageFT; + SvxLanguageBox aWesternLanguageLB; ReadOnlyImage aAsianLanguageFI; - FixedText aAsianLanguageFT; - SvxLanguageBox aAsianLanguageLB; + FixedText aAsianLanguageFT; + SvxLanguageBox aAsianLanguageLB; ReadOnlyImage aComplexLanguageFI; - FixedText aComplexLanguageFT; - SvxLanguageBox aComplexLanguageLB; + FixedText aComplexLanguageFT; + SvxLanguageBox aComplexLanguageLB; CheckBox aCurrentDocCB; FixedLine aEnhancedFL; ReadOnlyImage aAsianSupportFI; @@ -203,7 +203,7 @@ class OfaLanguagesTabPage : public SfxTabPage const String sDecimalSeparatorLabel; sal_Bool m_bOldAsian; - sal_Bool m_bOldCtl; + sal_Bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; rtl::OUString m_sUserLocaleValue; @@ -215,10 +215,10 @@ public: OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaLanguagesTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _OFA_OPTGDLG_HXX diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 8a2639eec455..762e025b9655 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index c5901e3d007c..5105fe03c9b2 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,20 +53,20 @@ struct GeneralTabPage_Impl { - BOOL mbStreetEnabled; - BOOL mbPLZEnabled; - BOOL mbCityEnabled; - BOOL mbUsCityEnabled; - BOOL mbUsZipEnabled; + BOOL mbStreetEnabled; + BOOL mbPLZEnabled; + BOOL mbCityEnabled; + BOOL mbUsCityEnabled; + BOOL mbUsZipEnabled; - String maQueryStr; + String maQueryStr; GeneralTabPage_Impl() : - mbStreetEnabled ( FALSE ), - mbPLZEnabled ( FALSE ), - mbCityEnabled ( FALSE ), - mbUsCityEnabled ( FALSE ), - mbUsZipEnabled ( FALSE ) {} + mbStreetEnabled ( FALSE ), + mbPLZEnabled ( FALSE ), + mbCityEnabled ( FALSE ), + mbUsCityEnabled ( FALSE ), + mbUsZipEnabled ( FALSE ) {} }; // ----------------------------------------------------------------------- @@ -94,7 +94,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), - aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), + aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ), aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ), aNameLbl ( this, CUI_RES( FT_NAME ), true ), @@ -125,8 +125,8 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ), aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ), aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ), - aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), - pImpl ( new GeneralTabPage_Impl ) + aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), + pImpl ( new GeneralTabPage_Impl ) { LanguageType eLang = Application::GetSettings().GetUILanguage(); @@ -257,7 +257,7 @@ SvxGeneralTabPage::~SvxGeneralTabPage() //------------------------------------------------------------------------ -SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGeneralTabPage( pParent, rAttrSet ) ); } @@ -309,11 +309,11 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) switch ( nField ) { - case COMPANY_EDIT: aCompanyEdit.GrabFocus(); break; + case COMPANY_EDIT: aCompanyEdit.GrabFocus(); break; case FIRSTNAME_EDIT: aFirstName.GrabFocus(); break; - case LASTNAME_EDIT: aName.GrabFocus(); break; - case STREET_EDIT: aStreetEdit.GrabFocus(); break; - case COUNTRY_EDIT: aCountryEdit.GrabFocus(); break; + case LASTNAME_EDIT: aName.GrabFocus(); break; + case STREET_EDIT: aStreetEdit.GrabFocus(); break; + case COUNTRY_EDIT: aCountryEdit.GrabFocus(); break; case PLZ_EDIT: if ( aPLZEdit.IsVisible() ) aPLZEdit.GrabFocus(); @@ -332,14 +332,14 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) else aCityEdit.GrabFocus(); break; - case TITLE_EDIT: aTitleEdit.GrabFocus(); break; - case POSITION_EDIT: aPositionEdit.GrabFocus(); break; - case SHORTNAME_EDIT: aShortName.GrabFocus(); break; - case TELPRIV_EDIT: aTelPrivEdit.GrabFocus(); break; - case TELCOMPANY_EDIT: aTelCompanyEdit.GrabFocus(); break; - case FAX_EDIT: aFaxEdit.GrabFocus(); break; - case EMAIL_EDIT: aEmailEdit.GrabFocus(); break; - default: aCompanyEdit.GrabFocus(); + case TITLE_EDIT: aTitleEdit.GrabFocus(); break; + case POSITION_EDIT: aPositionEdit.GrabFocus(); break; + case SHORTNAME_EDIT: aShortName.GrabFocus(); break; + case TELPRIV_EDIT: aTelPrivEdit.GrabFocus(); break; + case TELCOMPANY_EDIT: aTelCompanyEdit.GrabFocus(); break; + case FAX_EDIT: aFaxEdit.GrabFocus(); break; + case EMAIL_EDIT: aEmailEdit.GrabFocus(); break; + default: aCompanyEdit.GrabFocus(); } } diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc index ed4afd2e803d..444c11291f03 100644 --- a/cui/source/options/optgenrl.hrc +++ b/cui/source/options/optgenrl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,54 +29,54 @@ // defines ------------------------------------------------------------------ -#define FT_COMPANY 10 -#define ED_COMPANY 11 -#define FT_NAME 12 -#define FT_NAME_RUSS 13 -#define ED_FATHERNAME 14 -#define ED_FIRSTNAME 15 -#define ED_NAME 16 -#define ED_SHORTNAME 17 -#define FT_STREET 18 -#define FT_STREET_RUSS 19 -#define ED_STREET 20 -#define ED_APARTMENTNR 21 -#define FT_CITY 22 -#define ED_PLZ 23 -#define ED_CITY 24 -#define ED_US_CITY 25 -#define ED_US_STATE 26 -#define ED_US_ZIPCODE 27 -#define FT_COUNTRY 28 -#define ED_COUNTRY 29 -#define FT_TITLEPOS 30 -#define ED_TITLE 31 -#define ED_POSITION 32 -#define FT_PHONE 33 -#define ED_TELPRIVAT 34 -#define ED_TELCOMPANY 35 -#define FT_FAXMAIL 36 -#define ED_FAX 37 -#define ED_EMAIL 38 -#define GB_ADDRESS 39 -#define CB_USEDATA 40 -#define FT_NAME_EASTERN 41 +#define FT_COMPANY 10 +#define ED_COMPANY 11 +#define FT_NAME 12 +#define FT_NAME_RUSS 13 +#define ED_FATHERNAME 14 +#define ED_FIRSTNAME 15 +#define ED_NAME 16 +#define ED_SHORTNAME 17 +#define FT_STREET 18 +#define FT_STREET_RUSS 19 +#define ED_STREET 20 +#define ED_APARTMENTNR 21 +#define FT_CITY 22 +#define ED_PLZ 23 +#define ED_CITY 24 +#define ED_US_CITY 25 +#define ED_US_STATE 26 +#define ED_US_ZIPCODE 27 +#define FT_COUNTRY 28 +#define ED_COUNTRY 29 +#define FT_TITLEPOS 30 +#define ED_TITLE 31 +#define ED_POSITION 32 +#define FT_PHONE 33 +#define ED_TELPRIVAT 34 +#define ED_TELCOMPANY 35 +#define FT_FAXMAIL 36 +#define ED_FAX 37 +#define ED_EMAIL 38 +#define GB_ADDRESS 39 +#define CB_USEDATA 40 +#define FT_NAME_EASTERN 41 -#define STR_US_STATE 10 -#define STR_QUERY_REG 11 +#define STR_US_STATE 10 +#define STR_QUERY_REG 11 // Positionierungshilfen f"ur den Dialog -#define HSPACE 2 -#define VSPACE 3 -#define LINEH 12 -#define FLINEH 8 -#define LEFT 12 +#define HSPACE 2 +#define VSPACE 3 +#define LINEH 12 +#define FLINEH 8 +#define LEFT 12 #define MID 100 -#define RIGHT 248 -#define TOP 10 -#define LINE(y) (14+y*15) -#define FLINE(y) (16+y*15) +#define RIGHT 248 +#define TOP 10 +#define LINE(y) (14+y*15) +#define FLINE(y) (16+y*15) #define NAMELEN 74 #endif // #ifndef _SVX_OPTGENRL_HRC diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index 6f5fff55892d..fd4a0176ac24 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index c8c52f8126f9..1d3c45e65410 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,46 +48,46 @@ const USHORT aPosToExportArr[] = HTML_CFG_WRITER }; -//#define DEPRECATED_ENTRY 0xFFFF +//#define DEPRECATED_ENTRY 0xFFFF const USHORT aExportToPosArr[] = { - 0, //HTML 3.2 - 1, //MS Internet Explorer 4.0 - 3, //StarWriter - 2 //Netscape Navigator 4.0 + 0, //HTML 3.2 + 1, //MS Internet Explorer 4.0 + 3, //StarWriter + 2 //Netscape Navigator 4.0 }; // ----------------------------------------------------------------------- OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ), - aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ), - aSize1FT ( this, CUI_RES( FT_SIZE1 ) ), - aSize1NF ( this, CUI_RES( NF_SIZE1 ) ), - aSize2FT ( this, CUI_RES( FT_SIZE2 ) ), - aSize2NF ( this, CUI_RES( NF_SIZE2 ) ), - aSize3FT ( this, CUI_RES( FT_SIZE3 ) ), - aSize3NF ( this, CUI_RES( NF_SIZE3 ) ), - aSize4FT ( this, CUI_RES( FT_SIZE4 ) ), - aSize4NF ( this, CUI_RES( NF_SIZE4 ) ), - aSize5FT ( this, CUI_RES( FT_SIZE5 ) ), - aSize5NF ( this, CUI_RES( NF_SIZE5 ) ), - aSize6FT ( this, CUI_RES( FT_SIZE6 ) ), - aSize6NF ( this, CUI_RES( NF_SIZE6 ) ), - aSize7FT ( this, CUI_RES( FT_SIZE7 ) ), - aSize7NF ( this, CUI_RES( NF_SIZE7 ) ), - aImportGB ( this, CUI_RES( GB_IMPORT ) ), - aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ), - aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ), + aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ), + aSize1FT ( this, CUI_RES( FT_SIZE1 ) ), + aSize1NF ( this, CUI_RES( NF_SIZE1 ) ), + aSize2FT ( this, CUI_RES( FT_SIZE2 ) ), + aSize2NF ( this, CUI_RES( NF_SIZE2 ) ), + aSize3FT ( this, CUI_RES( FT_SIZE3 ) ), + aSize3NF ( this, CUI_RES( NF_SIZE3 ) ), + aSize4FT ( this, CUI_RES( FT_SIZE4 ) ), + aSize4NF ( this, CUI_RES( NF_SIZE4 ) ), + aSize5FT ( this, CUI_RES( FT_SIZE5 ) ), + aSize5NF ( this, CUI_RES( NF_SIZE5 ) ), + aSize6FT ( this, CUI_RES( FT_SIZE6 ) ), + aSize6NF ( this, CUI_RES( NF_SIZE6 ) ), + aSize7FT ( this, CUI_RES( FT_SIZE7 ) ), + aSize7NF ( this, CUI_RES( NF_SIZE7 ) ), + aImportGB ( this, CUI_RES( GB_IMPORT ) ), + aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ), + aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ), aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ), - aExportGB ( this, CUI_RES( GB_EXPORT ) ), + aExportGB ( this, CUI_RES( GB_EXPORT ) ), aExportLB ( this, CUI_RES( LB_EXPORT ) ), aStarBasicCB ( this, CUI_RES( CB_STARBASIC ) ), aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING ) ), aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )), aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF ) ), - aCharSetFT ( this, CUI_RES( FT_CHARSET ) ), - aCharSetLB ( this, CUI_RES( LB_CHARSET ) ) + aCharSetFT ( this, CUI_RES( FT_CHARSET ) ), + aCharSetLB ( this, CUI_RES( LB_CHARSET ) ) { FreeResource(); @@ -126,7 +126,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage() --------------------------------------------------*/ -SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, +SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaHtmlTabPage(pParent, rAttrSet); @@ -203,10 +203,10 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily()); USHORT nExport = pHtmlOpt->GetExportMode(); if( nExport >= ( sizeof( aExportToPosArr ) / sizeof( USHORT ) ) ) - nExport = 4; // default for bad config entry is NS 4.0 + nExport = 4; // default for bad config entry is NS 4.0 USHORT nPosArr = aExportToPosArr[ nExport ]; -// if( nPosArr == DEPRECATED_ENTRY ) -// nPosArr = aExportToPosArr[ 4 ]; // again: NS 4.0 is default +// if( nPosArr == DEPRECATED_ENTRY ) +// nPosArr = aExportToPosArr[ 4 ]; // again: NS 4.0 is default aExportLB.SelectEntryPos( nPosArr ); aExportLB.SaveValue(); diff --git a/cui/source/options/opthtml.hrc b/cui/source/options/opthtml.hrc index 480bffb10b07..dd01f9b122bf 100644 --- a/cui/source/options/opthtml.hrc +++ b/cui/source/options/opthtml.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ // defines ------------------------------------------------------------------ -#define GB_FONTSIZE 1 -#define FT_SIZE1 2 -#define NF_SIZE1 3 -#define FT_SIZE2 4 -#define NF_SIZE2 5 -#define FT_SIZE3 6 -#define NF_SIZE3 7 -#define FT_SIZE4 8 -#define NF_SIZE4 9 -#define FT_SIZE5 10 -#define NF_SIZE5 11 -#define FT_SIZE6 12 -#define NF_SIZE6 13 -#define FT_SIZE7 14 -#define NF_SIZE7 15 -#define GB_IMPORT 20 -#define CB_UNKNOWN_TAGS 21 -#define CB_IGNORE_FONTNAMES 22 +#define GB_FONTSIZE 1 +#define FT_SIZE1 2 +#define NF_SIZE1 3 +#define FT_SIZE2 4 +#define NF_SIZE2 5 +#define FT_SIZE3 6 +#define NF_SIZE3 7 +#define FT_SIZE4 8 +#define NF_SIZE4 9 +#define FT_SIZE5 10 +#define NF_SIZE5 11 +#define FT_SIZE6 12 +#define NF_SIZE6 13 +#define FT_SIZE7 14 +#define NF_SIZE7 15 +#define GB_IMPORT 20 +#define CB_UNKNOWN_TAGS 21 +#define CB_IGNORE_FONTNAMES 22 #define CB_NUMBERS_ENGLISH_US 23 -#define GB_EXPORT 30 -#define CB_STARBASIC 31 -#define CB_STARBASIC_WARNING 32 +#define GB_EXPORT 30 +#define CB_STARBASIC 31 +#define CB_STARBASIC_WARNING 32 -#define CB_LOCAL_GRF 37 -#define CB_PRINT_EXTENSION 38 -#define LB_EXPORT 39 -#define FT_CHARSET 40 -#define LB_CHARSET 41 +#define CB_LOCAL_GRF 37 +#define CB_PRINT_EXTENSION 38 +#define LB_EXPORT 39 +#define FT_CHARSET 40 +#define LB_CHARSET 41 #endif diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 7785398741d8..e1f76bebf83b 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,33 +39,33 @@ class OfaHtmlTabPage : public SfxTabPage { FixedLine aFontSizeGB; - FixedText aSize1FT; + FixedText aSize1FT; NumericField aSize1NF; - FixedText aSize2FT; + FixedText aSize2FT; NumericField aSize2NF; - FixedText aSize3FT; + FixedText aSize3FT; NumericField aSize3NF; - FixedText aSize4FT; + FixedText aSize4FT; NumericField aSize4NF; - FixedText aSize5FT; + FixedText aSize5FT; NumericField aSize5NF; - FixedText aSize6FT; + FixedText aSize6FT; NumericField aSize6NF; - FixedText aSize7FT; + FixedText aSize7FT; NumericField aSize7NF; FixedLine aImportGB; CheckBox aNumbersEnglishUSCB; - CheckBox aUnknownTagCB; - CheckBox aIgnoreFontNamesCB; + CheckBox aUnknownTagCB; + CheckBox aIgnoreFontNamesCB; FixedLine aExportGB; - ListBox aExportLB; - CheckBox aStarBasicCB; - CheckBox aStarBasicWarningCB; - CheckBox aPrintExtensionCB; - CheckBox aSaveGrfLocalCB; - FixedText aCharSetFT; + ListBox aExportLB; + CheckBox aStarBasicCB; + CheckBox aStarBasicWarningCB; + CheckBox aPrintExtensionCB; + CheckBox aSaveGrfLocalCB; + FixedText aCharSetFT; SvxTextEncodingBox aCharSetLB; DECL_LINK(ExportHdl_Impl, ListBox*); @@ -75,11 +75,11 @@ class OfaHtmlTabPage : public SfxTabPage virtual ~OfaHtmlTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index 60db286b192d..715be82d2c8e 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ // RID_OFAPAGE_HTMLOPT ----------------------------------------------------- TabPage RID_OFAPAGE_HTMLOPT { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index 5c1aefd3eb1b..4feabdd51221 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optimprove.hrc b/cui/source/options/optimprove.hrc index 024e5d5aae4a..c7f191fe0d69 100644 --- a/cui/source/options/optimprove.hrc +++ b/cui/source/options/optimprove.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src index c389b38cddfa..5012f55cc43f 100644 --- a/cui/source/options/optimprove.src +++ b/cui/source/options/optimprove.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index ceed7015dba6..707a37764a8e 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6143c3211b18..546b3392c33e 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,25 +117,25 @@ using ::rtl::OUString; // different delimiter for Unix (:) and Windows (;) #ifdef UNX -#define CLASSPATH_DELIMITER ':' +#define CLASSPATH_DELIMITER ':' #else -#define CLASSPATH_DELIMITER ';' +#define CLASSPATH_DELIMITER ';' #endif // static ---------------------------------------------------------------- #define C2U(cChar) OUString::createFromAscii(cChar) -#define INET_SEARCH_TOKEN '"' -#define RET_ALL ((short)200) +#define INET_SEARCH_TOKEN '"' +#define RET_ALL ((short)200) #define CFG_READONLY_DEFAULT FALSE #include <sal/config.h> SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr ) -const char* SEARCHENGINE_INI = "srcheng.ini"; -const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; +const char* SEARCHENGINE_INI = "srcheng.ini"; +const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; // ----------------------------------------------------------------------- @@ -220,7 +220,7 @@ void SvxNoSpaceEdit::Modify() /********************************************************************/ /********************************************************************/ /* */ -/* SvxProxyTabPage */ +/* SvxProxyTabPage */ /* */ /* */ /********************************************************************/ @@ -233,12 +233,12 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : aProxyModeFT (this, CUI_RES(FT_PROXYMODE)), aProxyModeLB (this, CUI_RES(LB_PROXYMODE)), - aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), + aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )), aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )), aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE), - aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), + aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )), aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )), aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE), @@ -318,7 +318,7 @@ SvxProxyTabPage::~SvxProxyTabPage() --------------------------------------------------*/ -SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxProxyTabPage(pParent, rAttrSet); } @@ -719,7 +719,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ /********************************************************************/ /* */ -/* SvxSearchTabPage */ +/* SvxSearchTabPage */ /* */ /* */ /********************************************************************/ @@ -729,28 +729,28 @@ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ), - aSearchGB ( this, CUI_RES( GB_SEARCH ) ), - aSearchLB ( this, CUI_RES( LB_SEARCH ) ), - aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ), - aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ), - aSearchFT ( this, CUI_RES( FT_SEARCH ) ), - aAndRB ( this, CUI_RES( RB_AND ) ), - aOrRB ( this, CUI_RES( RB_OR ) ), - aExactRB ( this, CUI_RES( RB_EXACT ) ), - - aURLFT ( this, CUI_RES( FT_URL ) ), - aURLED ( this, CUI_RES( ED_URL ) ), - - aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ), - aPostFixED ( this, CUI_RES( ED_POSTFIX ) ), - aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ), - aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ), - aCaseFT ( this, CUI_RES( FT_CASE ) ), - aCaseED ( this, CUI_RES( ED_CASE ) ), - - aNewPB ( this, CUI_RES( PB_NEW ) ), - aAddPB ( this, CUI_RES( PB_ADD ) ), - aChangePB ( this, CUI_RES( PB_CHANGE ) ), + aSearchGB ( this, CUI_RES( GB_SEARCH ) ), + aSearchLB ( this, CUI_RES( LB_SEARCH ) ), + aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ), + aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ), + aSearchFT ( this, CUI_RES( FT_SEARCH ) ), + aAndRB ( this, CUI_RES( RB_AND ) ), + aOrRB ( this, CUI_RES( RB_OR ) ), + aExactRB ( this, CUI_RES( RB_EXACT ) ), + + aURLFT ( this, CUI_RES( FT_URL ) ), + aURLED ( this, CUI_RES( ED_URL ) ), + + aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ), + aPostFixED ( this, CUI_RES( ED_POSTFIX ) ), + aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ), + aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ), + aCaseFT ( this, CUI_RES( FT_CASE ) ), + aCaseED ( this, CUI_RES( ED_CASE ) ), + + aNewPB ( this, CUI_RES( PB_NEW ) ), + aAddPB ( this, CUI_RES( PB_ADD ) ), + aChangePB ( this, CUI_RES( PB_CHANGE ) ), aDeletePB ( this, CUI_RES( PB_DELETE ) ), sModifyMsg(CUI_RES(MSG_MODIFY)) @@ -787,7 +787,7 @@ SvxSearchTabPage::~SvxSearchTabPage() } // ----------------------------------------------------------------------- -SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxSearchTabPage(pParent, rAttrSet); } @@ -1138,7 +1138,7 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) /********************************************************************/ /********************************************************************/ /* */ -/* SvxOtherTabPage */ +/* SvxOtherTabPage */ /* */ /********************************************************************/ /********************************************************************/ @@ -1151,8 +1151,8 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : PatternField( pParent, rResId ), - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) + sMsg233 ( ResId( ST_MSG_233 ) ), + sMsg255 ( ResId( ST_MSG_255 ) ) { FreeResource(); @@ -1226,7 +1226,7 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : long SvxPatternField::Notify( NotifyEvent& rNEvt ) { return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; +/*! long nHandled = 0; if ( rNEvt.GetType() == EVENT_KEYUP ) { @@ -1243,27 +1243,27 @@ long SvxPatternField::Notify( NotifyEvent& rNEvt ) class JavaScriptDisableQueryBox_Impl : public ModalDialog { private: - FixedImage aImage; - FixedText aWarningFT; - CheckBox aDisableCB; - OKButton aYesBtn; - CancelButton aNoBtn; + FixedImage aImage; + FixedText aWarningFT; + CheckBox aDisableCB; + OKButton aYesBtn; + CancelButton aNoBtn; public: JavaScriptDisableQueryBox_Impl( Window* pParent ); - BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } + BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } }; JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) + aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), + aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), + aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), + aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), + aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) { FreeResource(); @@ -1316,7 +1316,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) /********************************************************************/ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ) - :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) + :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) ) ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) ) @@ -1650,7 +1650,7 @@ namespace { /* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) { - bool b = _rOpt.IsOptionEnabled( _eOpt ); + bool b = _rOpt.IsOptionEnabled( _eOpt ); _rCtrl.Enable( b ); _Img.Show( !b ); return b; @@ -1715,8 +1715,8 @@ 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 ) ), - aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) ) + aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), + aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) ) { FreeResource(); } @@ -1725,7 +1725,7 @@ MozPluginTabPage::~MozPluginTabPage() { } -SfxTabPage* MozPluginTabPage::Create( Window* pParent, +SfxTabPage* MozPluginTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new MozPluginTabPage( pParent, rAttrSet ); @@ -1920,7 +1920,7 @@ public: MailerProgramCfg_Impl(); virtual ~MailerProgramCfg_Impl(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; @@ -2019,7 +2019,7 @@ SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) : aMailerURLFT(this, CUI_RES(FT_MAILERURL )), aMailerURLED(this, CUI_RES(ED_MAILERURL )), aMailerURLPB(this, CUI_RES(PB_MAILERURL )), - m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )), + m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )), pImpl(new SvxEMailTabPage_Impl) { FreeResource(); diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index 1bd09225ac9b..75f9445eb542 100755 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ // Proxy ------------------------------------------------------------------ #define GB_SETTINGS 1 -#define FT_PROXYMODE 2 +#define FT_PROXYMODE 2 #define LB_PROXYMODE 2 -#define FT_HTTP_PROXY 3 +#define FT_HTTP_PROXY 3 #define ED_HTTP_PROXY 3 #define FT_HTTP_PORT 4 #define ED_HTTP_PORT 4 @@ -51,18 +51,18 @@ #define ED_NOPROXYFOR 11 #define ED_NOPROXYDESC 12 #define ST_PROXY_FROM_BROWSER 13 -#define FT_HTTPS_PROXY 14 +#define FT_HTTPS_PROXY 14 #define ED_HTTPS_PROXY 14 #define FT_HTTPS_PORT 15 #define ED_HTTPS_PORT 15 // Search ------------------------------------------------------------------ -#define GB_SEARCH 40 -#define LB_SEARCH 40 -#define FT_SEARCH_NAME 41 -#define ED_SEARCH_NAME 41 -#define FT_SEARCH 42 -#define RB_AND 43 +#define GB_SEARCH 40 +#define LB_SEARCH 40 +#define FT_SEARCH_NAME 41 +#define ED_SEARCH_NAME 41 +#define FT_SEARCH 42 +#define RB_AND 43 #define RB_OR 44 #define RB_EXACT 45 #define FT_URL 46 @@ -73,34 +73,34 @@ #define ED_SEPARATOR 48 #define FT_CASE 49 #define ED_CASE 49 -#define PB_CHANGE 53 -#define PB_DELETE 54 -#define PB_ADD 55 -#define PB_NEW 56 +#define PB_CHANGE 53 +#define PB_DELETE 54 +#define PB_ADD 55 +#define PB_NEW 56 #define MSG_MODIFY 57 // Protocols -------------------------------------------------------------- -#define GB_DNS 105 +#define GB_DNS 105 #define RB_DNS_AUTO 106 #define RB_DNS_MANUAL 107 #define ED_DNS 107 -#define ST_MSG_255_0 111 -#define ST_MSG_255_1 112 +#define ST_MSG_255_0 111 +#define ST_MSG_255_1 112 // Site Certificate -------------------------------------------------------- -#define GB_SITECERT 120 -#define LB_SITECERT 121 -#define LB_FILTERCERT 122 -#define PB_EDIT_CERT 123 -#define PB_DELETE_CERT 124 +#define GB_SITECERT 120 +#define LB_SITECERT 121 +#define LB_FILTERCERT 122 +#define PB_EDIT_CERT 123 +#define PB_DELETE_CERT 124 // personal Certificate ---------------------------------------------------- -#define GB_PERSCERT 130 -#define LB_PERSCERT 131 -#define PB_NEW_PERSCERT 132 -#define PB_INFO_PERSCERT 133 -#define PB_DELETE_PERSCERT 134 +#define GB_PERSCERT 130 +#define LB_PERSCERT 131 +#define PB_NEW_PERSCERT 132 +#define PB_INFO_PERSCERT 133 +#define PB_DELETE_PERSCERT 134 // Security ------------------------------------------------------------- @@ -145,12 +145,12 @@ // Defines - JavaScriptDisableQueryBox_Impl ------------------------------- -#define IMG_JSCPT_WARNING 220 -#define FT_JSCPT_WARNING 221 -#define CB_JSCPT_DISABLE 222 -#define GB_JSCPT_WARNING 223 -#define BTN_JSCPT_YES 224 -#define BTN_JSCPT_NO 225 +#define IMG_JSCPT_WARNING 220 +#define FT_JSCPT_WARNING 221 +#define CB_JSCPT_DISABLE 222 +#define GB_JSCPT_WARNING 223 +#define BTN_JSCPT_YES 224 +#define BTN_JSCPT_NO 225 // Defines - SvxEMailTabPage_Impl #define FL_MAIL 1 @@ -161,8 +161,8 @@ #define STR_DEFAULT_FILENAME 6 // plugin -#define GB_MOZPLUGIN 1 -#define CB_MOZPLUGIN_CODE 2 +#define GB_MOZPLUGIN 1 +#define CB_MOZPLUGIN_CODE 2 #endif // #ifndef _SVX_OPTINET_HRC diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 9b7e5b20acbc..bdd1bfb8d8af 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ class SfxFilter; class SvtInetOptions; #ifndef SV_NODIALOG -#define PROXY_CONTROLS 23 -#define CACHE_CONTROLS 20 -#define INET_SEARCH 19 +#define PROXY_CONTROLS 23 +#define CACHE_CONTROLS 20 +#define INET_SEARCH 19 #if defined(OS2) #define TYPE_CONTROLS 20 @@ -71,14 +71,14 @@ namespace uno = ::com::sun::star::uno; class SvxNoSpaceEdit : public Edit { private: - BOOL bOnlyNumeric; + BOOL bOnlyNumeric; public: SvxNoSpaceEdit(Window* pParent, ResId rResId, BOOL bNum = FALSE ) : Edit( pParent, rResId ), bOnlyNumeric( bNum ) {} - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void Modify(); }; typedef SfxFilter* SfxFilterPtr; @@ -91,28 +91,28 @@ class SvxProxyTabPage : public SfxTabPage private: FixedLine aOptionGB; - FixedText aProxyModeFT; - ListBox aProxyModeLB; + FixedText aProxyModeFT; + ListBox aProxyModeLB; - FixedText aHttpProxyFT; - SvxNoSpaceEdit aHttpProxyED; - FixedText aHttpPortFT; - SvxNoSpaceEdit aHttpPortED; + FixedText aHttpProxyFT; + SvxNoSpaceEdit aHttpProxyED; + FixedText aHttpPortFT; + SvxNoSpaceEdit aHttpPortED; - FixedText aHttpsProxyFT; - SvxNoSpaceEdit aHttpsProxyED; - FixedText aHttpsPortFT; - SvxNoSpaceEdit aHttpsPortED; + FixedText aHttpsProxyFT; + SvxNoSpaceEdit aHttpsProxyED; + FixedText aHttpsPortFT; + SvxNoSpaceEdit aHttpsPortED; - FixedText aFtpProxyFT; - SvxNoSpaceEdit aFtpProxyED; - FixedText aFtpPortFT; - SvxNoSpaceEdit aFtpPortED; + FixedText aFtpProxyFT; + SvxNoSpaceEdit aFtpProxyED; + FixedText aFtpPortFT; + SvxNoSpaceEdit aFtpPortED; - FixedText aNoProxyForFT; - Edit aNoProxyForED; - FixedText aNoProxyDescFT; + FixedText aNoProxyForFT; + Edit aNoProxyForED; + FixedText aNoProxyDescFT; String sFromBrowser; @@ -142,9 +142,9 @@ private: virtual ~SvxProxyTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // class SvxSearchTabPage ------------------------------------------------ @@ -156,31 +156,31 @@ class SvxSearchTabPage : public SfxTabPage private: FixedLine aSearchGB; - ListBox aSearchLB; - FixedText aSearchNameFT; - SvxNoSpaceEdit aSearchNameED; - - FixedText aSearchFT; - RadioButton aAndRB; - RadioButton aOrRB; - RadioButton aExactRB; - - FixedText aURLFT; - SvxNoSpaceEdit aURLED; - - FixedText aPostFixFT; - SvxNoSpaceEdit aPostFixED; - FixedText aSeparatorFT; - SvxNoSpaceEdit aSeparatorED; - FixedText aCaseFT; - ListBox aCaseED; - - PushButton aNewPB; - PushButton aAddPB; - PushButton aChangePB; - PushButton aDeletePB; - - String sLastSelectedEntry; + ListBox aSearchLB; + FixedText aSearchNameFT; + SvxNoSpaceEdit aSearchNameED; + + FixedText aSearchFT; + RadioButton aAndRB; + RadioButton aOrRB; + RadioButton aExactRB; + + FixedText aURLFT; + SvxNoSpaceEdit aURLED; + + FixedText aPostFixFT; + SvxNoSpaceEdit aPostFixED; + FixedText aSeparatorFT; + SvxNoSpaceEdit aSeparatorED; + FixedText aCaseFT; + ListBox aCaseED; + + PushButton aNewPB; + PushButton aAddPB; + PushButton aChangePB; + PushButton aDeletePB; + + String sLastSelectedEntry; String sModifyMsg; SvxSearchConfig aSearchConfig; @@ -200,15 +200,15 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -262,27 +262,27 @@ private: DECL_LINK( MasterPasswordCBHdl, void* ); DECL_LINK( ShowPasswordsHdl, PushButton* ); DECL_LINK( MacroSecPBHdl, void* ); - + void InitControls(); SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxSecurityTabPage(); + virtual ~SvxSecurityTabPage(); protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; //added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; - CheckBox aWBasicCodeCB; + CheckBox aWBasicCodeCB; BOOL isInstalled(void); BOOL installPlugin(void); @@ -293,11 +293,11 @@ class MozPluginTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; //added by jmeng end @@ -330,10 +330,10 @@ public: SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxEMailTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_OPTINET_HXX diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 9023dfa52394..848cdc27869f 100755 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,9 +115,9 @@ TabPage RID_SVXPAGE_INET_PROXY Border = TRUE ; }; - #define FT_PORT_WIDTH 37 - #define ED_PORT_WIDTH 20 - #define ED_PORT_COL 229 + #define FT_PORT_WIDTH 37 + #define ED_PORT_WIDTH 20 + #define ED_PORT_COL 229 FixedText FT_HTTP_PORT { @@ -420,7 +420,7 @@ TabPage RID_SVXPAGE_INET_SEARCH /************************************************************************/ /* */ -/* Scripting */ +/* Scripting */ /* */ /************************************************************************/ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3d905fc2c779..a59f88802fd8 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,10 +56,10 @@ // define ---------------------------------------------------------------- -#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR -#define STRIM( s ) s.EraseLeadingChars().EraseTrailingChars() -#define BUTTON_BORDER 2 -#define RESET_TIMEOUT 300 +#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR +#define STRIM( s ) s.EraseLeadingChars().EraseTrailingChars() +#define BUTTON_BORDER 2 +#define RESET_TIMEOUT 300 using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; @@ -149,24 +149,24 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ), - m_aJavaLine ( this, CUI_RES( FL_JAVA ) ), - m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ), - m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ), - m_aJavaList ( this, CUI_RES( LB_JAVA ) ), - m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ), - m_aAddBtn ( this, CUI_RES( PB_ADD ) ), - m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ), - m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ), - - m_pParamDlg ( NULL ), - m_pPathDlg ( NULL ), - m_parJavaInfo ( NULL ), - m_parParameters ( NULL ), - m_pClassPath ( NULL ), - m_nInfoSize ( 0 ), - m_nParamSize ( 0 ), - m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ), - m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ), + m_aJavaLine ( this, CUI_RES( FL_JAVA ) ), + m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ), + m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ), + m_aJavaList ( this, CUI_RES( LB_JAVA ) ), + m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ), + m_aAddBtn ( this, CUI_RES( PB_ADD ) ), + m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ), + m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ), + + m_pParamDlg ( NULL ), + m_pPathDlg ( NULL ), + m_parJavaInfo ( NULL ), + m_parParameters ( NULL ), + m_pClassPath ( NULL ), + m_nInfoSize ( 0 ), + m_nParamSize ( 0 ), + m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ), + m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ), m_sAddDialogText ( CUI_RES( STR_ADDDLGTEXT ) ), xDialogListener ( new ::svt::DialogClosedListener() ) @@ -650,7 +650,7 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) // ----------------------------------------------------------------------- -SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxJavaOptionsPage( pParent, rAttrSet ) ); } @@ -678,7 +678,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) bModified = TRUE; } - if ( m_pPathDlg ) + if ( m_pPathDlg ) { ::rtl::OUString sPath( m_pPathDlg->GetClassPath() ); if ( m_pPathDlg->GetOldPath() != String( sPath ) ) @@ -775,17 +775,17 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ), - m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ), - m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ), - m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ), - m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ), - m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ), - m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ), - m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ), - m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ), - m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ), - m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ), - m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) ) + m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ), + m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ), + m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ), + m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ), + m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ), + m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ), + m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) ) { FreeResource(); @@ -885,7 +885,7 @@ short SvxJavaParameterDlg::Execute() // ----------------------------------------------------------------------- -Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const +Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const { USHORT nCount = m_aAssignedList.GetEntryCount(); Sequence< ::rtl::OUString > aParamList( nCount ); @@ -915,15 +915,15 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ), - m_aPathLabel ( this, CUI_RES( FT_PATH ) ), - m_aPathList ( this, CUI_RES( LB_PATH ) ), - m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ), - m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ), - m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ), - m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ), - m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ), - m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ), - m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) ) + m_aPathLabel ( this, CUI_RES( FT_PATH ) ), + m_aPathList ( this, CUI_RES( LB_PATH ) ), + m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ), + m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ), + m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) ) { FreeResource(); diff --git a/cui/source/options/optjava.hrc b/cui/source/options/optjava.hrc index 425cd2ca6d65..23da073e05ba 100644 --- a/cui/source/options/optjava.hrc +++ b/cui/source/options/optjava.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,53 +31,53 @@ // class SvxJavaOptionsPage ---------------------------------------------- -#define FL_JAVA 10 -#define CB_JAVA_ENABLE 11 -#define FT_JAVA_FOUND 12 -#define LB_JAVA 13 -#define FT_JAVA_PATH 14 +#define FL_JAVA 10 +#define CB_JAVA_ENABLE 11 +#define FT_JAVA_FOUND 12 +#define LB_JAVA 13 +#define FT_JAVA_PATH 14 -#define PB_ADD 20 -#define PB_PARAMETER 21 -#define PB_CLASSPATH 22 +#define PB_ADD 20 +#define PB_PARAMETER 21 +#define PB_CLASSPATH 22 -#define STR_INSTALLED_IN 30 -#define STR_ACCESSIBILITY 31 -#define STR_ADDDLGTEXT 32 +#define STR_INSTALLED_IN 30 +#define STR_ACCESSIBILITY 31 +#define STR_ADDDLGTEXT 32 -#define STR_HEADER_VENDOR 40 -#define STR_HEADER_VERSION 41 -#define STR_HEADER_FEATURES 42 +#define STR_HEADER_VENDOR 40 +#define STR_HEADER_VERSION 41 +#define STR_HEADER_FEATURES 42 // class SvxJavaParameterDlg --------------------------------------------- -#define FT_PARAMETER 10 -#define ED_PARAMETER 11 -#define PB_ASSIGN 12 +#define FT_PARAMETER 10 +#define ED_PARAMETER 11 +#define PB_ASSIGN 12 -#define FT_ASSIGNED 20 -#define LB_ASSIGNED 21 -#define FT_EXAMPLE 22 -#define PB_REMOVE 23 +#define FT_ASSIGNED 20 +#define LB_ASSIGNED 21 +#define FT_EXAMPLE 22 +#define PB_REMOVE 23 -#define FL_BUTTONS 30 -#define PB_PARAMETER_OK 31 -#define PB_PARAMETER_ESC 32 -#define PB_PARAMETER_HLP 33 +#define FL_BUTTONS 30 +#define PB_PARAMETER_OK 31 +#define PB_PARAMETER_ESC 32 +#define PB_PARAMETER_HLP 33 // class SvxJavaClassPathDlg --------------------------------------------- -#define FT_PATH 10 -#define LB_PATH 11 +#define FT_PATH 10 +#define LB_PATH 11 -#define PB_ADDARCHIVE 20 -#define PB_ADDPATH 21 -#define PB_REMOVE_PATH 22 +#define PB_ADDARCHIVE 20 +#define PB_ADDPATH 21 +#define PB_REMOVE_PATH 22 -#define FL_PATH_BUTTONS 30 -#define PB_PATH_OK 31 -#define PB_PATH_ESC 32 -#define PB_PATH_HLP 33 +#define FL_PATH_BUTTONS 30 +#define PB_PATH_OK 31 +#define PB_PATH_ESC 32 +#define PB_PATH_HLP 33 #endif // #ifndef _SVX_OPTJAVA_HRC diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ac03588b9697..db6606e0b3f1 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ typedef struct _JavaInfo JavaInfo; -class SvxJavaParameterDlg; -class SvxJavaClassPathDlg; +class SvxJavaParameterDlg; +class SvxJavaClassPathDlg; // class SvxJavaTable ---------------------------------------------------- @@ -54,19 +54,19 @@ class SvxJavaTable : public SvxSimpleTable { using SvxSimpleTable::SetTabs; private: - Point m_aCurMousePoint; + Point m_aCurMousePoint; protected: - virtual void SetTabs(); + virtual void SetTabs(); virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); public: SvxJavaTable( Window* _pParent, const ResId& _rId ); ~SvxJavaTable(); - inline Point GetCurMousePoint() { return m_aCurMousePoint; } + inline Point GetCurMousePoint() { return m_aCurMousePoint; } }; // class SvxJavaOptionsPage ---------------------------------------------- @@ -83,18 +83,18 @@ private: PushButton m_aParameterBtn; PushButton m_aClassPathBtn; - SvxJavaParameterDlg* m_pParamDlg; - SvxJavaClassPathDlg* m_pPathDlg; + SvxJavaParameterDlg* m_pParamDlg; + SvxJavaClassPathDlg* m_pPathDlg; - JavaInfo** m_parJavaInfo; - rtl_uString** m_parParameters; - rtl_uString* m_pClassPath; - sal_Int32 m_nInfoSize; - sal_Int32 m_nParamSize; - String m_sInstallText; - String m_sAccessibilityText; - String m_sAddDialogText; - Timer m_aResetTimer; + JavaInfo** m_parJavaInfo; + rtl_uString** m_parParameters; + rtl_uString* m_pClassPath; + sal_Int32 m_nInfoSize; + sal_Int32 m_nParamSize; + String m_sInstallText; + String m_sAccessibilityText; + String m_sAddDialogText; + Timer m_aResetTimer; ::std::vector< JavaInfo* > m_aAddedInfos; @@ -102,33 +102,33 @@ private: ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker; - DECL_LINK( EnableHdl_Impl, CheckBox * ); - DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); - DECL_LINK( SelectHdl_Impl, SvxSimpleTable * ); - DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK( ParameterHdl_Impl, PushButton * ); - DECL_LINK( ClassPathHdl_Impl, PushButton * ); + DECL_LINK( EnableHdl_Impl, CheckBox * ); + DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); + DECL_LINK( SelectHdl_Impl, SvxSimpleTable * ); + DECL_LINK( AddHdl_Impl, PushButton * ); + DECL_LINK( ParameterHdl_Impl, PushButton * ); + DECL_LINK( ClassPathHdl_Impl, PushButton * ); DECL_LINK( ResetHdl_Impl, Timer * ); DECL_LINK( StartFolderPickerHdl, void * ); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); - void ClearJavaInfo(); - void ClearJavaList(); - void LoadJREs(); - void AddJRE( JavaInfo* _pInfo ); - void HandleCheckEntry( SvLBoxEntry* _pEntry ); + void ClearJavaInfo(); + void ClearJavaList(); + void LoadJREs(); + void AddJRE( JavaInfo* _pInfo ); + void HandleCheckEntry( SvLBoxEntry* _pEntry ); void AddFolder( const ::rtl::OUString& _rFolder ); public: SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~SvxJavaOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void FillUserData(); }; // class SvxJavaParameterDlg --------------------------------------------- @@ -136,27 +136,27 @@ public: class SvxJavaParameterDlg : public ModalDialog { private: - FixedText m_aParameterLabel; - Edit m_aParameterEdit; - PushButton m_aAssignBtn; - - FixedText m_aAssignedLabel; - ListBox m_aAssignedList; - FixedText m_aExampleText; - PushButton m_aRemoveBtn; - - FixedLine m_aButtonsLine; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; - - DECL_LINK( ModifyHdl_Impl, Edit * ); - DECL_LINK( AssignHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); - DECL_LINK( DblClickHdl_Impl, ListBox * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); - - inline void EnableRemoveButton() + FixedText m_aParameterLabel; + Edit m_aParameterEdit; + PushButton m_aAssignBtn; + + FixedText m_aAssignedLabel; + ListBox m_aAssignedList; + FixedText m_aExampleText; + PushButton m_aRemoveBtn; + + FixedLine m_aButtonsLine; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; + + DECL_LINK( ModifyHdl_Impl, Edit * ); + DECL_LINK( AssignHdl_Impl, PushButton * ); + DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK( DblClickHdl_Impl, ListBox * ); + DECL_LINK( RemoveHdl_Impl, PushButton * ); + + inline void EnableRemoveButton() { m_aRemoveBtn.Enable( m_aAssignedList.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } @@ -166,7 +166,7 @@ public: SvxJavaParameterDlg( Window* pParent ); ~SvxJavaParameterDlg(); - virtual short Execute(); + virtual short Execute(); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const; void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams ); @@ -177,25 +177,25 @@ public: class SvxJavaClassPathDlg : public ModalDialog { private: - FixedText m_aPathLabel; - ListBox m_aPathList; - PushButton m_aAddArchiveBtn; - PushButton m_aAddPathBtn; - PushButton m_aRemoveBtn; + FixedText m_aPathLabel; + ListBox m_aPathList; + PushButton m_aAddArchiveBtn; + PushButton m_aAddPathBtn; + PushButton m_aRemoveBtn; - FixedLine m_aButtonsLine; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; + FixedLine m_aButtonsLine; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; - String m_sOldPath; + String m_sOldPath; - DECL_LINK( AddArchiveHdl_Impl, PushButton * ); - DECL_LINK( AddPathHdl_Impl, PushButton * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK( AddArchiveHdl_Impl, PushButton * ); + DECL_LINK( AddPathHdl_Impl, PushButton * ); + DECL_LINK( RemoveHdl_Impl, PushButton * ); + DECL_LINK( SelectHdl_Impl, ListBox * ); - bool IsPathDuplicate( const String& _rPath ); + bool IsPathDuplicate( const String& _rPath ); inline void EnableRemoveButton() { m_aRemoveBtn.Enable( m_aPathList.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } @@ -204,11 +204,11 @@ public: SvxJavaClassPathDlg( Window* pParent ); ~SvxJavaClassPathDlg(); - inline const String& GetOldPath() const { return m_sOldPath; } - inline void SetFocus() { m_aPathList.GrabFocus(); } + inline const String& GetOldPath() const { return m_sOldPath; } + inline void SetFocus() { m_aPathList.GrabFocus(); } - String GetClassPath() const; - void SetClassPath( const String& _rPath ); + String GetClassPath() const; + void SetClassPath( const String& _rPath ); }; #endif // #ifndef _SVX_OPTJAVA_HXX diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 0d55fd6f64f8..c8306b7b8bfb 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 0be75792e2df..abdae39ff4cc 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,26 +44,26 @@ using namespace com::sun::star::i18n; SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ), - aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ), - aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ), - aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ), - aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), - aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ), - aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ), - aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), - aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), - aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ), - aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ), - aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ), - aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ), - aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ), - aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ), - aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ), - aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ), + aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ), + aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ), + aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ), + aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), + aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ), + aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ), + aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), + aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), + aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ), + aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ), + aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ), + aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ), + aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ), + aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ), + aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ), + aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ), aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ), aIgnore ( this, CUI_RES( FL_IGNORE ) ), - aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ), - aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ), + aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ), + aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ), aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) ) { FreeResource(); @@ -116,13 +116,13 @@ void SvxJSearchOptionsPage::SetTransliterationFlags( INT32 nSettings ) bVal = 0 != (nSettings & TransliterationModules_ignoreKiKuFollowedBySa_ja_JP); aMatchKiku .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreSeparator_ja_JP); - aIgnorePunctuation .Check( bVal ); + aIgnorePunctuation .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreSpace_ja_JP); - aIgnoreWhitespace .Check( bVal ); + aIgnoreWhitespace .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreProlongedSoundMark_ja_JP); aMatchProlongedSoundMark.Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreMiddleDot_ja_JP); - aIgnoreMiddleDot .Check( bVal ); + aIgnoreMiddleDot .Check( bVal ); nTransliterationFlags = nSettings; } @@ -181,48 +181,48 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) // read settings from configuration aMatchCase .Check(!aOpt.IsMatchCase() ); //! treat as equal uppercase/lowercase - aMatchFullHalfWidth .Check( aOpt.IsMatchFullHalfWidthForms() ); - aMatchHiraganaKatakana .Check( aOpt.IsMatchHiraganaKatakana() ); - aMatchContractions .Check( aOpt.IsMatchContractions() ); - aMatchMinusDashChoon .Check( aOpt.IsMatchMinusDashChoon() ); - aMatchRepeatCharMarks .Check( aOpt.IsMatchRepeatCharMarks() ); - aMatchVariantFormKanji .Check( aOpt.IsMatchVariantFormKanji() ); - aMatchOldKanaForms .Check( aOpt.IsMatchOldKanaForms() ); - aMatchDiziDuzu .Check( aOpt.IsMatchDiziDuzu() ); - aMatchBavaHafa .Check( aOpt.IsMatchBavaHafa() ); - aMatchTsithichiDhizi .Check( aOpt.IsMatchTsithichiDhizi() ); - aMatchHyuiyuByuvyu .Check( aOpt.IsMatchHyuiyuByuvyu() ); - aMatchSesheZeje .Check( aOpt.IsMatchSesheZeje() ); - aMatchIaiya .Check( aOpt.IsMatchIaiya() ); - aMatchKiku .Check( aOpt.IsMatchKiku() ); - aIgnorePunctuation .Check( aOpt.IsIgnorePunctuation() ); - aIgnoreWhitespace .Check( aOpt.IsIgnoreWhitespace() ); + aMatchFullHalfWidth .Check( aOpt.IsMatchFullHalfWidthForms() ); + aMatchHiraganaKatakana .Check( aOpt.IsMatchHiraganaKatakana() ); + aMatchContractions .Check( aOpt.IsMatchContractions() ); + aMatchMinusDashChoon .Check( aOpt.IsMatchMinusDashChoon() ); + aMatchRepeatCharMarks .Check( aOpt.IsMatchRepeatCharMarks() ); + aMatchVariantFormKanji .Check( aOpt.IsMatchVariantFormKanji() ); + aMatchOldKanaForms .Check( aOpt.IsMatchOldKanaForms() ); + aMatchDiziDuzu .Check( aOpt.IsMatchDiziDuzu() ); + aMatchBavaHafa .Check( aOpt.IsMatchBavaHafa() ); + aMatchTsithichiDhizi .Check( aOpt.IsMatchTsithichiDhizi() ); + aMatchHyuiyuByuvyu .Check( aOpt.IsMatchHyuiyuByuvyu() ); + aMatchSesheZeje .Check( aOpt.IsMatchSesheZeje() ); + aMatchIaiya .Check( aOpt.IsMatchIaiya() ); + aMatchKiku .Check( aOpt.IsMatchKiku() ); + aIgnorePunctuation .Check( aOpt.IsIgnorePunctuation() ); + aIgnoreWhitespace .Check( aOpt.IsIgnoreWhitespace() ); aMatchProlongedSoundMark .Check( aOpt.IsIgnoreProlongedSoundMark() ); - aIgnoreMiddleDot .Check( aOpt.IsIgnoreMiddleDot() ); + aIgnoreMiddleDot .Check( aOpt.IsIgnoreMiddleDot() ); nTransliterationFlags = GetTransliterationFlags_Impl(); DBG_ASSERT( nTransliterationFlags == aOpt.GetTransliterationFlags(), "Transliteration settings different" ); - aMatchCase .SaveValue(); - aMatchFullHalfWidth .SaveValue(); - aMatchHiraganaKatakana .SaveValue(); - aMatchContractions .SaveValue(); - aMatchMinusDashChoon .SaveValue(); - aMatchRepeatCharMarks .SaveValue(); - aMatchVariantFormKanji .SaveValue(); - aMatchOldKanaForms .SaveValue(); - aMatchDiziDuzu .SaveValue(); - aMatchBavaHafa .SaveValue(); - aMatchTsithichiDhizi .SaveValue(); - aMatchHyuiyuByuvyu .SaveValue(); - aMatchSesheZeje .SaveValue(); - aMatchIaiya .SaveValue(); - aMatchKiku .SaveValue(); - aIgnorePunctuation .SaveValue(); - aIgnoreWhitespace .SaveValue(); + aMatchCase .SaveValue(); + aMatchFullHalfWidth .SaveValue(); + aMatchHiraganaKatakana .SaveValue(); + aMatchContractions .SaveValue(); + aMatchMinusDashChoon .SaveValue(); + aMatchRepeatCharMarks .SaveValue(); + aMatchVariantFormKanji .SaveValue(); + aMatchOldKanaForms .SaveValue(); + aMatchDiziDuzu .SaveValue(); + aMatchBavaHafa .SaveValue(); + aMatchTsithichiDhizi .SaveValue(); + aMatchHyuiyuByuvyu .SaveValue(); + aMatchSesheZeje .SaveValue(); + aMatchIaiya .SaveValue(); + aMatchKiku .SaveValue(); + aIgnorePunctuation .SaveValue(); + aIgnoreWhitespace .SaveValue(); aMatchProlongedSoundMark .SaveValue(); - aIgnoreMiddleDot .SaveValue(); + aIgnoreMiddleDot .SaveValue(); } diff --git a/cui/source/options/optjsearch.hrc b/cui/source/options/optjsearch.hrc index e1c2b8d24306..40024df86272 100644 --- a/cui/source/options/optjsearch.hrc +++ b/cui/source/options/optjsearch.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FL_TREAT_AS_EQUAL 100 +#define FL_TREAT_AS_EQUAL 100 #define CB_MATCH_CASE 101 #define CB_MATCH_FULL_HALF_WIDTH 102 #define CB_MATCH_HIRAGANA_KATAKANA 103 @@ -42,9 +42,9 @@ #define CB_MATCH_IAIYA 114 #define CB_MATCH_KIKU 115 -#define FL_IGNORE 200 +#define FL_IGNORE 200 #define CB_IGNORE_PUNCTUATION 201 #define CB_IGNORE_WHITESPACES 202 #define CB_MATCH_PROLONGED_SOUNDMARK 203 -#define CB_IGNORE_MIDDLE_DOT 204 +#define CB_IGNORE_MIDDLE_DOT 204 diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 5ec12621cd40..3b2a51b158e9 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,32 +41,32 @@ class SfxItemSet; class SvxJSearchOptionsPage : public SfxTabPage { private: - FixedLine aTreatAsEqual; - CheckBox aMatchCase; - CheckBox aMatchFullHalfWidth; - CheckBox aMatchHiraganaKatakana; - CheckBox aMatchContractions; - CheckBox aMatchMinusDashChoon; - CheckBox aMatchRepeatCharMarks; - CheckBox aMatchVariantFormKanji; - CheckBox aMatchOldKanaForms; - CheckBox aMatchDiziDuzu; - CheckBox aMatchBavaHafa; - CheckBox aMatchTsithichiDhizi; - CheckBox aMatchHyuiyuByuvyu; - CheckBox aMatchSesheZeje; - CheckBox aMatchIaiya; - CheckBox aMatchKiku; + FixedLine aTreatAsEqual; + CheckBox aMatchCase; + CheckBox aMatchFullHalfWidth; + CheckBox aMatchHiraganaKatakana; + CheckBox aMatchContractions; + CheckBox aMatchMinusDashChoon; + CheckBox aMatchRepeatCharMarks; + CheckBox aMatchVariantFormKanji; + CheckBox aMatchOldKanaForms; + CheckBox aMatchDiziDuzu; + CheckBox aMatchBavaHafa; + CheckBox aMatchTsithichiDhizi; + CheckBox aMatchHyuiyuByuvyu; + CheckBox aMatchSesheZeje; + CheckBox aMatchIaiya; + CheckBox aMatchKiku; CheckBox aMatchProlongedSoundMark; FixedLine aIgnore; - CheckBox aIgnorePunctuation; - CheckBox aIgnoreWhitespace; + CheckBox aIgnorePunctuation; + CheckBox aIgnoreWhitespace; CheckBox aIgnoreMiddleDot; - INT32 nTransliterationFlags; - BOOL bSaveOptions; + INT32 nTransliterationFlags; + BOOL bSaveOptions; - INT32 GetTransliterationFlags_Impl(); + INT32 GetTransliterationFlags_Impl(); protected: SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -79,11 +79,11 @@ public: virtual void Reset( const SfxItemSet& rSet ); virtual BOOL FillItemSet( SfxItemSet& rSet ); - BOOL IsSaveOptions() const { return bSaveOptions; } - void EnableSaveOptions( BOOL bVal ) { bSaveOptions = bVal; } + BOOL IsSaveOptions() const { return bSaveOptions; } + void EnableSaveOptions( BOOL bVal ) { bSaveOptions = bVal; } - INT32 GetTransliterationFlags() const { return nTransliterationFlags; } - void SetTransliterationFlags( INT32 nSettings ); + INT32 GetTransliterationFlags() const { return nTransliterationFlags; } + void SetTransliterationFlags( INT32 nSettings ); }; ////////////////////////////////////////////////////////////////////// diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index 98963647e9c4..074f3a6b1bd9 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 84b080fcf395..746abd72a039 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,9 +95,9 @@ namespace css = com::sun::star; #define C2U(cChar) OUString::createFromAscii(cChar) #define SVX_MAX_USERDICTS 20 -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 static const sal_Char cSpell[] = SN_SPELLCHECKER; static const sal_Char cGrammar[] = SN_GRAMMARCHECKER; @@ -225,7 +225,7 @@ class ModuleUserData_Impl BOOL bIsChecked; BYTE nType; BYTE nIndex; - String sImplName; + String sImplName; public: ModuleUserData_Impl( String sImpName, BOOL bIsParent, BOOL bChecked, BYTE nSetType, BYTE nSetIndex ) : @@ -252,20 +252,20 @@ public: // class DicUserData { - ULONG nVal; + ULONG nVal; public: DicUserData( ULONG nUserData ) : nVal( nUserData ) {} DicUserData( USHORT nEID, BOOL bChecked, BOOL bEditable, BOOL bDeletable ); - ULONG GetUserData() const { return nVal; } - USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } - BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } - BOOL IsEditable() const { return (BOOL)(nVal >> 9) & 0x01; } - BOOL IsDeletable() const { return (BOOL)(nVal >> 10) & 0x01; } + ULONG GetUserData() const { return nVal; } + USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } + BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } + BOOL IsEditable() const { return (BOOL)(nVal >> 9) & 0x01; } + BOOL IsDeletable() const { return (BOOL)(nVal >> 10) & 0x01; } - void SetChecked( BOOL bVal ); + void SetChecked( BOOL bVal ); }; @@ -274,10 +274,10 @@ DicUserData::DicUserData( BOOL bChecked, BOOL bEditable, BOOL bDeletable ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); - nVal = ((ULONG)(0xFFFF & nEID) << 16) | - ((ULONG)(bChecked ? 1 : 0) << 8) | - ((ULONG)(bEditable ? 1 : 0) << 9) | - ((ULONG)(bDeletable ? 1 : 0) << 10); + nVal = ((ULONG)(0xFFFF & nEID) << 16) | + ((ULONG)(bChecked ? 1 : 0) << 8) | + ((ULONG)(bEditable ? 1 : 0) << 9) | + ((ULONG)(bDeletable ? 1 : 0) << 10); } @@ -342,21 +342,21 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, class OptionsBreakSet : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; + OKButton aOKPB; + CancelButton aCancelPB; FixedLine aValFL; - NumericField aValNF; + NumericField aValNF; public: OptionsBreakSet(Window* pParent, int nRID) : ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )), - aOKPB (this, CUI_RES(BT_OK_PREBREAK)), - aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)), + aOKPB (this, CUI_RES(BT_OK_PREBREAK)), + aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)), aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)), - aValNF (this, CUI_RES(ED_PREBREAK)) + aValNF (this, CUI_RES(ED_PREBREAK)) { - DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || - STR_NUM_POST_BREAK_DLG == nRID || + DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || + STR_NUM_POST_BREAK_DLG == nRID || STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" ); if (nRID != -1) @@ -364,7 +364,7 @@ public: FreeResource(); } - NumericField& GetNumericFld() { return aValNF; } + NumericField& GetNumericFld() { return aValNF; } }; @@ -391,17 +391,17 @@ enum EID_OPTIONS // It is used to get the respective property name. static const char * aEidToPropName[] = { - UPN_IS_SPELL_AUTO, // EID_SPELL_AUTO + UPN_IS_SPELL_AUTO, // EID_SPELL_AUTO UPN_IS_GRAMMAR_AUTO, // EID_GRAMMAR_AUTO - UPN_IS_SPELL_UPPER_CASE, // EID_CAPITAL_WORDS - UPN_IS_SPELL_WITH_DIGITS, // EID_WORDS_WITH_DIGITS + UPN_IS_SPELL_UPPER_CASE, // EID_CAPITAL_WORDS + UPN_IS_SPELL_WITH_DIGITS, // EID_WORDS_WITH_DIGITS UPN_IS_SPELL_CAPITALIZATION, // EID_CAPITALIZATION - UPN_IS_SPELL_SPECIAL, // EID_SPELL_SPECIAL - UPN_HYPH_MIN_WORD_LENGTH, // EID_NUM_MIN_WORDLEN, - UPN_HYPH_MIN_LEADING, // EID_NUM_PRE_BREAK - UPN_HYPH_MIN_TRAILING, // EID_NUM_POST_BREAK - UPN_IS_HYPH_AUTO, // EID_HYPH_AUTO - UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL + UPN_IS_SPELL_SPECIAL, // EID_SPELL_SPECIAL + UPN_HYPH_MIN_WORD_LENGTH, // EID_NUM_MIN_WORDLEN, + UPN_HYPH_MIN_LEADING, // EID_NUM_PRE_BREAK + UPN_HYPH_MIN_TRAILING, // EID_NUM_POST_BREAK + UPN_IS_HYPH_AUTO, // EID_HYPH_AUTO + UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL }; @@ -415,9 +415,9 @@ static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId ) class OptionsUserData { - ULONG nVal; + ULONG nVal; - void SetModified(); + void SetModified(); public: OptionsUserData( ULONG nUserData ) : nVal( nUserData ) {} @@ -425,16 +425,16 @@ public: BOOL bHasNV, USHORT nNumVal, BOOL bCheckable, BOOL bChecked ); - ULONG GetUserData() const { return nVal; } - USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } - BOOL HasNumericValue() const { return (BOOL)(nVal >> 10) & 0x01; } - USHORT GetNumericValue() const { return (USHORT)(nVal & 0xFF); } - BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } - BOOL IsCheckable() const { return (BOOL)(nVal >> 9) & 0x01; } - BOOL IsModified() const { return (BOOL)(nVal >> 11) & 0x01; } + ULONG GetUserData() const { return nVal; } + USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } + BOOL HasNumericValue() const { return (BOOL)(nVal >> 10) & 0x01; } + USHORT GetNumericValue() const { return (USHORT)(nVal & 0xFF); } + BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } + BOOL IsCheckable() const { return (BOOL)(nVal >> 9) & 0x01; } + BOOL IsModified() const { return (BOOL)(nVal >> 11) & 0x01; } - void SetChecked( BOOL bVal ); - void SetNumericValue( BYTE nNumVal ); + void SetChecked( BOOL bVal ); + void SetNumericValue( BYTE nNumVal ); }; OptionsUserData::OptionsUserData( USHORT nEID, @@ -443,10 +443,10 @@ OptionsUserData::OptionsUserData( USHORT nEID, { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); DBG_ASSERT( nNumVal < 256, "value out of range" ); - nVal = ((ULONG)(0xFFFF & nEID) << 16) | - ((ULONG)(bHasNV ? 1 : 0) << 10) | - ((ULONG)(bCheckable ? 1 : 0) << 9) | - ((ULONG)(bChecked ? 1 : 0) << 8) | + nVal = ((ULONG)(0xFFFF & nEID) << 16) | + ((ULONG)(bHasNV ? 1 : 0) << 10) | + ((ULONG)(bCheckable ? 1 : 0) << 9) | + ((ULONG)(bChecked ? 1 : 0) << 8) | ((ULONG)(0xFF & nNumVal)); } @@ -462,7 +462,7 @@ void OptionsUserData::SetChecked( BOOL bVal ) void OptionsUserData::SetNumericValue( BYTE nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); +// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -503,8 +503,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// BOOL bFett = TRUE; -// USHORT nPos = 0; +// BOOL bFett = TRUE; +// USHORT nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (ULONG) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -515,8 +515,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); +// if( STRING_NOTFOUND != nPos ) +// aNewPos.X() += rDev.GetTextWidth( sTxt ); rDev.SetFont( aOldFont ); } @@ -526,16 +526,16 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, struct ServiceInfo_Impl { - OUString sDisplayName; - OUString sSpellImplName; - OUString sHyphImplName; - OUString sThesImplName; + OUString sDisplayName; + OUString sSpellImplName; + OUString sHyphImplName; + OUString sThesImplName; OUString sGrammarImplName; uno::Reference< XSpellChecker > xSpell; uno::Reference< XHyphenator > xHyph; uno::Reference< XThesaurus > xThes; - uno::Reference< XProofreader > xGrammar; - BOOL bConfigured; + uno::Reference< XProofreader > xGrammar; + BOOL bConfigured; ServiceInfo_Impl() : bConfigured(sal_False) {} }; @@ -549,7 +549,7 @@ typedef std::map< INT16 /*LanguageType*/, Sequence< OUString > > LangImplName class SvxLinguData_Impl { //contains services and implementation names sorted by implementation names - ServiceInfoArr aDisplayServiceArr; + ServiceInfoArr aDisplayServiceArr; ULONG nDisplayServices; Sequence< Locale > aAllServiceLocales; @@ -789,7 +789,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read spell checker Sequence< OUString > aSpellNames = xLinguSrvcMgr->getAvailableServices( - C2U(cSpell), Locale() ); + C2U(cSpell), Locale() ); const OUString* pSpellNames = aSpellNames.getConstArray(); sal_Int32 nIdx; @@ -839,7 +839,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read hyphenator Sequence< OUString > aHyphNames = xLinguSrvcMgr->getAvailableServices( - C2U(cHyph), Locale() ); + C2U(cHyph), Locale() ); const OUString* pHyphNames = aHyphNames.getConstArray(); for(nIdx = 0; nIdx < aHyphNames.getLength(); nIdx++) { @@ -863,7 +863,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read thesauri Sequence< OUString > aThesNames = xLinguSrvcMgr->getAvailableServices( - C2U(cThes), Locale() ); + C2U(cThes), Locale() ); const OUString* pThesNames = aThesNames.getConstArray(); for(nIdx = 0; nIdx < aThesNames.getLength(); nIdx++) { @@ -1105,9 +1105,9 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable // class SvxLinguTabPage ------------------------------------------------- -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ): @@ -1115,31 +1115,31 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ), aLinguisticFL ( this, CUI_RES( FL_LINGUISTIC ) ), - aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ), - aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ), - aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ), + aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ), + aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ), + aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ), aLinguDicsFT ( this, CUI_RES( FT_LINGU_DICS ) ), aLinguDicsCLB ( this, CUI_RES( CLB_LINGU_DICS ) ), aLinguDicsNewPB ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ), aLinguDicsEditPB ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ), aLinguDicsDelPB ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ), - aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ), - aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ), + aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ), + aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ), aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ), aMoreDictsLink ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ), - sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ), - sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ), - sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ), - sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ), - sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ), + sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ), + sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ), + sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ), + sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ), + sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ), sGrammarAuto ( CUI_RES( STR_GRAMMAR_AUTO ) ), - sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ), - sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ), - sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ), - sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ), - sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ), + sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ), + sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ), + sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ), + sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ), + sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ), - pLinguData ( NULL ) + pLinguData ( NULL ) { pCheckButtonData = NULL; @@ -1498,7 +1498,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl() aLinguDicsCLB.SetUpdateMode(FALSE); aLinguDicsCLB.Clear(); - INT32 nDics = aDics.getLength(); + INT32 nDics = aDics.getLength(); const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); for (INT32 i = 0; i < nDics; ++i) { @@ -1547,7 +1547,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) // - // get data from configuration + // get data from configuration // SvtLinguConfig aLngCfg; @@ -1562,7 +1562,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) BOOL bVal = FALSE; ULONG nUserData = 0; - pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); + pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_AUTO) ) >>= bVal; const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); if (pItem) @@ -1582,35 +1582,35 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); + pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_UPPER_CASE) ) >>= bVal; nUserData = OptionsUserData( EID_CAPITAL_WORDS, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); + pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_WITH_DIGITS) ) >>= bVal; nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sCapitalization, CBCOL_FIRST ); + pEntry = CreateEntry( sCapitalization, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_CAPITALIZATION) ) >>= bVal; nUserData = OptionsUserData( EID_CAPITALIZATION, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); + pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_SPECIAL) ) >>= bVal; nUserData = OptionsUserData( EID_SPELL_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); + pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_WORD_LENGTH) ) >>= nVal; nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, TRUE, (USHORT)nVal, FALSE, FALSE).GetUserData(); pEntry->SetUserData( (void *)nUserData ); @@ -1621,7 +1621,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); - pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); + pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_LEADING) ) >>= nVal; if (pHyp) nVal = (INT16) pHyp->GetMinLead(); @@ -1629,7 +1629,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); - pEntry = CreateEntry( sNumPostBreak, CBCOL_SECOND ); + pEntry = CreateEntry( sNumPostBreak, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_TRAILING) ) >>= nVal; if (pHyp) nVal = (INT16) pHyp->GetMinTrail(); @@ -1637,14 +1637,14 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); - pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); + pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_HYPH_AUTO) ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_AUTO, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); + pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_HYPH_SPECIAL) ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); @@ -1884,8 +1884,8 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) int nRID = -1; switch (aData.GetEntryId()) { - case EID_NUM_PRE_BREAK : nRID = STR_NUM_PRE_BREAK_DLG; break; - case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; + case EID_NUM_PRE_BREAK : nRID = STR_NUM_PRE_BREAK_DLG; break; + 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" ); @@ -1963,8 +1963,8 @@ SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, USHORT nCol ) if (CBCOL_FIRST == nCol) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -2130,8 +2130,8 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, USHORT nCol ) if (CBCOL_FIRST == nCol) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new BrwStringDic_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -2152,7 +2152,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); if(!pData->IsParent() && pData->GetType() != TYPE_HYPH) { - USHORT nCurPos = pBox->GetSelectEntryPos(); + USHORT nCurPos = pBox->GetSelectEntryPos(); if(nCurPos < pBox->GetEntryCount() - 1) { bDisableDown = ((ModuleUserData_Impl*)pBox-> @@ -2233,7 +2233,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); +// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2299,7 +2299,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; +// sal_Int32 nEntryPos = 1; ULONG n; ServiceInfo_Impl* pInfo; @@ -2307,7 +2307,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // spellchecker entries // - SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); + SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2316,11 +2316,11 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); ULONG nNames = (ULONG) aNames.getLength(); - sal_Int32 nLocalIndex = 0; // index relative to parent + sal_Int32 nLocalIndex = 0; // index relative to parent for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2338,7 +2338,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2396,7 +2396,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // hyphenator entries // - pEntry = CreateEntry( sHyph, CBCOL_SECOND ); + pEntry = CreateEntry( sHyph, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2408,7 +2408,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2426,7 +2426,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2440,7 +2440,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // thesaurus entries // - pEntry = CreateEntry( sThes, CBCOL_SECOND ); + pEntry = CreateEntry( sThes, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2452,7 +2452,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2470,7 +2470,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2491,7 +2491,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; - USHORT nCurPos = aModulesCLB.GetSelectEntryPos(); + USHORT nCurPos = aModulesCLB.GetSelectEntryPos(); SvLBoxEntry* pEntry; if (nCurPos != LISTBOX_ENTRY_NOTFOUND && 0 != (pEntry = aModulesCLB.GetEntry(nCurPos))) diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc index 6a73b7321235..9121c68a5eed 100644 --- a/cui/source/options/optlingu.hrc +++ b/cui/source/options/optlingu.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,33 +29,33 @@ #define FL_LINGUISTIC 101 -#define FT_LINGU_MODULES 111 -#define CLB_LINGU_MODULES 112 -#define PB_LINGU_MODULES_EDIT 113 +#define FT_LINGU_MODULES 111 +#define CLB_LINGU_MODULES 112 +#define PB_LINGU_MODULES_EDIT 113 #define FT_LINGU_OPTIONS 121 #define CLB_LINGU_OPTIONS 122 #define PB_LINGU_OPTIONS_EDIT 123 #define FT_LINGU_OPTIONS_MOREDICTS 124 -#define STR_CAPITAL_WORDS 201 -#define STR_WORDS_WITH_DIGITS 202 -#define STR_CAPITALIZATION 203 -#define STR_SPELL_SPECIAL 204 -#define STR_SPELL_AUTO 206 -#define STR_NUM_PRE_BREAK 209 -#define STR_NUM_POST_BREAK 210 -#define STR_HYPH_AUTO 211 -#define STR_HYPH_SPECIAL 212 -#define STR_NUM_MIN_WORDLEN 213 +#define STR_CAPITAL_WORDS 201 +#define STR_WORDS_WITH_DIGITS 202 +#define STR_CAPITALIZATION 203 +#define STR_SPELL_SPECIAL 204 +#define STR_SPELL_AUTO 206 +#define STR_NUM_PRE_BREAK 209 +#define STR_NUM_POST_BREAK 210 +#define STR_HYPH_AUTO 211 +#define STR_HYPH_SPECIAL 212 +#define STR_NUM_MIN_WORDLEN 213 -#define STR_NUM_PRE_BREAK_DLG 214 -#define STR_NUM_POST_BREAK_DLG 215 -#define STR_NUM_MIN_WORDLEN_DLG 216 +#define STR_NUM_PRE_BREAK_DLG 214 +#define STR_NUM_POST_BREAK_DLG 215 +#define STR_NUM_MIN_WORDLEN_DLG 216 #define STR_GRAMMAR_AUTO 217 -#define STR_WARNING 63 +#define STR_WARNING 63 #define PB_OK 70 #define PB_HELP 72 @@ -71,7 +71,7 @@ #define ED_PREBREAK 308 #define PB_EDIT_MODULES_PRIO_UP 309 #define PB_EDIT_MODULES_PRIO_DOWN 310 -#define PB_EDIT_MODULES_PRIO_BACK 311 +#define PB_EDIT_MODULES_PRIO_BACK 311 #define FT_LINGU_DICS 312 #define CLB_LINGU_DICS 313 diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index be0378f171e8..3b94571b0219 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 4dcba55284bb..2ed0af30e287 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,8 +80,8 @@ using namespace ::rtl; using namespace ::sfx2; -#define NF2BYTES 104857.6 // 2^20/10, used for aNfGraphicObjectCache-unit -> Byte -#define BYTES2NF (1.0/NF2BYTES) // 10/2^20 +#define NF2BYTES 104857.6 // 2^20/10, used for aNfGraphicObjectCache-unit -> Byte +#define BYTES2NF (1.0/NF2BYTES) // 10/2^20 inline long OfaMemoryOptionsPage::GetNfGraphicCacheVal( void ) const @@ -128,8 +128,8 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ), aUndoBox ( this, CUI_RES( GB_UNDO ) ), - aUndoText ( this, CUI_RES( FT_UNDO ) ), - aUndoEdit ( this, CUI_RES( ED_UNDO ) ), + aUndoText ( this, CUI_RES( FT_UNDO ) ), + aUndoEdit ( this, CUI_RES( ED_UNDO ) ), aGbGraphicCache ( this, CUI_RES( GB_GRAPHICCACHE ) ), aFtGraphicCache ( this, CUI_RES( FT_GRAPHICCACHE ) ), aNfGraphicCache ( this, CUI_RES( NF_GRAPHICCACHE ) ), @@ -173,7 +173,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage() // ----------------------------------------------------------------------- -SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMemoryOptionsPage( pParent, rAttrSet ); } @@ -230,7 +230,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) aUndoEdit.SaveValue(); // GraphicCache - long n = aCacheOptions.GetGraphicManagerTotalCacheSize(); + long n = aCacheOptions.GetGraphicManagerTotalCacheSize(); SetNfGraphicCacheVal( n ); SetNfGraphicObjectCacheVal( Min( static_cast<sal_Int32>(GetNfGraphicCacheVal()), aCacheOptions.GetGraphicManagerObjectCacheSize() ) ); @@ -260,7 +260,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG ) { - long n = GetNfGraphicCacheVal(); + long n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); SetNfGraphicObjectCacheLast( n ); diff --git a/cui/source/options/optmemory.hrc b/cui/source/options/optmemory.hrc index 52fb7ed7c2d1..134a321263d0 100644 --- a/cui/source/options/optmemory.hrc +++ b/cui/source/options/optmemory.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,56 +31,56 @@ // defines for positions and sizes --------------------------------------- -#define WHOLE_WIDTH 248 +#define WHOLE_WIDTH 248 -#define COLSPACE RSC_SP_CTRL_DESC_X -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+140) // width text before control -#define COL3 (COL2+COLSPACE) -#define COL4 (COL3+30) // width control -#define COL5 (COL4+COLSPACE) -#define COL6 (WHOLE_WIDTH) // width text after control (unit) +#define COLSPACE RSC_SP_CTRL_DESC_X +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+140) // width text before control +#define COL3 (COL2+COLSPACE) +#define COL4 (COL3+30) // width control +#define COL5 (COL4+COLSPACE) +#define COL6 (WHOLE_WIDTH) // width text after control (unit) -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define ROW0 3 -#define ROW1 ( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW2 ( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW3 ( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW4 ( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW5 ( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW6 ( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW7 ( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW8 ( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW9 ( ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define ROW0 3 +#define ROW1 ( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW2 ( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW3 ( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW4 ( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW5 ( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW6 ( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW7 ( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW8 ( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW9 ( ROW8+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) +#define DIFF(v1,v2) (v2-v1) +#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define WIDTH1 DIFF( COL1, COL2 ) -#define WIDTH2 DIFF( COL3, COL4 ) -#define WIDTH3 DIFF( COL5, COL6 ) +#define WIDTH1 DIFF( COL1, COL2 ) +#define WIDTH2 DIFF( COL3, COL4 ) +#define WIDTH3 DIFF( COL5, COL6 ) // tabpage memory -------------------------------------------------------- -#define GB_UNDO 10 -#define FT_UNDO 11 -#define ED_UNDO 12 -#define GB_GRAPHICCACHE 13 -#define FT_GRAPHICCACHE 14 -#define FT_GRAPHICCACHE_UNIT 15 -#define FT_GRAPHICOBJECTCACHE_UNIT 16 -#define FT_GRAPHICOBJECTTIME_UNIT 17 -#define NF_GRAPHICCACHE 18 -#define FT_GRAPHICOBJECTCACHE 19 -#define NF_GRAPHICOBJECTCACHE 20 -#define FT_GRAPHICOBJECTTIME 21 -#define TF_GRAPHICOBJECTTIME 22 -#define GB_OLECACHE 23 -#define FT_OLECACHE 24 -#define NF_OLECACHE 25 -#define FL_QUICKLAUNCH 26 -#define CB_QUICKLAUNCH 27 -#define STR_QUICKLAUNCH_UNX 28 +#define GB_UNDO 10 +#define FT_UNDO 11 +#define ED_UNDO 12 +#define GB_GRAPHICCACHE 13 +#define FT_GRAPHICCACHE 14 +#define FT_GRAPHICCACHE_UNIT 15 +#define FT_GRAPHICOBJECTCACHE_UNIT 16 +#define FT_GRAPHICOBJECTTIME_UNIT 17 +#define NF_GRAPHICCACHE 18 +#define FT_GRAPHICOBJECTCACHE 19 +#define NF_GRAPHICOBJECTCACHE 20 +#define FT_GRAPHICOBJECTTIME 21 +#define TF_GRAPHICOBJECTTIME 22 +#define GB_OLECACHE 23 +#define FT_OLECACHE 24 +#define NF_OLECACHE 25 +#define FL_QUICKLAUNCH 26 +#define CB_QUICKLAUNCH 27 +#define STR_QUICKLAUNCH_UNX 28 #endif // #ifndef _OFA_OPTMEMORY_HRC diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 8068ab53aaca..0abf60e662ea 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> -#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" +#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" // class OfaMiscTabPage -------------------------------------------------- @@ -43,36 +43,36 @@ class OfaMemoryOptionsPage : public SfxTabPage using SfxTabPage::DeactivatePage; private: FixedLine aUndoBox; - FixedText aUndoText; - NumericField aUndoEdit; + FixedText aUndoText; + NumericField aUndoEdit; FixedLine aGbGraphicCache; - FixedText aFtGraphicCache; - NumericField aNfGraphicCache; + FixedText aFtGraphicCache; + NumericField aNfGraphicCache; FixedText aFtGraphicCacheUnit; - FixedText aFtGraphicObjectCache; - NumericField aNfGraphicObjectCache; + FixedText aFtGraphicObjectCache; + NumericField aNfGraphicObjectCache; FixedText aFtGraphicObjectCacheUnit; - FixedText aFtGraphicObjectTime; - TimeField aTfGraphicObjectTime; + FixedText aFtGraphicObjectTime; + TimeField aTfGraphicObjectTime; FixedText aFtGraphicObjectTimeUnit; FixedLine aGbOLECache; - FixedText aFtOLECache; - NumericField aNfOLECache; + FixedText aFtOLECache; + NumericField aNfOLECache; FixedLine aQuickLaunchFL; CheckBox aQuickLaunchCB; DECL_LINK( GraphicCacheConfigHdl, NumericField* ); - inline long GetNfGraphicCacheVal( void ) const; // returns # of Bytes - inline void SetNfGraphicCacheVal( long nSizeInBytes ); + inline long GetNfGraphicCacheVal( void ) const; // returns # of Bytes + inline void SetNfGraphicCacheVal( long nSizeInBytes ); - long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes - void SetNfGraphicObjectCacheVal( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); + long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes + void SetNfGraphicObjectCacheVal( long nSizeInBytes ); + inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); + inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ); @@ -80,10 +80,10 @@ public: OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~OfaMemoryOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index 557fa6a8d960..37f4563e66e9 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5a4f22495629..8b6b8f64af51 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/filedlghelper.hxx> @@ -76,9 +76,9 @@ using namespace svx; // define ---------------------------------------------------------------- -#define TAB_WIDTH1 80 +#define TAB_WIDTH1 80 #define TAB_WIDTH_MIN 10 -#define TAB_WIDTH2 1000 +#define TAB_WIDTH2 1000 #define ITEMID_TYPE 1 #define ITEMID_PATH 2 @@ -87,7 +87,7 @@ using namespace svx; #define POSTFIX_WRITABLE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) ) #define POSTFIX_READONLY String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_readonly" ) ) #define VAR_ONE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) ) -#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) +#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) // struct OptPath_Impl --------------------------------------------------- @@ -218,14 +218,14 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ), - aStdBox ( this, CUI_RES( GB_STD ) ), - aTypeText ( this, CUI_RES( FT_TYPE ) ), - aPathText ( this, CUI_RES( FT_PATH ) ), - aPathCtrl ( this, CUI_RES( LB_PATH ) ), - aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), - aPathBtn ( this, CUI_RES( BTN_PATH ) ), - pHeaderBar ( NULL ), - pPathBox ( NULL ), + aStdBox ( this, CUI_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), + aPathBtn ( this, CUI_RES( BTN_PATH ) ), + pHeaderBar ( NULL ), + pPathBox ( NULL ), pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ), xDialogListener ( new ::svt::DialogClosedListener() ) @@ -291,7 +291,7 @@ SvxPathTabPage::~SvxPathTabPage() // ----------------------------------------------------------------------- -SfxTabPage* SvxPathTabPage::Create( Window* pParent, +SfxTabPage* SvxPathTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxPathTabPage( pParent, rAttrSet ) ); @@ -374,7 +374,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) HeaderEndDrag_Impl( NULL ); // Sortierrichtung restaurieren BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32(); - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); if ( bUp ) { @@ -398,7 +398,7 @@ void SvxPathTabPage::FillUserData() { String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) ); aUserData += ';'; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? '1' : '0'; SetUserData( aUserData ); @@ -408,7 +408,7 @@ void SvxPathTabPage::FillUserData() IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -640,7 +640,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >( xFactory->createInstance( aService ), UNO_QUERY ); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); +// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL( sWritable, INET_PROT_FILE ); xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -673,7 +673,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE ) return 0; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; diff --git a/cui/source/options/optpath.hrc b/cui/source/options/optpath.hrc index c32919308842..bb7abf2c4284 100644 --- a/cui/source/options/optpath.hrc +++ b/cui/source/options/optpath.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,12 +29,12 @@ // defines --------------------------------------------------------------- -#define FT_TYPE 10 -#define FT_PATH 11 -#define LB_PATH 12 -#define BTN_PATH 13 -#define BTN_STANDARD 14 -#define GB_STD 15 +#define FT_TYPE 10 +#define FT_PATH 11 +#define LB_PATH 12 +#define BTN_PATH 13 +#define BTN_STANDARD 14 +#define GB_STD 15 #define IMG_LOCK 16 #define IMG_LOCK_HC 17 #define STR_MULTIPATHDLG 18 diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 6b02abb5764a..22e4557204eb 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ TabPage RID_SFXPAGE_PATH { Pos = MAP_APPFONT ( 115 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; - Text [ en-US ] = "~Default" ; + Text [ en-US ] = "~Default" ; }; FixedLine GB_STD { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 261390df80c5..8ca887306f99 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem SvxAlienFilterWarningConfig_Impl(); ~SvxAlienFilterWarningConfig_Impl(); - virtual void Commit(); + virtual void Commit(); void ResetWarning() { @@ -206,7 +206,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : aBackupFI ( this, CUI_RES( FI_BACKUP ) ), aBackupCB ( this, CUI_RES( BTN_BACKUP ) ), aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ), - aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ), + aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ), aMinuteFT ( this, CUI_RES( FT_MINUTE ) ), aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ), aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ), @@ -319,7 +319,7 @@ SfxSaveTabPage::~SfxSaveTabPage() // ----------------------------------------------------------------------- -SfxTabPage* SfxSaveTabPage::Create( Window* pParent, +SfxTabPage* SfxSaveTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SfxSaveTabPage( pParent, rAttrSet ) ); @@ -584,13 +584,13 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) String sReplace; switch(nData) { - case APP_WRITER : sReplace = C2U("com.sun.star.text.TextDocument"); break; - case APP_WRITER_WEB : sReplace = C2U("com.sun.star.text.WebDocument"); break; + case APP_WRITER : sReplace = C2U("com.sun.star.text.TextDocument"); break; + case APP_WRITER_WEB : sReplace = C2U("com.sun.star.text.WebDocument"); break; case APP_WRITER_GLOBAL : sReplace = C2U("com.sun.star.text.GlobalDocument"); break; - case APP_CALC : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break; - 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; + case APP_CALC : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break; + 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"); } String sTmp(sCommand); @@ -676,7 +676,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); +// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -693,14 +693,14 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); +// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); +// aAutoSavePromptBtn.Disable(); } } return 0; diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc index 4cbdc0e2db4b..6ded85c61a3c 100644 --- a/cui/source/options/optsave.hrc +++ b/cui/source/options/optsave.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 519438a245b6..1a258d1d7109 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,12 +96,12 @@ public: SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSaveTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; -#endif // #ifndef _SVX_OPTSAVE_HXX +#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 36fc60e94435..1a44118d6779 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optspell.hrc b/cui/source/options/optspell.hrc index c2f71de15d69..446b2adbb8ab 100644 --- a/cui/source/options/optspell.hrc +++ b/cui/source/options/optspell.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,16 +27,16 @@ // defines --------------------------------------------------------------- -#define BTN_OK 10 -#define BTN_CANCEL 11 -#define BTN_BOOK 12 +#define BTN_OK 10 +#define BTN_CANCEL 11 +#define BTN_BOOK 12 -#define LB_BOOK 20 -#define GB_BOOK 21 +#define LB_BOOK 20 +#define GB_BOOK 21 -#define BTN_CAPS 30 -#define BTN_NUMS 31 -#define BTN_UPLOW 32 -#define GB_AUDIT 33 +#define BTN_CAPS 30 +#define BTN_NUMS 31 +#define BTN_UPLOW 32 +#define GB_AUDIT 33 diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index e4241d4e4bb4..bd242a87d0d7 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 131e3bbda5d9..ca1a9acc10b9 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe // dynamical length of the PushButtons CalcButtonWidth(); - + m_aLastCheckedTemplate = m_aLastChecked.GetText(); UpdateLastCheckedText(); @@ -137,7 +137,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() Date aDate; Time aTime; - + lastCheckedTV.Seconds = (sal_uInt32) lastChecked; osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV ); @@ -168,7 +168,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() sal_Int32 nIndex = aText.indexOf( UNISTRING( "%DATE%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aDateStr ); - + nIndex = aText.indexOf( UNISTRING( "%TIME%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aTimeStr ); diff --git a/cui/source/options/optupdt.hrc b/cui/source/options/optupdt.hrc index d301aa07319f..9848f6383579 100644 --- a/cui/source/options/optupdt.hrc +++ b/cui/source/options/optupdt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 516b83e08b4c..e394105ca704 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,17 +53,17 @@ private: FixedText m_aLastChecked; rtl::OUString m_aNeverChecked; rtl::OUString m_aLastCheckedTemplate; - + DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; DECL_LINK( CheckNowHdl_Impl, PushButton* ) ; DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ; - + void CalcButtonWidth(); - + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xUpdateAccess; - void UpdateLastCheckedText(); - + void UpdateLastCheckedText(); + public: SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxOnlineUpdateTabPage(); diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index 094e23c2e60a..f71273c5a0e0 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,19 +54,19 @@ TabPage RID_SVXPAGE_ONLINEUPDATE RadioButton RB_EVERYDAY { Pos = MAP_APPFONT ( 18, 27 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every Da~y" ; }; RadioButton RB_EVERYWEEK { Pos = MAP_APPFONT ( 18, 40 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Week" ; }; RadioButton RB_EVERYMONTH { Pos = MAP_APPFONT ( 18, 53 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Month" ; }; FixedText FT_LASTCHECKED diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 4b7debb7a549..a1cf73cb7795 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index 0a301c05eb89..a40d7b71a2fd 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) String aStr(ReadOnlyImage::GetHelpTip()); if ( Help::IsBalloonHelpEnabled() ) - Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, + Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, aStr ); else if ( Help::IsQuickHelpEnabled() ) Help::ShowQuickHelp( this, aScreenRect, aStr ); diff --git a/cui/source/options/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx index 460d744433d0..d10b492e9e3a 100644 --- a/cui/source/options/readonlyimage.hxx +++ b/cui/source/options/readonlyimage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ class ReadOnlyImage : public FixedImage public: ReadOnlyImage(Window* pParent, const ResId rResId); ~ReadOnlyImage(); - + virtual void RequestHelp( const HelpEvent& rHEvt ); static const String& GetHelpTip(); -}; -#endif // +}; +#endif // /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index bd63c32771e7..d489e7c6a444 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index f092c3d3f72e..91075daea50c 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace offapp class ODriverEnumerationImpl { protected: - ::std::vector< ::rtl::OUString > m_aImplNames; + ::std::vector< ::rtl::OUString > m_aImplNames; public: ODriverEnumerationImpl(); @@ -124,7 +124,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index 1b57ba0bef9c..c84cfb9d26ae 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,20 +56,20 @@ namespace offapp class ODriverEnumeration { private: - ODriverEnumerationImpl* m_pImpl; + ODriverEnumerationImpl* m_pImpl; public: ODriverEnumeration() throw(); ~ODriverEnumeration() throw(); typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator; - const_iterator begin() const throw(); - const_iterator end() const throw(); + const_iterator begin() const throw(); + const_iterator end() const throw(); sal_Int32 size() const throw(); }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_ diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index da088606c9e3..6330807565d4 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/securityoptions.hrc b/cui/source/options/securityoptions.hrc index 8b657b3a22fd..39359de061ef 100644 --- a/cui/source/options/securityoptions.hrc +++ b/cui/source/options/securityoptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index dd833da0cf8f..3a607b332dd3 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index de7d7b23dc37..cff58746cb48 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index df35f40fa435..241909ece8db 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ #include <svx/dialogs.hrc> #ifndef _SVX_LANGITEM_HXX -#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE +#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE #include <editeng/langitem.hxx> #endif @@ -154,15 +154,15 @@ using namespace ::com::sun::star::util; #endif #define HINT_TIMEOUT 200 -#define SELECT_FIRST_TIMEOUT 0 -#define SELECT_TIMEOUT 300 -#define COLORPAGE_UNKNOWN ((sal_uInt16)0xFFFF) +#define SELECT_FIRST_TIMEOUT 0 +#define SELECT_TIMEOUT 300 +#define COLORPAGE_UNKNOWN ((sal_uInt16)0xFFFF) #define EXPAND_PROTOCOL "vnd.sun.star.expand:" LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; // some stuff for easier changes for SvtViewOptions -static const sal_Char* pViewOptDataName = "page data"; +static const sal_Char* pViewOptDataName = "page data"; #define VIEWOPT_DATANAME rtl::OUString::createFromAscii( pViewOptDataName ) static XOutdevItemPool* mpStaticXOutdevItemPool = 0L; @@ -337,47 +337,47 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUStri } //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); -SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) { CreateTabPage fnCreate = 0; switch(nId) { - case RID_SFXPAGE_SAVE: fnCreate = &SvxSaveTabPage::Create; break; - case RID_SFXPAGE_PATH: fnCreate = &SvxPathTabPage::Create; break; - case RID_SFXPAGE_GENERAL: fnCreate = &SvxGeneralTabPage::Create; break; - case RID_SFXPAGE_PRINTOPTIONS: fnCreate = &SfxCommonPrintOptionsTabPage::Create; break; - case OFA_TP_LANGUAGES: fnCreate = &OfaLanguagesTabPage::Create; break; - case RID_SFXPAGE_LINGU: fnCreate = &SvxLinguTabPage::Create; break; - case RID_SVXPAGE_COLOR: fnCreate = &SvxColorTabPage::Create; break; - case OFA_TP_VIEW: fnCreate = &OfaViewTabPage::Create; break; - case OFA_TP_MISC: fnCreate = &OfaMiscTabPage::Create; break; - case OFA_TP_MEMORY: fnCreate = &OfaMemoryOptionsPage::Create; break; - case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break; - case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break; - case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; - case RID_SVXPAGE_INET_SEARCH: fnCreate = &SvxSearchTabPage::Create; break; - case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; - case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; - case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break; - case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; - case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; - case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; - case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; - case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; - case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; - case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; - case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break; - case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; + case RID_SFXPAGE_SAVE: fnCreate = &SvxSaveTabPage::Create; break; + case RID_SFXPAGE_PATH: fnCreate = &SvxPathTabPage::Create; break; + case RID_SFXPAGE_GENERAL: fnCreate = &SvxGeneralTabPage::Create; break; + case RID_SFXPAGE_PRINTOPTIONS: fnCreate = &SfxCommonPrintOptionsTabPage::Create; break; + case OFA_TP_LANGUAGES: fnCreate = &OfaLanguagesTabPage::Create; break; + case RID_SFXPAGE_LINGU: fnCreate = &SvxLinguTabPage::Create; break; + case RID_SVXPAGE_COLOR: fnCreate = &SvxColorTabPage::Create; break; + case OFA_TP_VIEW: fnCreate = &OfaViewTabPage::Create; break; + case OFA_TP_MISC: fnCreate = &OfaMiscTabPage::Create; break; + case OFA_TP_MEMORY: fnCreate = &OfaMemoryOptionsPage::Create; break; + case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break; + case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break; + case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; + case RID_SVXPAGE_INET_SEARCH: fnCreate = &SvxSearchTabPage::Create; break; + case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; + case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; + case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break; + case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; + case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; + case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; + case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; + case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; + case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; + 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; + 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; + 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; case RID_SVXPAGE_IMPROVEMENT: fnCreate = &SvxImprovementOptionsPage::Create; break; } - SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; + SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; return pRet; } @@ -697,9 +697,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( } /* -----------------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, +sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, SfxShell* pCreateShell, SfxModule* pCreateModule, sal_uInt16 nDialogId ) @@ -1023,7 +1023,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() /* -----------------22.02.99 08:52------------------- * * --------------------------------------------------*/ -long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) +long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -1203,7 +1203,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) } } -// if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS ) +// if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS ) { if(!pGroupInfo->m_pInItemSet) pGroupInfo->m_pInItemSet = pGroupInfo->m_pShell @@ -1494,7 +1494,7 @@ BOOL EnableSSO( void ) theBackendServiceTypeValue ); BOOL bSSOEnabled = - ( theOfflineValue == theDefaultOfflineValue && + ( theOfflineValue == theDefaultOfflineValue && ( theServerTypeValue.getLength() == 0 || theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) && theBackendServiceTypeValue == @@ -1527,10 +1527,10 @@ CreateTabPage GetSSOCreator( void ) return theSymbol; } -SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) +SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) { Reference< XPropertySet > xProp( SvxGetLinguPropertySet() ); - SfxItemSet* pRet = 0; + SfxItemSet* pRet = 0; switch(nId) { case SID_GENERAL_OPTIONS: @@ -1548,7 +1548,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SFX_APP()->GetOptions(aOptSet); pRet->Put(aOptSet); - utl::MiscCfg aMisc; + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if ( pViewFrame ) @@ -1589,7 +1589,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) pRet->Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL )); SfxHyphenRegionItem aHyphen( SID_ATTR_HYPHENREGION ); - sal_Int16 nMinLead = 2, + sal_Int16 nMinLead = 2, nMinTrail = 2; if (xProp.is()) { @@ -1683,7 +1683,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet { case SID_GENERAL_OPTIONS: { - utl::MiscCfg aMisc; + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER ); aOptSet.Put(rSet); @@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet // Dispatcher neu holen, weil SetOptions() ggf. den Dispatcher zerst"ort hat SfxViewFrame *pViewFrame = SfxViewFrame::Current(); // ------------------------------------------------------------------------- -// Year2000 auswerten +// Year2000 auswerten // ------------------------------------------------------------------------- USHORT nY2K = USHRT_MAX; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) ) @@ -1708,7 +1708,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet } // ------------------------------------------------------------------------- -// Drucken auswerten +// Drucken auswerten // ------------------------------------------------------------------------- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem)) aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); @@ -1720,7 +1720,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); } // ------------------------------------------------------------------------- -// evaluate help options +// evaluate help options // ------------------------------------------------------------------------- if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() ) SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp(); @@ -2206,27 +2206,27 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) continue; #endif -#ifdef LINUX - // Disable Mozilla Plug-in tab-page on Linux if we find a - // globally installed plugin - if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { - struct stat sb; - char *p; - bool bHaveSystemWidePlugin = false; - char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; - - p = strtok(mozpaths, ":"); - while (p != NULL) { - if (stat(p, &sb) != -1) { - bHaveSystemWidePlugin = true; - break; - } - p = strtok(NULL, ":"); - } - - if (bHaveSystemWidePlugin == true) - continue; - } +#ifdef LINUX + // Disable Mozilla Plug-in tab-page on Linux if we find a + // globally installed plugin + if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { + struct stat sb; + char *p; + bool bHaveSystemWidePlugin = false; + char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; + + p = strtok(mozpaths, ":"); + while (p != NULL) { + if (stat(p, &sb) != -1) { + bHaveSystemWidePlugin = true; + break; + } + p = strtok(NULL, ":"); + } + + if (bHaveSystemWidePlugin == true) + continue; + } #endif AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); } @@ -2242,7 +2242,7 @@ namespace { void MoveControl( Control& _rCtrl, long _nDeltaPixel ) { - Point aPt( _rCtrl.GetPosPixel() ); + Point aPt( _rCtrl.GetPosPixel() ); aPt.X() += _nDeltaPixel; _rCtrl.SetPosPixel( aPt ); } @@ -2257,10 +2257,10 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) const long nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width(); const long nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width(); - SvTreeList* pTreeList = aTreeLB.GetModel(); + SvTreeList* pTreeList = aTreeLB.GetModel(); DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" ); - SvListEntry* pEntry = pTreeList->First(); + SvListEntry* pEntry = pTreeList->First(); while( pEntry ) { long n = aTreeLB.GetTextWidth( aTreeLB.GetEntryText( static_cast< SvLBoxEntry* >( pEntry ) ) ); @@ -2272,14 +2272,14 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) pEntry = pTreeList->Next( pEntry, &nDepth ); } - nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width(); // + extra space [logic] - nDelta += GetSettings().GetStyleSettings().GetScrollBarSize(); // + scroll bar, in case it's needed + nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width(); // + extra space [logic] + nDelta += GetSettings().GetStyleSettings().GetScrollBarSize(); // + scroll bar, in case it's needed if( nDelta > nMax ) nDelta = nMax; // starting resizing with this - Size aSize( GetSizePixel() ); + Size aSize( GetSizePixel() ); aSize.Width() += nDelta; SetSizePixel( aSize ); diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 88e9697ce38b..ea8da73a270a 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,30 +27,30 @@ #include <svtools/controldims.hrc> -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 -#define PB_BACK 4 -#define TLB_PAGES 5 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 +#define PB_BACK 4 +#define TLB_PAGES 5 #define FT_HELPTEXT 6 #define STR_HELPTEXTS 7 -#define IMG_LIST 8 +#define IMG_LIST 8 #define IMG_HELP 9 -#define FT_PAGE_TITLE 10 +#define FT_PAGE_TITLE 10 #define FL_LINE_1 11 -#define BMP_ROOT_CLOSED 17 +#define BMP_ROOT_CLOSED 17 #define BMP_ROOT_OPENED 18 #define FB_BORDER 19 -#define IMG_HINT 20 -#define FT_HINT 21 -#define CB_DISABLE 22 -#define BTN_HINT 23 -#define ST_LOAD_ERROR 24 +#define IMG_HINT 20 +#define FT_HINT 21 +#define CB_DISABLE 22 +#define BTN_HINT 23 +#define ST_LOAD_ERROR 24 #define STR_GENERAL_PAGES_START 1 -#define STR_GENERAL (STR_GENERAL_PAGES_START) +#define STR_GENERAL (STR_GENERAL_PAGES_START) #define STR_MISC_PAGE (STR_GENERAL_PAGES_START + 1) #define STR_DESKTOP_PAGE (STR_GENERAL_PAGES_START + 2) #define STR_VIEW_PAGE (STR_GENERAL_PAGES_START + 3) @@ -67,34 +67,34 @@ // metrics -#define WIDTH_PAGEFRAME 263 -#define HEIGHT_PAGEFRAME 191 -#define WIDTH_IMG_HELP 25 -#define HEIGHT_IMG_HELP 30 +#define WIDTH_PAGEFRAME 263 +#define HEIGHT_PAGEFRAME 191 +#define WIDTH_IMG_HELP 25 +#define HEIGHT_IMG_HELP 30 -#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define COL_2 (COL_1+0) -#define COL_3 (COL_2+RSC_SP_GRP_SPACE_X) -#define COL_11 (COL_3+WIDTH_PAGEFRAME) -#define COL_12 (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT) -#define COL_10 (COL_11-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_9 (COL_10-RSC_SP_CTRL_GROUP_X) -#define COL_8 (COL_9-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_7 (COL_8-RSC_SP_CTRL_GROUP_X) -#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X) -#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT) -#define COL_3_3 (COL_3_1+WIDTH_IMG_HELP) -#define COL_3_5 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT) +#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) +#define COL_2 (COL_1+0) +#define COL_3 (COL_2+RSC_SP_GRP_SPACE_X) +#define COL_11 (COL_3+WIDTH_PAGEFRAME) +#define COL_12 (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT) +#define COL_10 (COL_11-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_9 (COL_10-RSC_SP_CTRL_GROUP_X) +#define COL_8 (COL_9-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_7 (COL_8-RSC_SP_CTRL_GROUP_X) +#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X) +#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT) +#define COL_3_3 (COL_3_1+WIDTH_IMG_HELP) +#define COL_3_5 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT) -#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) -#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) -#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) -#define ROW_4 (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT) -#define ROW_5 (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM) -#define ROW_1_1 (ROW_1+2) -#define ROW_1_2 (ROW_1+12) -#define ROW_1_3 (ROW_1_1+HEIGHT_IMG_HELP+2) -#define ROW_1_4 (ROW_1_3+8) +#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) +#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) +#define ROW_4 (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT) +#define ROW_5 (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM) +#define ROW_1_1 (ROW_1+2) +#define ROW_1_2 (ROW_1+12) +#define ROW_1_3 (ROW_1_1+HEIGHT_IMG_HELP+2) +#define ROW_1_4 (ROW_1_3+8) diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index cb9c3767baa4..62f1c29b8e77 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,7 +202,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ; < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ; < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; + < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ; < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ; @@ -217,9 +217,9 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ; < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ; < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ; - < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; - < "Background" ; RID_SW_TP_BACKGROUND ; > ; + < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; + < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; + < "Background" ; RID_SW_TP_BACKGROUND ; > ; }; }; StringArray SID_SM_EDITOPTIONS @@ -235,16 +235,16 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Calc" ; 0; > ; - < "General" ; SID_SC_TP_LAYOUT ;> ; - < "View" ; SID_SC_TP_CONTENT ;> ; - < "International" ; RID_OFA_TP_INTERNATIONAL ;> ; - < "Calculate" ; SID_SC_TP_CALC ;> ; + < "General" ; SID_SC_TP_LAYOUT ;> ; + < "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 ;> ; + < "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 ;> ; + < "Grid" ; SID_SC_TP_GRID ;> ; + < "Print" ; RID_SC_TP_PRINT ;> ; }; }; StringArray SID_SD_EDITOPTIONS @@ -252,10 +252,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Impress" ; 0; > ; - < "General"; SID_SI_TP_MISC ; > ; - < "View" ; SID_SI_TP_CONTENTS ; > ; - < "Grid" ; SID_SI_TP_SNAP ; > ; - < "Print" ; SID_SI_TP_PRINT ; > ; + < "General"; SID_SI_TP_MISC ; > ; + < "View" ; SID_SI_TP_CONTENTS ; > ; + < "Grid" ; SID_SI_TP_SNAP ; > ; + < "Print" ; SID_SI_TP_PRINT ; > ; }; }; StringArray SID_SD_GRAPHIC_OPTIONS @@ -263,10 +263,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Draw" ; 0; > ; - < "General" ; SID_SD_TP_MISC ; > ; - < "View" ; SID_SD_TP_CONTENTS ; > ; - < "Grid" ; SID_SD_TP_SNAP ; > ; - < "Print" ; SID_SD_TP_PRINT ; > ; + < "General" ; SID_SD_TP_MISC ; > ; + < "View" ; SID_SD_TP_CONTENTS ; > ; + < "Grid" ; SID_SD_TP_SNAP ; > ; + < "Print" ; SID_SD_TP_PRINT ; > ; }; }; StringArray SID_SCH_EDITOPTIONS @@ -274,7 +274,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "Charts" ; 0; > ; - < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; + < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; }; }; StringArray SID_FILTER_DLG diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 2c9a7ebbdd7c..1bf84960b642 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,7 +202,7 @@ void WebConnectionInfoDialog::FillPasswordList() uno::Sequence< task::UrlRecord > aURLEntries = xPasswdContainer->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; for ( sal_Int32 nURLInd = 0; nURLInd < aURLEntries.getLength(); nURLInd++ ) - { + { for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ ) { ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url ); @@ -216,10 +216,10 @@ void WebConnectionInfoDialog::FillPasswordList() // remember pos of first url container entry. m_nPos = nCount; - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) @@ -249,7 +249,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); @@ -260,7 +260,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) } else { - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); xUrlContainer->removeUrl( aURL ); } @@ -280,20 +280,20 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG { uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); // should the master password be requested before? xPasswdContainer->removeAllPersistent(); - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) - xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); - + xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); + m_aPasswordsLB.Clear(); } catch( uno::Exception& ) @@ -313,15 +313,15 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 ); - ::comphelper::DocPasswordRequest* pPasswordRequest + ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, + ::comphelper::DocPasswordRequestType_STANDARD, task::PasswordRequestMode_PASSWORD_CREATE, aURL ); uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), uno::UNO_QUERY_THROW ); xInteractionHandler->handle( rRequest ); @@ -334,10 +334,10 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); - xPasswdContainer->addPersistent( + xPasswdContainer->addPersistent( aURL, aUserName, aPasswd, xInteractionHandler ); } } @@ -361,7 +361,7 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) { m_aRemoveBtn.Enable( TRUE ); - // url container entries (-> use system credentials) have + // url container entries (-> use system credentials) have // no password sal_Int32 nPos = (sal_Int32)(sal_IntPtr)pEntry->GetUserData(); m_aChangeBtn.Enable( nPos < m_nPos ); diff --git a/cui/source/options/webconninfo.hrc b/cui/source/options/webconninfo.hrc index 85cbf35afc2d..1b1bcf53dcf1 100644 --- a/cui/source/options/webconninfo.hrc +++ b/cui/source/options/webconninfo.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index bf2b0003922d..47faba097434 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src index 68560c1ecaa7..17494aa985a8 100644 --- a/cui/source/options/webconninfo.src +++ b/cui/source/options/webconninfo.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 91dd75b57d83..6e7511dbfd52 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index f58e9ac221bc..1a38c86bd451 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ // image list for ValueSets: #define IL_LOCK_BMPS 1100 -#define IL_LOCK_BMPS_HC 1101 +#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 d7d267991073..efe36314904e 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 10797c780615..e1ddae065a1c 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,8 +87,8 @@ static ::com::sun::star::uno::Reference< OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet), - aLanguageFT( this, CUI_RES(FT_LANG )), - aLanguageLB( this, CUI_RES(LB_LANG )) + aLanguageFT( this, CUI_RES(FT_LANG )), + aLanguageLB( this, CUI_RES(LB_LANG )) { BOOL bShowSWOptions = FALSE; BOOL bOpenSmartTagOptions = FALSE; @@ -133,14 +133,14 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : AddTabPage(RID_OFAPAGE_AUTOCORR_REPLACE, OfaAutocorrReplacePage::Create, 0); AddTabPage(RID_OFAPAGE_AUTOCORR_EXCEPT, OfaAutocorrExceptPage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, OfaQuoteTabPage::Create, 0); + AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, OfaQuoteTabPage::Create, 0); // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType //! will be set to LANGUAGE_DONTKNOW sal_Int16 nLangList = LANG_LIST_WESTERN; - - if( SvtLanguageOptions().IsCTLFontEnabled() ) + + if( SvtLanguageOptions().IsCTLFontEnabled() ) nLangList |= LANG_LIST_CTL; aLanguageLB.SetLanguageList( nLangList, TRUE, TRUE ); aLanguageLB.SelectLanguage( LANGUAGE_NONE ); @@ -202,7 +202,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) //alte Einstellungen speichern und neu fuellen if(eNewLang != eLastDialogLanguage) { - USHORT nPageId = GetCurPageId(); + USHORT nPageId = GetCurPageId(); if(RID_OFAPAGE_AUTOCORR_REPLACE == nPageId) ((OfaAutocorrReplacePage*)GetTabPage( nPageId ))->SetLanguage(eNewLang); else if(RID_OFAPAGE_AUTOCORR_EXCEPT == nPageId) @@ -217,15 +217,15 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS )), + aCheckLB (this, CUI_RES(CLB_SETTINGS )), - sInput (CUI_RES(ST_USE_REPLACE )), + sInput (CUI_RES(ST_USE_REPLACE )), sDoubleCaps (CUI_RES(ST_CPTL_STT_WORD )), sStartCap (CUI_RES(ST_CPTL_STT_SENT )), 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(); @@ -247,7 +247,7 @@ OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrOptionsPage(pParent, rSet); @@ -263,13 +263,13 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) long nFlags = pAutoCorrect->GetFlags(); USHORT nPos = 0; - pAutoCorrect->SetAutoCorrFlag(Autocorrect, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(Autocorrect, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, aCheckLB.IsChecked(nPos++)); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); @@ -285,7 +285,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) /* -----------------23.11.98 16:15------------------- * * --------------------------------------------------*/ -void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE); } @@ -333,8 +333,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) struct ImpUserData { - String *pString; - Font* pFont; + String *pString; + Font* pFont; ImpUserData(String* pText, Font* pFnt) { pString = pText; pFont = pFnt;} @@ -343,28 +343,28 @@ struct ImpUserData /*********************************************************************/ /* */ -/* Dialog fuer Prozenteinstellung */ +/* Dialog fuer Prozenteinstellung */ /* */ /*********************************************************************/ class OfaAutoFmtPrcntSet : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; - FixedLine aPrcntFL; - MetricField aPrcntMF; + OKButton aOKPB; + CancelButton aCancelPB; + FixedLine aPrcntFL; + MetricField aPrcntMF; public: OfaAutoFmtPrcntSet(Window* pParent) : ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)), - aOKPB(this, CUI_RES(BT_OK)), - aCancelPB(this, CUI_RES(BT_CANCEL)), - aPrcntFL(this, CUI_RES(FL_PRCNT)), - aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN)) + aOKPB(this, CUI_RES(BT_OK)), + aCancelPB(this, CUI_RES(BT_CANCEL)), + aPrcntFL(this, CUI_RES(FL_PRCNT)), + aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN)) { FreeResource(); } - MetricField& GetPrcntFld(){return aPrcntMF;} + MetricField& GetPrcntFld(){return aPrcntMF;} }; @@ -432,13 +432,13 @@ void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, USHORT /* /*********************************************************************/ /* */ -/* TabPage Autoformat anwenden */ +/* TabPage Autoformat anwenden */ /* */ /*********************************************************************/ -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 enum OfaAutoFmtOptions { @@ -465,32 +465,32 @@ enum OfaAutoFmtOptions OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS)), - aEditPB (this, CUI_RES(PB_EDIT)), - aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)), - aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)), - sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), - sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), - sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), - sUserStyle (CUI_RES( ST_USER_STYLE )), - sBullet (CUI_RES( ST_BULLET )), - sBoldUnder (CUI_RES( ST_BOLD_UNDER )), - sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), + aCheckLB (this, CUI_RES(CLB_SETTINGS)), + aEditPB (this, CUI_RES(PB_EDIT)), + aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)), + aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)), + sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), + sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), + sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), + sUserStyle (CUI_RES( ST_USER_STYLE )), + 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 )), - sNum (CUI_RES( STR_NUM )), - sBorder (CUI_RES( STR_BORDER )), - sTable (CUI_RES( STR_TABLE )), - sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)), - sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)), + sDetectURL (CUI_RES( ST_DETECT_URL )), + sDash (CUI_RES( ST_DASH )), + sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), + sNum (CUI_RES( STR_NUM )), + sBorder (CUI_RES( STR_BORDER )), + sTable (CUI_RES( STR_TABLE )), + sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)), + sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)), sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)), - nPercent ( 50 ), + nPercent ( 50 ), pCheckButtonData( NULL ) { @@ -525,7 +525,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, /* */ /*********************************************************************/ -SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; @@ -535,16 +535,16 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) aCheckLB.SetCheckButtonData( pCheckButtonData ); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! String sEmpty; if (nCol == CBCOL_SECOND) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (nCol == CBCOL_FIRST) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) ); @@ -698,7 +698,7 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) /* -----------------23.11.98 16:15------------------- * * --------------------------------------------------*/ -void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) +void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE); } @@ -719,47 +719,47 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) // Die folgenden Eintraege muessen in der selben Reihenfolge, wie im // OfaAutoFmtOptions-enum eingefuegt werden! - aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND)); + 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)); - aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); - - aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); - aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect)); - aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd ); - aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) ); - aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc ); - aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); - 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.GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); + + aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); + aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect)); + aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd ); + aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) ); + aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc ); + aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); + 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 ); - aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); - aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); - aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd ); - aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); - aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); - aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); - aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); - aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); + 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 ); + aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); + aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); + aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd ); + aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); + aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); + aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); + aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); + aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); aBulletFont = pOpt->aBulletFont; sBulletChar = pOpt->cBullet; @@ -773,7 +773,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) pUserData = new ImpUserData(&sMargin, 0); aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData ); - aCheckLB.CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); + aCheckLB.CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); aByInputBulletFont = pOpt->aByInputBulletFont; sByInputBulletChar = pOpt->cByInputBullet; @@ -781,9 +781,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.SetUserData( APPLY_NUMBERING , pUserData2 ); aCheckLB.CheckEntryPos( MERGE_SINGLE_LINE_PARA, CBCOL_FIRST, pOpt->bRightMargin ); - aCheckLB.CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder ); - aCheckLB.CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); - aCheckLB.CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); + aCheckLB.CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder ); + aCheckLB.CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); + aCheckLB.CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); aCheckLB.SetUpdateMode(TRUE); } @@ -972,9 +972,9 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) * --------------------------------------------------*/ struct DoubleString { - String sShort; - String sLong; - void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext + String sShort; + String sLong; + void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext }; typedef DoubleString* DoubleStringPtr; SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4) @@ -1004,10 +1004,10 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet), aTextOnlyCB( this, CUI_RES(CB_TEXT_ONLY )), aShortFT ( this, CUI_RES(FT_SHORT )), - aShortED ( this, CUI_RES(ED_SHORT )), - aReplaceFT( this, CUI_RES(FT_REPLACE )), - aReplaceED( this, CUI_RES(ED_REPLACE )), - aReplaceTLB( this, CUI_RES(TLB_REPLACE )), + aShortED ( this, CUI_RES(ED_SHORT )), + aReplaceFT( this, CUI_RES(FT_REPLACE )), + aReplaceED( this, CUI_RES(ED_REPLACE )), + aReplaceTLB( this, CUI_RES(TLB_REPLACE )), aNewReplacePB( this, CUI_RES(PB_NEW_REPLACE )), aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )), sModify(CUI_RES(STR_MODIFY)), @@ -1061,7 +1061,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, +SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrReplacePage(pParent, rSet); @@ -1069,7 +1069,7 @@ SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, /* -----------------20.11.98 13:26------------------- * * --------------------------------------------------*/ -void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); @@ -1597,18 +1597,18 @@ void lcl_ClearTable(StringsTable& rTable) OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet), - aAbbrevFL (this, CUI_RES(FL_ABBREV )), - aAbbrevED (this, CUI_RES(ED_ABBREV )), - aAbbrevLB (this, CUI_RES(LB_ABBREV )), - aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )), - aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )), - aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )), - aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )), - aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )), - aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )), + aAbbrevFL (this, CUI_RES(FL_ABBREV )), + aAbbrevED (this, CUI_RES(ED_ABBREV )), + aAbbrevLB (this, CUI_RES(LB_ABBREV )), + aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )), + aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )), + aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )), + aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )), + aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )), + aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )), aNewDoublePB (this, CUI_RES(PB_NEWDOUBLECAPS)), - aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)), - aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )), + aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)), + aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )), eLang(eLastDialogLanguage) { FreeResource(); @@ -1647,7 +1647,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrExceptPage(pParent, rSet); @@ -1655,7 +1655,7 @@ SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, /* -----------------20.11.98 13:26------------------- * * --------------------------------------------------*/ -void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); @@ -1883,8 +1883,8 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); RefillReplaceBoxes(TRUE, eLang, eLang); - aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst )); - aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst )); + aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst )); + aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst )); aAutoAbbrevCB.SaveValue(); aAutoCapsCB.SaveValue(); } @@ -1948,7 +1948,7 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { -// BOOL bSame = pEdt->GetText() == ->GetSelectEntry(); +// BOOL bSame = pEdt->GetText() == ->GetSelectEntry(); const String& sEntry = pEdt->GetText(); BOOL bEntryLen = 0!= sEntry.Len(); if(pEdt == &aAbbrevED) @@ -1999,26 +1999,26 @@ enum OfaQuoteOptions REPLACE_1ST }; -SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; - + if ( !pCheckButtonData ) { pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB ); aSwCheckLB.SetCheckButtonData( pCheckButtonData ); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! String sEmpty; if (nCol == CBCOL_SECOND) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (nCol == CBCOL_FIRST) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); @@ -2029,15 +2029,15 @@ SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS )), - aSwCheckLB (this, CUI_RES(CLB_SETTINGS )), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), - sOrdinal (CUI_RES( ST_ORDINAL )), + aCheckLB (this, CUI_RES(CLB_SETTINGS )), + aSwCheckLB (this, CUI_RES(CLB_SETTINGS )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), + sOrdinal (CUI_RES( ST_ORDINAL )), pCheckButtonData ( NULL ), - aSingleFL (this, CUI_RES(FL_SINGLE )), + aSingleFL (this, CUI_RES(FL_SINGLE )), aSingleTypoCB (this, CUI_RES(CB_SGL_TYPO )), aSglStartQuoteFT (this, CUI_RES(FT_SGL_STARTQUOTE )), aSglStartQuotePB (this, CUI_RES(PB_SGL_STARTQUOTE )), @@ -2053,7 +2053,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aStartQuotePB (this, CUI_RES(PB_STARTQUOTE )), aDblStartExFT (this, CUI_RES(FT_DBSTEX )), aEndQuoteFT (this, CUI_RES(FT_ENDQUOTE )), - aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )), + aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )), aDblEndExFT (this, CUI_RES(FT_DBECEX )), aDblStandardPB (this, CUI_RES(PB_DBL_STD )), @@ -2063,7 +2063,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : sStandard(CUI_RES(ST_STANDARD)) { FreeResource(); - + BOOL bShowSWOptions = FALSE; aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); @@ -2079,7 +2079,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : { 3, 0, 20, 40 }; - + aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); @@ -2096,12 +2096,12 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aSwCheckLB.HideTable( ); } - aStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); aSglStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aSglEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); - aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); + aSglEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); + aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); } /*-----------------03.07.97 13:17------------------- @@ -2114,7 +2114,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() /*-----------------03.07.97 13:17------------------- --------------------------------------------------*/ -SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, +SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaQuoteTabPage(pParent, rAttrSet); @@ -2131,8 +2131,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) if ( aCheckLB.IsVisible( ) ) { USHORT nPos = 0; - pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); } BOOL bModified = FALSE; @@ -2153,8 +2153,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND)); } - pAutoCorrect->SetAutoCorrFlag(ChgQuotes, aTypoCB.IsChecked()); - pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, aSingleTypoCB.IsChecked()); + pAutoCorrect->SetAutoCorrFlag(ChgQuotes, aTypoCB.IsChecked()); + pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, aSingleTypoCB.IsChecked()); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); if(cStartQuote != pAutoCorrect->GetStartDoubleQuote()) { @@ -2215,10 +2215,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aSwCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace, CBCOL_BOTH )); aSwCheckLB.GetModel()->Insert(CreateEntry(sOrdinal, CBCOL_BOTH )); - aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST, pOpt->bAddNonBrkSpace ); - aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) ); - aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); - aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST, pOpt->bAddNonBrkSpace ); + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); aSwCheckLB.SetUpdateMode( TRUE ); } @@ -2231,7 +2231,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry( sNonBrkSpace ); aCheckLB.InsertEntry( sOrdinal ); - + USHORT nPos = 0; aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); @@ -2240,10 +2240,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) } // Initialize the quote stuffs - aTypoCB .Check(0 != (nFlags & ChgQuotes)); - aSingleTypoCB .Check(0 != (nFlags & ChgSglQuotes)); - aTypoCB .SaveValue(); - aSingleTypoCB .SaveValue(); + aTypoCB .Check(0 != (nFlags & ChgQuotes)); + aSingleTypoCB .Check(0 != (nFlags & ChgSglQuotes)); + aTypoCB .SaveValue(); + aSingleTypoCB .SaveValue(); cStartQuote = pAutoCorrect->GetStartDoubleQuote(); cEndQuote = pAutoCorrect->GetEndDoubleQuote(); @@ -2260,7 +2260,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) /*-----------------15.10.96 16.42------------------- --------------------------------------------------*/ -#define SGL_START 0 +#define SGL_START 0 #define DBL_START 1 #define SGL_END 2 #define DBL_END 3 @@ -2395,7 +2395,7 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet), - aCBActiv (this, CUI_RES(CB_ACTIV)), + aCBActiv (this, CUI_RES(CB_ACTIV)), aCBAppendSpace (this, CUI_RES(CB_APPEND_SPACE)), aCBAsTip (this, CUI_RES(CB_AS_TIP)), aCBCollect (this, CUI_RES(CB_COLLECT)), @@ -2428,7 +2428,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent, KeyCode aKCode( *pKeys ); USHORT nPos = aDCBExpandKey.InsertEntry( aKCode.GetName() ); aDCBExpandKey.SetEntryData( nPos, (void*)(ULONG)*pKeys ); - if( KEY_RETURN == *pKeys ) // default to RETURN + if( KEY_RETURN == *pKeys ) // default to RETURN aDCBExpandKey.SelectEntryPos( nPos ); } @@ -2441,7 +2441,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { } -SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, +SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutoCompleteTabPage( pParent, rSet ); @@ -2461,7 +2461,7 @@ BOOL OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) bModified |= pOpt->bAutoCmpltCollectWords != bCheck; pOpt->bAutoCmpltCollectWords = bCheck; bCheck = !aCBRemoveList.IsChecked(); // inverted value! - bModified |= pOpt->bAutoCmpltKeepList != bCheck; + bModified |= pOpt->bAutoCmpltKeepList != bCheck; pOpt->bAutoCmpltKeepList = bCheck; bCheck = aCBAppendSpace.IsChecked(); bModified |= pOpt->bAutoCmpltAppendBlanc != bCheck; @@ -2665,7 +2665,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaSmartTagOptionsTabPage( pParent, rSet ); } diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 7a747939b4d5..e63684c96061 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ // defines ------------------------------------------------------------------ -#define CLB_SETTINGS 1 +#define CLB_SETTINGS 1 /* #define STR_DOUBLECAPS 3 #define STR_STARTCAPS 4 @@ -48,14 +48,14 @@ #define FT_ENDQUOTE 14 #define PB_ENDQUOTE 15 -#define FL_ABBREV 16 -#define ED_ABBREV 17 -#define LB_ABBREV 18 -#define PB_NEWABBREV 19 -#define PB_DELABBREV 20 -#define FL_DOUBLECAPS 21 -#define ED_DOUBLE_CAPS 22 -#define LB_DOUBLE_CAPS 23 +#define FL_ABBREV 16 +#define ED_ABBREV 17 +#define LB_ABBREV 18 +#define PB_NEWABBREV 19 +#define PB_DELABBREV 20 +#define FL_DOUBLECAPS 21 +#define ED_DOUBLE_CAPS 22 +#define LB_DOUBLE_CAPS 23 #define PB_NEWDOUBLECAPS 24 #define PB_DELDOUBLECAPS 25 @@ -69,9 +69,9 @@ #define STR_CLOSE_AUTOCORR 38 #define FT_SHORT 39 #define FT_REPLACE 40 -#define STR_CHANGE_START 41 +#define STR_CHANGE_START 41 #define STR_CHANGE_END 42 -#define CB_AUTOABBREV 43 +#define CB_AUTOABBREV 43 #define CB_AUTOCAPS 44 #define FT_SGL_STARTQUOTE 45 @@ -89,39 +89,39 @@ #define CB_SGL_TYPO 57 #define ST_STANDARD 58 -#define PB_EDIT 61 -#define ST_DEL_EMPTY_PARA 62 -#define ST_TYPO 66 -#define ST_USER_STYLE 67 -#define ST_BULLET 68 -#define STR_DEL_SPACES_AT_STT_END 69 +#define PB_EDIT 61 +#define ST_DEL_EMPTY_PARA 62 +#define ST_TYPO 66 +#define ST_USER_STYLE 67 +#define ST_BULLET 68 +#define STR_DEL_SPACES_AT_STT_END 69 #define STR_DEL_SPACES_BETWEEN_LINES 70 -#define ST_RIGHT_MARGIN 74 -#define STR_NUM 75 -#define STR_BORDER 76 -#define STR_TABLE 77 -#define STR_REPLACE_TEMPLATES 78 -#define FL_PRCNT 79 - -#define STR_HEADER 90 -#define FT_HEADER_EXPLANATION 91 -#define STR_HEADER1 92 -#define STR_HEADER2 93 -#define FT_HEADER1_EXPLANATION 94 -#define FT_HEADER2_EXPLANATION 95 - -#define ED_RIGHT_MARGIN 100 -#define BT_OK 101 -#define BT_CANCEL 102 - -#define BT_AWCP_OK 110 -#define BT_AWCP_CANCEL 111 -#define GB_AWCP_VALUE 112 -#define ED_AWCP_WORD_LEN 113 -#define ED_AWCP_LIST_LEN 114 -#define FT_AWCP_WORD_LEN 115 -#define FT_AWCP_LIST_LEN 116 +#define ST_RIGHT_MARGIN 74 +#define STR_NUM 75 +#define STR_BORDER 76 +#define STR_TABLE 77 +#define STR_REPLACE_TEMPLATES 78 +#define FL_PRCNT 79 + +#define STR_HEADER 90 +#define FT_HEADER_EXPLANATION 91 +#define STR_HEADER1 92 +#define STR_HEADER2 93 +#define FT_HEADER1_EXPLANATION 94 +#define FT_HEADER2_EXPLANATION 95 + +#define ED_RIGHT_MARGIN 100 +#define BT_OK 101 +#define BT_CANCEL 102 + +#define BT_AWCP_OK 110 +#define BT_AWCP_CANCEL 111 +#define GB_AWCP_VALUE 112 +#define ED_AWCP_WORD_LEN 113 +#define ED_AWCP_LIST_LEN 114 +#define FT_AWCP_WORD_LEN 115 +#define FT_AWCP_LIST_LEN 116 #define CB_ACTIV 121 #define CB_COLLECT 122 @@ -138,7 +138,7 @@ #define PB_ENTRIES 133 -#define ST_USE_REPLACE 200 +#define ST_USE_REPLACE 200 #define ST_CPTL_STT_WORD 201 #define ST_CPTL_STT_SENT 202 #define ST_BOLD_UNDER 203 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 53b31dc575ea..2fbbd2177cb0 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -768,7 +768,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS SVLook = TRUE ; Hide = TRUE ; Text [ en-US ] = "Smart Tags"; - + CheckBox CB_SMARTTAGS { Pos = MAP_APPFONT( 4, 3 ); @@ -782,7 +782,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS Size = MAP_APPFONT( 116, 8 ); Text [ en-US ] = "Currently installed smart tags"; }; - + Control LB_SMARTTAGS { Pos = MAP_APPFONT ( 12 , 25 ) ; @@ -790,14 +790,14 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS Border = TRUE ; TabStop = TRUE ; }; - + PushButton PB_SMARTTAGS { Pos = MAP_APPFONT ( 188 , 25 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Properties..."; }; - + }; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index d3224b6bf78b..231bcdd18db1 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ #include <editeng/eerdll.hxx> // Tabellenhintergrund -#define TBL_DEST_CELL 0 -#define TBL_DEST_ROW 1 -#define TBL_DEST_TBL 2 +#define TBL_DEST_CELL 0 +#define TBL_DEST_ROW 1 +#define TBL_DEST_TBL 2 #include <editeng/brshitem.hxx> #include "backgrnd.hxx" @@ -81,9 +81,9 @@ static USHORT pRanges[] = struct SvxBackgroundTable_Impl { - SvxBrushItem* pCellBrush; - SvxBrushItem* pRowBrush; - SvxBrushItem* pTableBrush; + SvxBrushItem* pCellBrush; + SvxBrushItem* pRowBrush; + SvxBrushItem* pTableBrush; USHORT nCellWhich; USHORT nRowWhich; USHORT nTableWhich; @@ -96,10 +96,10 @@ struct SvxBackgroundTable_Impl struct SvxBackgroundPara_Impl { - SvxBrushItem* pParaBrush; - SvxBrushItem* pCharBrush; + SvxBrushItem* pParaBrush; + SvxBrushItem* pCharBrush; - USHORT nActPos; + USHORT nActPos; SvxBackgroundPara_Impl() : pParaBrush(NULL), pCharBrush(NULL) {} @@ -133,15 +133,15 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) } //------------------------------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] */ USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { - BOOL bFound = FALSE; - USHORT nCount = rValueSet.GetItemCount(); - USHORT n = 1; + BOOL bFound = FALSE; + USHORT nCount = rValueSet.GetItemCount(); + USHORT n = 1; while ( !bFound && n <= nCount ) { @@ -159,7 +159,7 @@ USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) // class BackgroundPreview ----------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Vorschaufenster f"ur Brush oder Bitmap */ @@ -171,19 +171,19 @@ public: const ResId& rResId, BOOL bIsBmpPreview ); ~BackgroundPreviewImpl(); - void NotifyChange( const Color& rColor ); - void NotifyChange( const Bitmap* pBitmap ); + void NotifyChange( const Color& rColor ); + void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: - const BOOL bIsBmp; - Bitmap* pBitmap; - Point aDrawPos; - Size aDrawSize; - Rectangle aDrawRect; + const BOOL bIsBmp; + Bitmap* pBitmap; + Point aDrawPos; + Size aDrawSize; + Rectangle aDrawRect; BYTE nTransparency; }; @@ -196,14 +196,14 @@ BackgroundPreviewImpl::BackgroundPreviewImpl BOOL bIsBmpPreview ) : -/* [Beschreibung] +/* [Beschreibung] */ Window( pParent, rResId ), - bIsBmp ( bIsBmpPreview ), - pBitmap ( NULL ), + bIsBmp ( bIsBmpPreview ), + pBitmap ( NULL ), aDrawRect( Point(0,0), GetOutputSizePixel() ), nTransparency(0) @@ -216,7 +216,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl BackgroundPreviewImpl::~BackgroundPreviewImpl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -241,7 +241,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) //----------------------------------------------------------------------- void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -314,7 +314,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& ) { Size aSize = GetOutputSizePixel(); DrawLine( Point(0,0), Point(aSize.Width(),aSize.Height()) ); - DrawLine( Point(0,aSize.Height()), Point(aSize.Width(),0) ); + DrawLine( Point(0,aSize.Height()), Point(aSize.Width(),0) ); } } } @@ -338,51 +338,51 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : -/* [Beschreibung] +/* [Beschreibung] */ SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ), - aBorderWin ( this, CUI_RES(CT_BORDER) ), + aBorderWin ( this, CUI_RES(CT_BORDER) ), aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ), aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ), pPreviewWin1 ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ), aColTransFT ( this, CUI_RES( FT_COL_TRANS ) ), aColTransMF ( this, CUI_RES( MF_COL_TRANS ) ), - aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ), - aBtnLink ( this, CUI_RES( BTN_LINK ) ), - aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ), - aFtFile ( this, CUI_RES( FT_FILE ) ), - aGbFile ( this, CUI_RES( GB_FILE ) ), + aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ), + aBtnLink ( this, CUI_RES( BTN_LINK ) ), + aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ), + aFtFile ( this, CUI_RES( FT_FILE ) ), + aGbFile ( this, CUI_RES( GB_FILE ) ), aBtnPosition ( this, CUI_RES( BTN_POSITION ) ), - aBtnArea ( this, CUI_RES( BTN_AREA ) ), - aBtnTile ( this, CUI_RES( BTN_TILE ) ), - aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ), - aGbPosition ( this, CUI_RES( GB_POSITION ) ), + aBtnArea ( this, CUI_RES( BTN_AREA ) ), + aBtnTile ( this, CUI_RES( BTN_TILE ) ), + aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ), + aGbPosition ( this, CUI_RES( GB_POSITION ) ), aGraphTransFL ( this, CUI_RES( FL_GRAPH_TRANS ) ), aGraphTransMF ( this, CUI_RES( MF_GRAPH_TRANS ) ), pPreviewWin2 ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ), - aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), - aLbSelect ( this, CUI_RES( LB_SELECTOR ) ), + aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), + aLbSelect ( this, CUI_RES( LB_SELECTOR ) ), aStrBrowse ( CUI_RES( STR_BROWSE ) ), aStrUnlinked ( CUI_RES( STR_UNLINKED ) ), aTblDesc ( this, CUI_RES( FT_TBL_DESC ) ), aTblLBox ( this, CUI_RES( LB_TBL_BOX ) ), aParaLBox ( this, CUI_RES( LB_PARA_BOX ) ), nHtmlMode ( 0 ), - bAllowShowSelector ( TRUE ), - bIsGraphicValid ( FALSE ), - bLinkOnly ( FALSE ), + bAllowShowSelector ( TRUE ), + bIsGraphicValid ( FALSE ), + bLinkOnly ( FALSE ), bResized ( FALSE ), bColTransparency ( FALSE ), bGraphTransparency ( FALSE ), pPageImpl ( new SvxBackgroundPage_Impl ), - pImportDlg ( NULL ), - pTableBck_Impl ( NULL ), + pImportDlg ( NULL ), + pTableBck_Impl ( NULL ), pParaBck_Impl ( NULL ) { @@ -409,7 +409,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, SvxBackgroundTabPage::~SvxBackgroundTabPage() -/* [Beschreibung] +/* [Beschreibung] */ @@ -440,7 +440,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage() USHORT* SvxBackgroundTabPage::GetRanges() -/* [Beschreibung] +/* [Beschreibung] gibt den Bereich der Which-Werte zur"uck */ @@ -454,7 +454,7 @@ USHORT* SvxBackgroundTabPage::GetRanges() SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) -/* [Beschreibung] +/* [Beschreibung] Create-Methode f"ur den TabDialog */ @@ -467,15 +467,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) -/* [Beschreibung] +/* [Beschreibung] */ { // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, -// es muss aber im rSet vorhanden sein! -// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); -// if( pX && pX->ISA(SfxWallpaperItem)) +// es muss aber im rSet vorhanden sein! +// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); +// if( pX && pX->ISA(SfxWallpaperItem)) if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE)) { ResetFromWallpaperItem( rSet ); @@ -496,7 +496,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; USHORT nDestValue = USHRT_MAX; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, + if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, FALSE, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -712,8 +712,8 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) bLinkOnly = TRUE; aBtnLink.Check( TRUE ); aBtnLink.Show( FALSE ); -// if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() ) -// aBtnLink.Check(); +// if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() ) +// aBtnLink.Check(); delete pTemp; } @@ -724,7 +724,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) void SvxBackgroundTabPage::FillUserData() -/* [Beschreibung] +/* [Beschreibung] Beim Destruieren einer SfxTabPage wird diese virtuelle Methode gerufen, damit die TabPage interne Informationen sichern kann. @@ -740,7 +740,7 @@ void SvxBackgroundTabPage::FillUserData() BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -751,10 +751,10 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) LoadTimerHdl_Impl( pPageImpl->pLoadTimer ); } // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, -// es muss aber im rSet vorhanden sein! +// es muss aber im rSet vorhanden sein! -// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC ); -// if( pX && pX->ISA(SfxWallpaperItem)) +// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC ); +// if( pX && pX->ISA(SfxWallpaperItem)) if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE)) return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC ); @@ -797,9 +797,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) BOOL bGraphTransparencyChanged = bGraphTransparency && (aGraphTransMF.GetText() != aGraphTransMF.GetSavedValue()); if ( pOld ) { - const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; - SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); + const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; + SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); + const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); // transparency has to be set if enabled, the color not already set to "No fill" and if( bColTransparency && @@ -828,9 +828,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { // Bitmap-Behandlung: - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); - const BOOL bWasLink = (NULL != rOldItem.GetGraphicLink() ); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); + const BOOL bWasLink = (NULL != rOldItem.GetGraphicLink() ); if ( !bIsLink && !bIsGraphicValid ) @@ -1001,10 +1001,10 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U const SfxItemSet& rOldSet = GetItemSet(); DBG_ASSERT(pOld,"FillItemSetWithWallpaperItem: Item not found"); - SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); - SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); - BOOL bModified = FALSE; + SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); + SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); + const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); + BOOL bModified = FALSE; if ( ( (GPOS_NONE == eOldPos) && bIsBrush ) || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap gewechselt? @@ -1027,7 +1027,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U else { // Bitmap-Behandlung: - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); int bBitmapChanged = ( ( eNewPos != eOldPos ) || ( *rOldItem.GetGraphicLink() != aBgdGraphicPath ) ); @@ -1074,7 +1074,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) -/* [Beschreibung] +/* [Beschreibung] virtuelle Methode, wird beim Deaktivieren gerufen */ @@ -1093,7 +1093,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1105,7 +1105,7 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) void SvxBackgroundTabPage::ShowSelector() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1144,7 +1144,7 @@ void SvxBackgroundTabPage::ShowSelector() void SvxBackgroundTabPage::RaiseLoadError_Impl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1164,7 +1164,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1181,7 +1181,7 @@ BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl() void SvxBackgroundTabPage::FillColorValueSets_Impl() -/* [Beschreibung] +/* [Beschreibung] F"ullen des Farb-Sets */ @@ -1204,9 +1204,9 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() if ( pColorTable ) { - short i = 0; - long nCount = pColorTable->Count(); - XColorEntry* pEntry = NULL; + short i = 0; + long nCount = pColorTable->Count(); + XColorEntry* pEntry = NULL; Color aColWhite( COL_WHITE ); String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) ); WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD ); @@ -1215,7 +1215,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() for ( i = 0; i < nCount; i++ ) { pEntry = pColorTable->GetColor(i); - aBackgroundColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() ); + aBackgroundColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() ); } while ( i < 80 ) @@ -1247,7 +1247,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() void SvxBackgroundTabPage::ShowColorUI_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur das Einstellen der Grafik ausblenden und die Controls f"ur die Farbeinstellung einblenden. @@ -1285,7 +1285,7 @@ void SvxBackgroundTabPage::ShowColorUI_Impl() void SvxBackgroundTabPage::ShowBitmapUI_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur die Farbeinstellung ausblenden und die Controls f"ur das Einstellen der Grafik einblenden. @@ -1328,7 +1328,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur die Grafikposition einstellen. */ @@ -1358,15 +1358,15 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) switch ( ePos ) { - case GPOS_MM: break; - case GPOS_LT: eNewPos = RP_LT; break; - case GPOS_MT: eNewPos = RP_MT; break; - case GPOS_RT: eNewPos = RP_RT; break; - case GPOS_LM: eNewPos = RP_LM; break; - case GPOS_RM: eNewPos = RP_RM; break; - case GPOS_LB: eNewPos = RP_LB; break; - case GPOS_MB: eNewPos = RP_MB; break; - case GPOS_RB: eNewPos = RP_RB; break; + case GPOS_MM: break; + case GPOS_LT: eNewPos = RP_LT; break; + case GPOS_MT: eNewPos = RP_MT; break; + case GPOS_RT: eNewPos = RP_RT; break; + case GPOS_LM: eNewPos = RP_LM; break; + case GPOS_RM: eNewPos = RP_RM; break; + case GPOS_LB: eNewPos = RP_LB; break; + case GPOS_MB: eNewPos = RP_MB; break; + case GPOS_RB: eNewPos = RP_RB; break; default: ;//prevent warning } aWndPosition.SetActualRP( eNewPos ); @@ -1380,7 +1380,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Position der Grafik zur"uckgeben. */ @@ -1394,15 +1394,15 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() { switch ( aWndPosition.GetActualRP() ) { - case RP_LT: return GPOS_LT; - case RP_MT: return GPOS_MT; - case RP_RT: return GPOS_RT; - case RP_LM: return GPOS_LM; - case RP_MM: return GPOS_MM; - case RP_RM: return GPOS_RM; - case RP_LB: return GPOS_LB; - case RP_MB: return GPOS_MB; - case RP_RB: return GPOS_RB; + case RP_LT: return GPOS_LT; + case RP_MT: return GPOS_MT; + case RP_RT: return GPOS_RT; + case RP_LM: return GPOS_LM; + case RP_MM: return GPOS_MM; + case RP_RM: return GPOS_RM; + case RP_LB: return GPOS_LB; + case RP_MB: return GPOS_MB; + case RP_RB: return GPOS_RB; } } return GPOS_MM; @@ -1431,7 +1431,7 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1453,7 +1453,7 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1488,7 +1488,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) else { if ( aBgdGraphicPath.Len() > 0 ) // nur bei gelinkter Grafik - RaiseLoadError_Impl(); // ein Fehler + RaiseLoadError_Impl(); // ein Fehler pPreviewWin2->NotifyChange( NULL ); } } @@ -1502,7 +1502,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1527,7 +1527,7 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] Handler, gerufen durch das Dr"ucken des Durchsuchen-Buttons. Grafik/Einf"ugen-Dialog erzeugen, Pfad setzen und starten. @@ -1568,7 +1568,7 @@ IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) -/* [Beschreibung] +/* [Beschreibung] Verz"ogertes Laden der Grafik. Grafik wird nur dann geladen, wenn sie unterschiedlich zur @@ -1588,7 +1588,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) { // neue Datei gew"ahlt aBgdGraphicPath = pImportDlg->GetPath(); - aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); + aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); BOOL bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? TRUE : pImportDlg->IsAsLink(); aBtnLink.Check( bLink ); aBtnLink.Enable(); @@ -1629,13 +1629,13 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) void SvxBackgroundTabPage::ShowTblControl() -/* [Beschreibung] +/* [Beschreibung] */ { - aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); - aTblLBox .SelectEntryPos(0); + aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); + aTblLBox .SelectEntryPos(0); aTblDesc.Show(); aTblLBox.Show(); } @@ -1657,7 +1657,7 @@ void SvxBackgroundTabPage::ShowParaControl(BOOL bCharOnly) IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1691,8 +1691,8 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) } else { - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1762,8 +1762,8 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) } else { - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1803,12 +1803,12 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, const String& rUserData ) -/* [Beschreibung] +/* [Beschreibung] */ { - SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); + SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); const Color& rColor = rBgdAttr.GetColor(); if(bColTransparency) { @@ -1852,13 +1852,13 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, aBtnLink.Check( FALSE ); aBtnLink.Disable(); pPreviewWin2->NotifyChange( NULL ); - SetGraphicPosition_Impl( GPOS_TILED ); // Kacheln als Default + SetGraphicPosition_Impl( GPOS_TILED ); // Kacheln als Default } } else { - const String* pStrLink = rBgdAttr.GetGraphicLink(); - const String* pStrFilter = rBgdAttr.GetGraphicFilter(); + const String* pStrLink = rBgdAttr.GetGraphicLink(); + const String* pStrFilter = rBgdAttr.GetGraphicFilter(); aLbSelect.SelectEntryPos( 1 ); ShowBitmapUI_Impl(); diff --git a/cui/source/tabpages/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc index fdfafabe8f11..dcd161ce8110 100644 --- a/cui/source/tabpages/backgrnd.hrc +++ b/cui/source/tabpages/backgrnd.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,32 +29,32 @@ // defines ------------------------------------------------------------------ -#define FT_SELECTOR 1 -#define LB_SELECTOR 1 +#define FT_SELECTOR 1 +#define LB_SELECTOR 1 -#define SET_BGDCOLOR 10 -#define GB_BGDCOLOR 11 -#define SET_PATTERN 12 -#define GB_COL_PREVIEW 13 -#define SET_PATCOLOR 14 -#define GB_PATCOLOR 15 -#define CT_BORDER 16 -#define FT_PREVIEW 20 -#define WIN_PREVIEW1 21 +#define SET_BGDCOLOR 10 +#define GB_BGDCOLOR 11 +#define SET_PATTERN 12 +#define GB_COL_PREVIEW 13 +#define SET_PATCOLOR 14 +#define GB_PATCOLOR 15 +#define CT_BORDER 16 +#define FT_PREVIEW 20 +#define WIN_PREVIEW1 21 -#define BTN_BROWSE 20 -#define FT_FILE 21 -#define BTN_LINK 22 -#define BTN_PREVIEW 23 -#define GB_FILE 24 -#define BTN_AREA 25 -#define BTN_TILE 26 -#define BTN_POSITION 27 -#define WND_POSITION 28 -#define GB_POSITION 29 -#define WIN_PREVIEW2 30 -#define GB_PREVIEW 31 -#define LB_TBL_BOX 32 +#define BTN_BROWSE 20 +#define FT_FILE 21 +#define BTN_LINK 22 +#define BTN_PREVIEW 23 +#define GB_FILE 24 +#define BTN_AREA 25 +#define BTN_TILE 26 +#define BTN_POSITION 27 +#define WND_POSITION 28 +#define GB_POSITION 29 +#define WIN_PREVIEW2 30 +#define GB_PREVIEW 31 +#define LB_TBL_BOX 32 #define FT_TBL_DESC 33 #define LB_PARA_BOX 34 #define FT_COL_TRANS 35 @@ -62,8 +62,8 @@ #define FL_GRAPH_TRANS 37 #define MF_GRAPH_TRANS 38 -#define STR_BROWSE 1 -#define STR_UNLINKED 2 +#define STR_BROWSE 1 +#define STR_UNLINKED 2 #endif diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 7f413f116aff..21b87099d20f 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <svx/dialogs.hrc> // define ---------------------------------------------------------------- -#define UNLINKED_IMAGE \ +#define UNLINKED_IMAGE \ Text [ en-US ] = "Unlinked graphic" ; \ // pragma ---------------------------------------------------------------- diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f688e9b720f5..f22d1c28db14 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src index 973272d11d2e..0b4089801060 100644 --- a/cui/source/tabpages/bbdlg.src +++ b/cui/source/tabpages/bbdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ TabDialog RID_SVXDLG_BBDLG Size = MAP_APPFONT ( 328 , 155 ) ; Text [ en-US ] = "Border / Background" ; Moveable = TRUE ; - // Closeable = TRUE; hat ja einen OKButton + // Closeable = TRUE; hat ja einen OKButton TabControl 1 { OutputSize = TRUE ; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index ffe2fae38679..e080287acd75 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #define LINESTYLE_HTML_MAX 5 -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include <svx/drawitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> @@ -64,14 +64,14 @@ * [Beschreibung:] * TabPage zum Einstellen der Rahmen-Attribute. * Benoetigt - * ein SvxShadowItem: Schatten - * ein SvxBoxItem: Linien links,rechts,oben,unten ), - * ein SvxBoxInfo: Linien vertikal,horizontal, Abstaende, Flags ) + * ein SvxShadowItem: Schatten + * ein SvxBoxItem: Linien links,rechts,oben,unten ), + * ein SvxBoxInfo: Linien vertikal,horizontal, Abstaende, Flags ) * * Linien koennen drei Zustaende haben. - * 1. Show ( -> gueltige Werte ) - * 2. Hide ( -> NULL-Pointer ) - * 3. DontCare ( -> gesonderte Valid-Flags im InfoItem ) + * 1. Show ( -> gueltige Werte ) + * 2. Hide ( -> NULL-Pointer ) + * 3. DontCare ( -> gesonderte Valid-Flags im InfoItem ) */ // static ---------------------------------------------------------------- @@ -91,56 +91,56 @@ BOOL SvxBorderTabPage::bSync = TRUE; //------------------------------------------------------------------------ -#define LINE_WIDTH0 (DEF_LINE_WIDTH_0 *100) -#define LINE_WIDTH1 (DEF_LINE_WIDTH_1 *100) -#define LINE_WIDTH2 (DEF_LINE_WIDTH_2 *100) -#define LINE_WIDTH3 (DEF_LINE_WIDTH_3 *100) -#define LINE_WIDTH4 (DEF_LINE_WIDTH_4 *100) +#define LINE_WIDTH0 (DEF_LINE_WIDTH_0 *100) +#define LINE_WIDTH1 (DEF_LINE_WIDTH_1 *100) +#define LINE_WIDTH2 (DEF_LINE_WIDTH_2 *100) +#define LINE_WIDTH3 (DEF_LINE_WIDTH_3 *100) +#define LINE_WIDTH4 (DEF_LINE_WIDTH_4 *100) #define LINE_WIDTH5 (DEF_LINE_WIDTH_5 *100) -#define DLINE0_OUT (DEF_DOUBLE_LINE0_OUT *100) -#define DLINE0_IN (DEF_DOUBLE_LINE0_IN *100) -#define DLINE0_DIST (DEF_DOUBLE_LINE0_DIST *100) +#define DLINE0_OUT (DEF_DOUBLE_LINE0_OUT *100) +#define DLINE0_IN (DEF_DOUBLE_LINE0_IN *100) +#define DLINE0_DIST (DEF_DOUBLE_LINE0_DIST *100) -#define DLINE1_OUT (DEF_DOUBLE_LINE1_OUT *100) -#define DLINE1_IN (DEF_DOUBLE_LINE1_IN *100) -#define DLINE1_DIST (DEF_DOUBLE_LINE1_DIST *100) +#define DLINE1_OUT (DEF_DOUBLE_LINE1_OUT *100) +#define DLINE1_IN (DEF_DOUBLE_LINE1_IN *100) +#define DLINE1_DIST (DEF_DOUBLE_LINE1_DIST *100) -#define DLINE2_OUT (DEF_DOUBLE_LINE2_OUT *100) -#define DLINE2_IN (DEF_DOUBLE_LINE2_IN *100) -#define DLINE2_DIST (DEF_DOUBLE_LINE2_DIST *100) +#define DLINE2_OUT (DEF_DOUBLE_LINE2_OUT *100) +#define DLINE2_IN (DEF_DOUBLE_LINE2_IN *100) +#define DLINE2_DIST (DEF_DOUBLE_LINE2_DIST *100) -#define DLINE3_OUT (DEF_DOUBLE_LINE3_OUT *100) -#define DLINE3_IN (DEF_DOUBLE_LINE3_IN *100) -#define DLINE3_DIST (DEF_DOUBLE_LINE3_DIST *100) +#define DLINE3_OUT (DEF_DOUBLE_LINE3_OUT *100) +#define DLINE3_IN (DEF_DOUBLE_LINE3_IN *100) +#define DLINE3_DIST (DEF_DOUBLE_LINE3_DIST *100) -#define DLINE4_OUT (DEF_DOUBLE_LINE4_OUT *100) -#define DLINE4_IN (DEF_DOUBLE_LINE4_IN *100) -#define DLINE4_DIST (DEF_DOUBLE_LINE4_DIST *100) +#define DLINE4_OUT (DEF_DOUBLE_LINE4_OUT *100) +#define DLINE4_IN (DEF_DOUBLE_LINE4_IN *100) +#define DLINE4_DIST (DEF_DOUBLE_LINE4_DIST *100) -#define DLINE5_OUT (DEF_DOUBLE_LINE5_OUT *100) -#define DLINE5_IN (DEF_DOUBLE_LINE5_IN *100) -#define DLINE5_DIST (DEF_DOUBLE_LINE5_DIST *100) +#define DLINE5_OUT (DEF_DOUBLE_LINE5_OUT *100) +#define DLINE5_IN (DEF_DOUBLE_LINE5_IN *100) +#define DLINE5_DIST (DEF_DOUBLE_LINE5_DIST *100) -#define DLINE6_OUT (DEF_DOUBLE_LINE6_OUT *100) -#define DLINE6_IN (DEF_DOUBLE_LINE6_IN *100) -#define DLINE6_DIST (DEF_DOUBLE_LINE6_DIST *100) +#define DLINE6_OUT (DEF_DOUBLE_LINE6_OUT *100) +#define DLINE6_IN (DEF_DOUBLE_LINE6_IN *100) +#define DLINE6_DIST (DEF_DOUBLE_LINE6_DIST *100) -#define DLINE7_OUT (DEF_DOUBLE_LINE7_OUT *100) -#define DLINE7_IN (DEF_DOUBLE_LINE7_IN *100) -#define DLINE7_DIST (DEF_DOUBLE_LINE7_DIST *100) +#define DLINE7_OUT (DEF_DOUBLE_LINE7_OUT *100) +#define DLINE7_IN (DEF_DOUBLE_LINE7_IN *100) +#define DLINE7_DIST (DEF_DOUBLE_LINE7_DIST *100) -#define DLINE8_OUT (DEF_DOUBLE_LINE8_OUT *100) -#define DLINE8_IN (DEF_DOUBLE_LINE8_IN *100) -#define DLINE8_DIST (DEF_DOUBLE_LINE8_DIST *100) +#define DLINE8_OUT (DEF_DOUBLE_LINE8_OUT *100) +#define DLINE8_IN (DEF_DOUBLE_LINE8_IN *100) +#define DLINE8_DIST (DEF_DOUBLE_LINE8_DIST *100) -#define DLINE9_OUT (DEF_DOUBLE_LINE9_OUT *100) -#define DLINE9_IN (DEF_DOUBLE_LINE9_IN *100) -#define DLINE9_DIST (DEF_DOUBLE_LINE9_DIST *100) +#define DLINE9_OUT (DEF_DOUBLE_LINE9_OUT *100) +#define DLINE9_IN (DEF_DOUBLE_LINE9_IN *100) +#define DLINE9_DIST (DEF_DOUBLE_LINE9_DIST *100) -#define DLINE10_OUT (DEF_DOUBLE_LINE10_OUT *100) -#define DLINE10_IN (DEF_DOUBLE_LINE10_IN *100) -#define DLINE10_DIST (DEF_DOUBLE_LINE10_DIST*100) +#define DLINE10_OUT (DEF_DOUBLE_LINE10_OUT *100) +#define DLINE10_IN (DEF_DOUBLE_LINE10_IN *100) +#define DLINE10_DIST (DEF_DOUBLE_LINE10_DIST*100) #define RGBCOL(eColorName) (TpBorderRGBColor(eColorName)) @@ -178,14 +178,14 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField) SvxBorderTabPage::SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ), aFlBorder ( this, CUI_RES( FL_BORDER ) ), aDefaultFT ( this, CUI_RES( FT_DEFAULT ) ), aWndPresets ( this, CUI_RES( WIN_PRESETS ) ), aUserDefFT ( this, CUI_RES( FT_USERDEF ) ), aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ), - + aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ), aFlLine ( this, CUI_RES( FL_LINE ) ), aStyleFT ( this, CUI_RES( FT_STYLE ) ), @@ -352,9 +352,9 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, FillLineListBox_Impl(); // ColorBox aus der XColorTable fuellen. - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = NULL; - XColorTable* pColorTable = NULL; + SfxObjectShell* pDocSh = SfxObjectShell::Current(); + const SfxPoolItem* pItem = NULL; + XColorTable* pColorTable = NULL; DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -449,13 +449,13 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SvxBoxItem* pBoxItem; const SvxBoxInfoItem* pBoxInfoItem; - USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); - SfxMapUnit eCoreUnit; - const Color aColBlack = RGBCOL(COL_BLACK); + USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); + SfxMapUnit eCoreUnit; + const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); - - + + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False ); eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); @@ -671,11 +671,11 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); - BOOL bPut = TRUE; - USHORT nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); - USHORT nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False ); - const SfxItemSet& rOldSet = GetItemSet(); - SvxBoxItem aBoxItem ( nBoxWhich ); + BOOL bPut = TRUE; + USHORT nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); + USHORT nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False ); + const SfxItemSet& rOldSet = GetItemSet(); + SvxBoxItem aBoxItem ( nBoxWhich ); SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich ); SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER ); @@ -743,7 +743,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) nMinValue == aRightMF .GetValue() || nMinValue == aTopMF .GetValue() || nMinValue == aBottomMF.GetValue() || - (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) ) { aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT ); @@ -1151,7 +1151,7 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, EMPTYARG ) { BOOL bLineSet = aFrameSel.IsAnyBorderVisible(); BOOL bMinAllowed = 0 != (nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_TABLE)); - BOOL bSpaceModified = aLeftMF .IsModified()|| + BOOL bSpaceModified = aLeftMF .IsModified()|| aRightMF .IsModified()|| aTopMF .IsModified()|| aBottomMF.IsModified(); diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc index 3f7699df951b..2d7359ef1e33 100644 --- a/cui/source/tabpages/border.hrc +++ b/cui/source/tabpages/border.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ #define CB_MERGEADJACENTBORDERS 66 // ImageListe fuer ValueSets: -#define IL_PRE_BITMAPS 1400 +#define IL_PRE_BITMAPS 1400 #define ILH_PRE_BITMAPS 1401 #define IID_PRE_CELL_NONE 1 #define IID_PRE_CELL_ALL 2 @@ -93,13 +93,13 @@ #define IID_PRE_TABLE_ALL 20 #define IID_PRE_TABLE_OUTER2 21 -#define IL_SDW_BITMAPS 1500 +#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 -#define IID_SHADOW_TOP_RIGHT 4 -#define IID_SHADOW_TOP_LEFT 5 +#define IID_SHADOWNONE 1 +#define IID_SHADOW_BOT_RIGHT 2 +#define IID_SHADOW_BOT_LEFT 3 +#define IID_SHADOW_TOP_RIGHT 4 +#define IID_SHADOW_TOP_LEFT 5 #endif diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 811f5429aeb7..a2ad4d617fe0 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 290306176e1c..780e969e1958 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 76071f904a6d..7f8343d8742f 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index e0356b2b5391..2c0f8ac5e500 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include <cuires.hrc> #include "chardlg.hrc" -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include "chardlg.hxx" #include "editeng/fontitem.hxx" #include <editeng/postitem.hxx> @@ -95,13 +95,13 @@ using namespace ::com::sun::star; // define ---------------------------------------------------------------- -#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT +#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT -#define CLEARTITEM rSet.InvalidateItem(nWhich) +#define CLEARTITEM rSet.InvalidateItem(nWhich) -#define LW_NORMAL 0 +#define LW_NORMAL 0 #define LW_GESPERRT 1 -#define LW_SCHMAL 2 +#define LW_SCHMAL 2 // static ---------------------------------------------------------------- @@ -214,10 +214,10 @@ SvxCharBasePage::~SvxCharBasePage() //void SvxCharBasePage::SetPrevFontAttributes( const SfxItemSet& rSet ) void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) { - SvxFont& rFont = GetPreviewFont(); - SvxFont& rCJKFont = GetPreviewCJKFont(); - SvxFont& rCTLFont = GetPreviewCTLFont(); - USHORT nWhich; + SvxFont& rFont = GetPreviewFont(); + SvxFont& rCJKFont = GetPreviewCJKFont(); + SvxFont& rCTLFont = GetPreviewCTLFont(); + USHORT nWhich; nWhich = GetWhich( SID_CHAR_DLG_PREVIEW_STRING ); if( ISITEMSET ) @@ -262,7 +262,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) rCJKFont.SetOverline( eOverline ); rCTLFont.SetOverline( eOverline ); - // Strikeout + // Strikeout FontStrikeout eStrikeout; nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); if( ISITEMSET ) @@ -400,7 +400,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) rCJKFont.SetColor( aCol ); rCTLFont.SetColor( aCol ); - m_aPreviewWin.AutoCorrectFontColor(); // handle color COL_AUTO + m_aPreviewWin.AutoCorrectFontColor(); // handle color COL_AUTO } // Kerning @@ -453,12 +453,12 @@ void SvxCharBasePage::SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, Svx long nH; if( rSet.GetItemState( nWhich ) >= SFX_ITEM_SET ) { - nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), + nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); } else - nH = 240; // as default 12pt + nH = 240; // as default 12pt rFont.SetSize( Size( 0, nH ) ); } @@ -502,10 +502,10 @@ void SvxCharBasePage::SetPrevFontStyle( const SfxItemSet& rSet, USHORT nPosture, void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) { - USHORT nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); + USHORT nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); if( ISITEMSET ) { - const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); m_aPreviewWin.SetFontWidthScale( rItem.GetValue() ); } @@ -538,19 +538,19 @@ void SvxCharBasePage::SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nE struct SvxCharNamePage_Impl { - Timer m_aUpdateTimer; - String m_aNoStyleText; - String m_aTransparentText; - const FontList* m_pFontList; - USHORT m_nExtraEntryPos; - BOOL m_bMustDelete; - BOOL m_bInSearchMode; + Timer m_aUpdateTimer; + String m_aNoStyleText; + String m_aTransparentText; + const FontList* m_pFontList; + USHORT m_nExtraEntryPos; + BOOL m_bMustDelete; + BOOL m_bInSearchMode; SvxCharNamePage_Impl() : - m_pFontList ( NULL ), + m_pFontList ( NULL ), m_nExtraEntryPos( LISTBOX_ENTRY_NOTFOUND ), - m_bMustDelete ( FALSE ), + m_bMustDelete ( FALSE ), m_bInSearchMode ( FALSE ) { @@ -608,12 +608,12 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pCTLLine = new FixedLine( this, CUI_RES( FL_CTL ) ); m_pCTLFontNameFT = new FixedText( this, CUI_RES( FT_CTL_NAME ) ); m_pCTLFontNameLB = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) ); - m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) ); - m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) ); - m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) ); - m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) ); - m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) ); - m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) ); + m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) ); + m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) ); + m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) ); + m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) ); + m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) ); + m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) ); if( bCJK ) { @@ -662,9 +662,9 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : FreeResource(); - m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN, TRUE, FALSE, TRUE ); - m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK, TRUE, FALSE, TRUE ); - m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL, TRUE, FALSE, TRUE ); + m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN, TRUE, FALSE, TRUE ); + m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK, TRUE, FALSE, TRUE ); + m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL, TRUE, FALSE, TRUE ); Initialize(); } @@ -813,7 +813,7 @@ const FontList* SvxCharNamePage::GetFontList() const // ----------------------------------------------------------------------------- namespace { - FontInfo calcFontInfo( SvxFont& _rFont, + FontInfo calcFontInfo( SvxFont& _rFont, SvxCharNamePage* _pPage, const FontNameBox* _pFontNameLB, const FontStyleBox* _pFontStyleLB, @@ -862,7 +862,7 @@ namespace else if ( _pFontSizeLB->GetText().Len() ) aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ); else - aSize.Height() = 200; // default 10pt + aSize.Height() = 200; // default 10pt aFontInfo.SetSize( aSize ); _rFont.SetFamily( aFontInfo.GetFamily() ); @@ -1379,7 +1379,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp // FontSize long nSize = static_cast<long>(pSizeBox->GetValue()); - if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck + if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); bool bRel = true; @@ -1612,7 +1612,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); - UpdatePreview_Impl(); // instead of asynchronous calling in ctor + UpdatePreview_Impl(); // instead of asynchronous calling in ctor } // ----------------------------------------------------------------------- @@ -1659,7 +1659,7 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); -//! bModified |= FillItemSetColor_Impl( rSet ); +//! bModified |= FillItemSetColor_Impl( rSet ); return bModified; } @@ -1689,8 +1689,8 @@ namespace static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 ); // ausgehend von der akt. Hoehe: - // - negativ bis minimal 2 pt - // - positiv bis maximal 999 pt + // - negativ bis minimal 2 pt + // - positiv bis maximal 999 pt _pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)), (9999 - nCurHeight), 10 ); } } @@ -1769,41 +1769,41 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe m_aFontColorFT ( this, CUI_RES( FT_FONTCOLOR ) ), m_aFontColorLB ( this, CUI_RES( LB_FONTCOLOR ) ), - m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ), - m_aEffectsLB ( this, 0 ), + m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ), + m_aEffectsLB ( this, 0 ), - m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ), + m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ), m_aReliefFT ( this, CUI_RES( FT_RELIEF ) ), m_aReliefLB ( this, CUI_RES( LB_RELIEF ) ), - m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ), - m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ), - m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ), + m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ), + m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ), + m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ), m_aHiddenBtn ( this, CUI_RES( CB_CHARHIDDEN ) ), - m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ), + m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ), - m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ), - m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ), - m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ), - m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ), - m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ), - m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ), - m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ), - m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ), - m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ), - m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ), - m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ), + m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ), + m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ), + m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ), + m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ), + m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ), + m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ), + m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ), + m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ), + m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ), + m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ), + m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ), - m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ), + m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ), - m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ), - m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ), - m_aPositionFT ( this, CUI_RES( FT_POSITION ) ), - m_aPositionLB ( this, CUI_RES( LB_POSITION ) ), + m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ), + m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ), + m_aPositionFT ( this, CUI_RES( FT_POSITION ) ), + m_aPositionLB ( this, CUI_RES( LB_POSITION ) ), - m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) ) + m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) ) { m_aEffectsLB.Hide(); @@ -2332,7 +2332,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } } - // Strikeout + // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); rFont.SetStrikeout( STRIKEOUT_NONE ); rCJKFont.SetStrikeout( STRIKEOUT_NONE ); @@ -2440,7 +2440,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } // the select handler for the underline/overline/strikeout list boxes -// SelectHdl_Impl( NULL ); +// SelectHdl_Impl( NULL ); DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aOverlineLB.GetSelectHdl(), "SvxCharEffectsPage::Reset: inconsistence (1)!"); DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aStrikeoutLB.GetSelectHdl(), @@ -2451,7 +2451,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox -// SelectHdl_Impl( &m_aEmphasisLB ); +// SelectHdl_Impl( &m_aEmphasisLB ); DBG_ASSERT(m_aEmphasisLB.GetSelectHdl() == LINK(this, SvxCharEffectsPage, SelectHdl_Impl), "SvxCharEffectsPage::Reset: inconsistence (2)!"); m_aEmphasisLB.GetSelectHdl().Call( &m_aEmphasisLB ); @@ -3039,35 +3039,35 @@ SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rIn SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ), - m_aPositionLine ( this, CUI_RES( FL_POSITION ) ), - m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ), - m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ), - m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ), - m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ), - m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ), - m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ), - m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ), - m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ), + m_aPositionLine ( this, CUI_RES( FL_POSITION ) ), + m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ), + m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ), + m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ), + m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ), + m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ), + m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ), + m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ), + m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ), m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ), - m_aScalingFL ( this, CUI_RES( FL_SCALING ) ), - m_a0degRB ( this, CUI_RES( RB_0_DEG ) ), - m_a90degRB ( this, CUI_RES( RB_90_DEG ) ), - m_a270degRB ( this, CUI_RES( RB_270_DEG ) ), - m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ), - m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ), - m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ), - - m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ), - m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ), - m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ), - m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ), - m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ), - - m_nSuperEsc ( (short)DFLT_ESC_SUPER ), - m_nSubEsc ( (short)DFLT_ESC_SUB ), - m_nScaleWidthItemSetVal ( 100 ), - m_nScaleWidthInitialVal ( 100 ), - m_nSuperProp ( (BYTE)DFLT_ESC_PROP ), + m_aScalingFL ( this, CUI_RES( FL_SCALING ) ), + m_a0degRB ( this, CUI_RES( RB_0_DEG ) ), + m_a90degRB ( this, CUI_RES( RB_90_DEG ) ), + m_a270degRB ( this, CUI_RES( RB_270_DEG ) ), + m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ), + m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ), + m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ), + + m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ), + m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ), + m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ), + m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ), + m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ), + + m_nSuperEsc ( (short)DFLT_ESC_SUPER ), + m_nSubEsc ( (short)DFLT_ESC_SUB ), + m_nScaleWidthItemSetVal ( 100 ), + m_nScaleWidthInitialVal ( 100 ), + m_nSuperProp ( (BYTE)DFLT_ESC_PROP ), m_nSubProp ( (BYTE)DFLT_ESC_PROP ) { FreeResource(); @@ -3175,7 +3175,7 @@ void SvxCharPositionPage::SetEscapement_Impl( USHORT nEsc ) IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) { - USHORT nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL + USHORT nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL if ( &m_aHighPosBtn == pBtn ) nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; @@ -3204,7 +3204,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) IMPL_LINK( SvxCharPositionPage, FontModifyHdl_Impl, MetricField*, EMPTYARG ) { BYTE nEscProp = (BYTE)m_aFontSizeEdit.GetValue(); - short nEsc = (short)m_aHighLowEdit.GetValue(); + short nEsc = (short)m_aHighLowEdit.GetValue(); nEsc *= m_aLowPosBtn.IsChecked() ? -1 : 1; UpdatePreview_Impl( 100, nEscProp, nEsc ); return 0; @@ -3641,7 +3641,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { - // Position (hoch, normal oder tief) + // Position (hoch, normal oder tief) const SfxItemSet& rOldSet = GetItemSet(); BOOL bModified = FALSE, bChanged = TRUE; USHORT nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); @@ -3670,7 +3670,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( pOld ) { const SvxEscapementItem& rItem = *( (const SvxEscapementItem*)pOld ); - if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) + if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) bChanged = FALSE; } @@ -3808,14 +3808,14 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rIn SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ), - m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ), - m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ), + m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ), + m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ), - m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ), - m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ), - m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ), - m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ), - m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ), + m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ), + m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ), + m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ), + m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ), + m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ), m_nStartBracketPosition( 0 ), m_nEndBracketPosition( 0 ) { @@ -4035,7 +4035,7 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -void SvxCharTwoLinesPage::UpdatePreview_Impl() +void SvxCharTwoLinesPage::UpdatePreview_Impl() { sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0 ? m_aStartBracketLB.GetSelectEntry().GetChar(0) : 0; diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h index 168502b6f331..f597a9beed85 100644 --- a/cui/source/tabpages/chardlg.h +++ b/cui/source/tabpages/chardlg.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,43 +30,43 @@ // define ---------------------------------------------------------------- -#define CHRDLG_UNDERLINE_NONE 0 -#define CHRDLG_UNDERLINE_SINGLE 1 -#define CHRDLG_UNDERLINE_DOUBLE 2 -#define CHRDLG_UNDERLINE_DOTTED 3 -#define CHRDLG_UNDERLINE_DONTKNOW 4 -#define CHRDLG_UNDERLINE_DASH 5 -#define CHRDLG_UNDERLINE_LONGDASH 6 -#define CHRDLG_UNDERLINE_DASHDOT 7 -#define CHRDLG_UNDERLINE_DASHDOTDOT 8 -#define CHRDLG_UNDERLINE_SMALLWAVE 9 -#define CHRDLG_UNDERLINE_WAVE 10 -#define CHRDLG_UNDERLINE_DOUBLEWAVE 11 -#define CHRDLG_UNDERLINE_BOLD 12 -#define CHRDLG_UNDERLINE_BOLDDOTTED 13 -#define CHRDLG_UNDERLINE_BOLDDASH 14 -#define CHRDLG_UNDERLINE_BOLDLONGDASH 15 -#define CHRDLG_UNDERLINE_BOLDDASHDOT 16 -#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT 17 -#define CHRDLG_UNDERLINE_BOLDWAVE 18 +#define CHRDLG_UNDERLINE_NONE 0 +#define CHRDLG_UNDERLINE_SINGLE 1 +#define CHRDLG_UNDERLINE_DOUBLE 2 +#define CHRDLG_UNDERLINE_DOTTED 3 +#define CHRDLG_UNDERLINE_DONTKNOW 4 +#define CHRDLG_UNDERLINE_DASH 5 +#define CHRDLG_UNDERLINE_LONGDASH 6 +#define CHRDLG_UNDERLINE_DASHDOT 7 +#define CHRDLG_UNDERLINE_DASHDOTDOT 8 +#define CHRDLG_UNDERLINE_SMALLWAVE 9 +#define CHRDLG_UNDERLINE_WAVE 10 +#define CHRDLG_UNDERLINE_DOUBLEWAVE 11 +#define CHRDLG_UNDERLINE_BOLD 12 +#define CHRDLG_UNDERLINE_BOLDDOTTED 13 +#define CHRDLG_UNDERLINE_BOLDDASH 14 +#define CHRDLG_UNDERLINE_BOLDLONGDASH 15 +#define CHRDLG_UNDERLINE_BOLDDASHDOT 16 +#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT 17 +#define CHRDLG_UNDERLINE_BOLDWAVE 18 -#define CHRDLG_STRIKEOUT_NONE 0 -#define CHRDLG_STRIKEOUT_SINGLE 1 -#define CHRDLG_STRIKEOUT_DOUBLE 2 -#define CHRDLG_STRIKEOUT_DONTKNOW 3 -#define CHRDLG_STRIKEOUT_BOLD 4 -#define CHRDLG_STRIKEOUT_SLASH 5 -#define CHRDLG_STRIKEOUT_X 6 +#define CHRDLG_STRIKEOUT_NONE 0 +#define CHRDLG_STRIKEOUT_SINGLE 1 +#define CHRDLG_STRIKEOUT_DOUBLE 2 +#define CHRDLG_STRIKEOUT_DONTKNOW 3 +#define CHRDLG_STRIKEOUT_BOLD 4 +#define CHRDLG_STRIKEOUT_SLASH 5 +#define CHRDLG_STRIKEOUT_X 6 -#define CHRDLG_ENCLOSE_NONE 0 -#define CHRDLG_ENCLOSE_ROUND 1 -#define CHRDLG_ENCLOSE_SQUARE 2 -#define CHRDLG_ENCLOSE_POINTED 3 -#define CHRDLG_ENCLOSE_CURVED 4 -#define CHRDLG_ENCLOSE_SPECIAL_CHAR 5 +#define CHRDLG_ENCLOSE_NONE 0 +#define CHRDLG_ENCLOSE_ROUND 1 +#define CHRDLG_ENCLOSE_SQUARE 2 +#define CHRDLG_ENCLOSE_POINTED 3 +#define CHRDLG_ENCLOSE_CURVED 4 +#define CHRDLG_ENCLOSE_SPECIAL_CHAR 5 -#define CHRDLG_POSITION_OVER 0 -#define CHRDLG_POSITION_UNDER 1 +#define CHRDLG_POSITION_OVER 0 +#define CHRDLG_POSITION_UNDER 1 #endif diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..fa33c07cedd9 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,142 +31,142 @@ // NamePage ----------------------------------------------------------------- -#define FL_WEST 100 -#define FT_WEST_NAME 101 -#define LB_WEST_NAME 102 -#define FT_WEST_STYLE 103 -#define LB_WEST_STYLE 104 -#define FT_WEST_SIZE 105 -#define LB_WEST_SIZE 106 -#define FT_WEST_LANG 107 -#define LB_WEST_LANG 108 - -#define FL_EAST 110 -#define FT_EAST_NAME 111 -#define LB_EAST_NAME 112 -#define FT_EAST_STYLE 113 -#define LB_EAST_STYLE 114 -#define FT_EAST_SIZE 115 -#define LB_EAST_SIZE 116 -#define FT_EAST_LANG 117 -#define LB_EAST_LANG 118 - -#define FL_CTL 120 -#define FT_CTL_NAME 121 -#define LB_CTL_NAME 122 -#define FT_CTL_STYLE 123 -#define LB_CTL_STYLE 124 -#define FT_CTL_SIZE 125 -#define LB_CTL_SIZE 126 -#define FT_CTL_LANG 127 -#define LB_CTL_LANG 128 - -#define WIN_CHAR_PREVIEW 131 -#define FT_CHAR_FONTTYPE 132 +#define FL_WEST 100 +#define FT_WEST_NAME 101 +#define LB_WEST_NAME 102 +#define FT_WEST_STYLE 103 +#define LB_WEST_STYLE 104 +#define FT_WEST_SIZE 105 +#define LB_WEST_SIZE 106 +#define FT_WEST_LANG 107 +#define LB_WEST_LANG 108 + +#define FL_EAST 110 +#define FT_EAST_NAME 111 +#define LB_EAST_NAME 112 +#define FT_EAST_STYLE 113 +#define LB_EAST_STYLE 114 +#define FT_EAST_SIZE 115 +#define LB_EAST_SIZE 116 +#define FT_EAST_LANG 117 +#define LB_EAST_LANG 118 + +#define FL_CTL 120 +#define FT_CTL_NAME 121 +#define LB_CTL_NAME 122 +#define FT_CTL_STYLE 123 +#define LB_CTL_STYLE 124 +#define FT_CTL_SIZE 125 +#define LB_CTL_SIZE 126 +#define FT_CTL_LANG 127 +#define LB_CTL_LANG 128 + +#define WIN_CHAR_PREVIEW 131 +#define FT_CHAR_FONTTYPE 132 #define FL_COLOR2 140 -#define FT_COLOR2 141 -#define LB_COLOR2 142 +#define FT_COLOR2 141 +#define LB_COLOR2 142 -#define STR_CHARNAME_NOSTYLE 150 -#define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_NOSTYLE 150 +#define STR_CHARNAME_TRANSPARENT 151 // EffectsPage -------------------------------------------------------------- #define FT_FONTCOLOR 201 #define LB_FONTCOLOR 202 -#define FT_EFFECTS 203 -#define LB_EFFECTS 204 -#define LB_EFFECTS2 205 +#define FT_EFFECTS 203 +#define LB_EFFECTS 204 +#define LB_EFFECTS2 205 #define FT_RELIEF 206 #define LB_RELIEF 207 -#define CB_OUTLINE 208 -#define CB_SHADOW 209 -#define CB_BLINKING 210 +#define CB_OUTLINE 208 +#define CB_SHADOW 209 +#define CB_BLINKING 210 #define CB_CHARHIDDEN 211 -#define FL_EFFECTS_VERTICAL 220 +#define FL_EFFECTS_VERTICAL 220 #define FT_OVERLINE 221 #define LB_OVERLINE 222 #define FT_OVERLINE_COLOR 223 #define LB_OVERLINE_COLOR 224 -#define FT_STRIKEOUT 225 -#define LB_STRIKEOUT 226 +#define FT_STRIKEOUT 225 +#define LB_STRIKEOUT 226 -#define FT_UNDERLINE 227 -#define LB_UNDERLINE 228 -#define FT_UNDERLINE_COLOR 229 -#define LB_UNDERLINE_COLOR 230 +#define FT_UNDERLINE 227 +#define LB_UNDERLINE 228 +#define FT_UNDERLINE_COLOR 229 +#define LB_UNDERLINE_COLOR 230 -#define CB_INDIVIDUALWORDS 231 +#define CB_INDIVIDUALWORDS 231 -#define FL_EFFECTS_ASIAN 240 +#define FL_EFFECTS_ASIAN 240 -#define FT_EMPHASIS 241 -#define LB_EMPHASIS 242 -#define FT_POSITION 243 -#define LB_POSITION 244 +#define FT_EMPHASIS 241 +#define LB_EMPHASIS 242 +#define FT_POSITION 243 +#define LB_POSITION 244 -#define WIN_EFFECTS_PREVIEW 251 -#define FT_EFFECTS_FONTTYPE 252 +#define WIN_EFFECTS_PREVIEW 251 +#define FT_EFFECTS_FONTTYPE 252 -#define STR_EFFECTS_TRANSPARENT 260 -#define STR_EFFECTS_CAPITALS 261 -#define STR_EFFECTS_LOWERCASE 262 -#define STR_EFFECTS_TITLE 263 -#define STR_EFFECTS_SMALL 264 -#define STR_EFFECTS_OUTLINE 265 -#define STR_EFFECTS_SHADOW 266 -#define STR_EFFECTS_BLINKING 267 +#define STR_EFFECTS_TRANSPARENT 260 +#define STR_EFFECTS_CAPITALS 261 +#define STR_EFFECTS_LOWERCASE 262 +#define STR_EFFECTS_TITLE 263 +#define STR_EFFECTS_SMALL 264 +#define STR_EFFECTS_OUTLINE 265 +#define STR_EFFECTS_SHADOW 266 +#define STR_EFFECTS_BLINKING 267 // PositionPage ------------------------------------------------------------- -#define FL_POSITION 300 -#define RB_HIGHPOS 301 -#define RB_NORMALPOS 302 -#define RB_LOWPOS 303 -#define FT_HIGHLOW 304 -#define ED_HIGHLOW 305 -#define CB_HIGHLOW 306 -#define FT_FONTSIZE 307 -#define ED_FONTSIZE 308 -#define FL_ROTATION_SCALING 309 -#define FL_SCALING 310 -#define RB_0_DEG 311 -#define RB_90_DEG 312 -#define RB_270_DEG 313 -#define CB_FIT_TO_LINE 314 -#define FT_SCALE_WIDTH 315 -#define MF_SCALE_WIDTH 316 - -#define FL_KERNING2 320 -#define LB_KERNING2 321 -#define FT_KERNING2 322 -#define ED_KERNING2 323 -#define CB_PAIRKERNING 324 - -#define WIN_POS_PREVIEW 331 -#define FT_POS_FONTTYPE 332 +#define FL_POSITION 300 +#define RB_HIGHPOS 301 +#define RB_NORMALPOS 302 +#define RB_LOWPOS 303 +#define FT_HIGHLOW 304 +#define ED_HIGHLOW 305 +#define CB_HIGHLOW 306 +#define FT_FONTSIZE 307 +#define ED_FONTSIZE 308 +#define FL_ROTATION_SCALING 309 +#define FL_SCALING 310 +#define RB_0_DEG 311 +#define RB_90_DEG 312 +#define RB_270_DEG 313 +#define CB_FIT_TO_LINE 314 +#define FT_SCALE_WIDTH 315 +#define MF_SCALE_WIDTH 316 + +#define FL_KERNING2 320 +#define LB_KERNING2 321 +#define FT_KERNING2 322 +#define ED_KERNING2 323 +#define CB_PAIRKERNING 324 + +#define WIN_POS_PREVIEW 331 +#define FT_POS_FONTTYPE 332 // TwoLinesPage ------------------------------------------------------------- -#define FL_SWITCHON 400 -#define CB_TWOLINES 401 +#define FL_SWITCHON 400 +#define CB_TWOLINES 401 -#define FL_ENCLOSE 410 -#define FT_STARTBRACKET 411 -#define ED_STARTBRACKET 412 -#define FT_ENDBRACKET 413 -#define ED_ENDBRACKET 414 +#define FL_ENCLOSE 410 +#define FT_STARTBRACKET 411 +#define ED_STARTBRACKET 412 +#define FT_ENDBRACKET 413 +#define ED_ENDBRACKET 414 -#define FL_TWOLINES_PREVIEW 420 -#define WIN_TWOLINES_PREVIEW 421 -#define FT_TWOLINES_FONTTYPE 422 +#define FL_TWOLINES_PREVIEW 420 +#define WIN_TWOLINES_PREVIEW 421 +#define FT_TWOLINES_FONTTYPE 422 #define FT_WEST_NAME_NOCJK 423 #define LB_WEST_NAME_NOCJK 424 diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 9673fc950f3f..532a1bf8946c 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 8962d489d8c5..126a0adb1402 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,11 +95,11 @@ SvxConnectionDialog::~SvxConnectionDialog() \************************************************************************/ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ), rInAttrs ), - aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbType ( this, CUI_RES( LB_TYPE ) ), + aFtType ( this, CUI_RES( FT_TYPE ) ), + aLbType ( this, CUI_RES( LB_TYPE ) ), aFlDelta ( this, CUI_RES( FL_DELTA ) ), aFtLine1 ( this, CUI_RES( FT_LINE_1 ) ), @@ -110,14 +110,14 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr aMtrFldLine3 ( this, CUI_RES( MTR_FLD_LINE_3 ) ), aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), - aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ), - aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ), + aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ), + aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ), aFtVert1 ( this, CUI_RES( FT_VERT_1 ) ), aMtrFldVert1 ( this, CUI_RES( MTR_FLD_VERT_1 ) ), aFtHorz2 ( this, CUI_RES( FT_HORZ_2 ) ), aMtrFldHorz2 ( this, CUI_RES( MTR_FLD_HORZ_2 ) ), aFtVert2 ( this, CUI_RES( FT_VERT_2 ) ), - aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ), + aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ), rOutAttrs ( rInAttrs ), @@ -331,8 +331,8 @@ void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) BOOL SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) { - BOOL bModified = FALSE; - INT32 nValue; + BOOL bModified = FALSE; + INT32 nValue; if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() ) { @@ -429,7 +429,7 @@ SfxTabPage* SvxConnectionPage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxConnectionPage::GetRanges() +USHORT* SvxConnectionPage::GetRanges() { return( pRanges ); } @@ -559,7 +559,7 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) ); - + Construct(); } diff --git a/cui/source/tabpages/connect.hrc b/cui/source/tabpages/connect.hrc index 2d0584d94232..263972a1dad0 100644 --- a/cui/source/tabpages/connect.hrc +++ b/cui/source/tabpages/connect.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src index 64623b0cee25..a52e893e601c 100644 --- a/cui/source/tabpages/connect.src +++ b/cui/source/tabpages/connect.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 433b5e6e2ab5..2a51a2c6fce3 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ SvxDistributeDialog::SvxDistributeDialog( const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) -: SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ), +: SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ), mpPage(0L) { mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer); @@ -85,27 +85,27 @@ SvxDistributePage::SvxDistributePage( const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) -: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), +: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), meDistributeHor(eHor), meDistributeVer(eVer), - 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 )), - maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), - maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), - maHorLow (this, CUI_RES(IMG_HOR_LOW )), - 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 )), - maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )), - maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), + 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 )), + maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), + maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), + maHorLow (this, CUI_RES(IMG_HOR_LOW )), + 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 )), + 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 )), + maVerCenter (this, CUI_RES(IMG_VER_CENTER )), maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), maVerHigh (this, CUI_RES(IMG_VER_HIGH )) { @@ -149,7 +149,7 @@ SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, |* \************************************************************************/ -UINT16* SvxDistributePage::GetRanges() +UINT16* SvxDistributePage::GetRanges() { return(pRanges); } diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc index 201fac2b5227..13d979e411e9 100644 --- a/cui/source/tabpages/dstribut.hrc +++ b/cui/source/tabpages/dstribut.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,32 +24,32 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FL_HORIZONTAL 1 -#define BTN_HOR_NONE 2 -#define BTN_HOR_LEFT 3 -#define BTN_HOR_CENTER 4 -#define BTN_HOR_DISTANCE 5 -#define BTN_HOR_RIGHT 6 -#define FL_VERTICAL 7 -#define BTN_VER_NONE 8 -#define BTN_VER_TOP 9 -#define BTN_VER_CENTER 10 -#define BTN_VER_DISTANCE 11 -#define BTN_VER_BOTTOM 12 -#define IMG_HOR_LOW 14 -#define IMG_HOR_CENTER 15 -#define IMG_HOR_DISTANCE 16 -#define IMG_HOR_HIGH 17 -#define IMG_VER_LOW 18 -#define IMG_VER_CENTER 19 -#define IMG_VER_DISTANCE 20 -#define IMG_VER_HIGH 21 +#define FL_HORIZONTAL 1 +#define BTN_HOR_NONE 2 +#define BTN_HOR_LEFT 3 +#define BTN_HOR_CENTER 4 +#define BTN_HOR_DISTANCE 5 +#define BTN_HOR_RIGHT 6 +#define FL_VERTICAL 7 +#define BTN_VER_NONE 8 +#define BTN_VER_TOP 9 +#define BTN_VER_CENTER 10 +#define BTN_VER_DISTANCE 11 +#define BTN_VER_BOTTOM 12 +#define IMG_HOR_LOW 14 +#define IMG_HOR_CENTER 15 +#define IMG_HOR_DISTANCE 16 +#define IMG_HOR_HIGH 17 +#define IMG_VER_LOW 18 +#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 +#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 18e38fd5236a..667d12ab8599 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src index a6a43160afa5..518defe0c95b 100644 --- a/cui/source/tabpages/frmdirlbox.src +++ b/cui/source/tabpages/frmdirlbox.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0500207c2049..24715455bf7c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP -#define CM_1_TO_TWIP 567 +#define CM_1_TO_TWIP 567 inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) @@ -57,7 +57,7 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) --------------------------------------------------------------------*/ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ), aCropFL( this, CUI_RES( FL_CROP )), aZoomConstRB( this, CUI_RES( RB_ZOOMCONST)), aSizeConstRB( this, CUI_RES( RB_SIZECONST)), @@ -71,16 +71,16 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) aBottomMF( this, CUI_RES( MF_BOTTOM )), aZoomFL( this, CUI_RES( FL_ZOOM )), aWidthZoomFT( this, CUI_RES( FT_WIDTHZOOM )), - aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )), - aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)), - aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)), + aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )), + aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)), + aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)), aSizeFL( this, CUI_RES( FL_SIZE )), aWidthFT( this, CUI_RES( FT_WIDTH )), aWidthMF( this, CUI_RES( MF_WIDTH )), aHeightFT( this, CUI_RES( FT_HEIGHT )), aHeightMF( this, CUI_RES( MF_HEIGHT )), aOrigSizeFT( this, CUI_RES(FT_ORIG_SIZE)), - aOrigSizePB( this, CUI_RES( PB_ORGSIZE )), + aOrigSizePB( this, CUI_RES( PB_ORGSIZE )), aExampleWN( this, CUI_RES( WN_BSP )), pLastCropField(0), bInitialized(FALSE), @@ -180,10 +180,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) SvxGrfCrop* pCrop = (SvxGrfCrop*)pItem; - aExampleWN.SetLeft( pCrop->GetLeft()); - aExampleWN.SetRight( pCrop->GetRight()); - aExampleWN.SetTop( pCrop->GetTop()); - aExampleWN.SetBottom( pCrop->GetBottom()); + aExampleWN.SetLeft( pCrop->GetLeft()); + aExampleWN.SetRight( pCrop->GetRight()); + aExampleWN.SetTop( pCrop->GetTop()); + aExampleWN.SetBottom( pCrop->GetBottom()); aLeftMF.SetValue( aLeftMF.Normalize( pCrop->GetLeft()), eUnit ); aRightMF.SetValue( aRightMF.Normalize( pCrop->GetRight()), eUnit ); @@ -291,7 +291,7 @@ BOOL SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) } } if( aLeftMF.IsModified() || aRightMF.IsModified() || - aTopMF.IsModified() || aBottomMF.IsModified() ) + aTopMF.IsModified() || aBottomMF.IsModified() ) { USHORT nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); @@ -493,16 +493,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; +// 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 = aPageSize.Width() - +// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -526,16 +526,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; +// 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 = aPageSize.Height() - +// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -629,7 +629,7 @@ void SvxGrfCropPage::CalcMinMaxBorder() aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; +/* nMin = (aOrigSize.Width() * 102) /100; aLeftMF.SetMax(aPageSize.Width() - nR - nMin); aRightMF.SetMax(aPageSize.Width() - nL - nMin); */ @@ -643,12 +643,12 @@ void SvxGrfCropPage::CalcMinMaxBorder() aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; +/* 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, + Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, FixedText mit der Originalgroesse fuellen --------------------------------------------------------------------*/ @@ -710,7 +710,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) sTemp += aFld.GetText(); aOrigSizeFT.SetText(sTemp); } - aLeftFT .Enable(bFound); + aLeftFT .Enable(bFound); aLeftMF .Enable(bFound); aRightFT .Enable(bFound); aRightMF .Enable(bFound); @@ -723,7 +723,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) aWidthFT .Enable(bFound); aWidthMF .Enable(bFound); aHeightFT .Enable(bFound); - aHeightMF .Enable(bFound); + aHeightMF .Enable(bFound); aWidthZoomFT .Enable(bFound); aWidthZoomMF .Enable(bFound); aHeightZoomFT .Enable(bFound); @@ -801,10 +801,10 @@ void SvxGrfCropPage::SvxCropExample::Paint( const Rectangle& ) aSz = PixelToLogic( aSz ); SetFillColor( Color( COL_TRANSPARENT ) ); SetRasterOp( ROP_INVERT ); - aRect.Left() += aTopLeft.Y(); - aRect.Top() += aTopLeft.X(); - aRect.Right() -= aBottomRight.Y(); - aRect.Bottom() -= aBottomRight.X(); + aRect.Left() += aTopLeft.Y(); + aRect.Top() += aTopLeft.X(); + aRect.Right() -= aBottomRight.Y(); + aRect.Bottom() -= aBottomRight.X(); DrawRect( aRect ); } diff --git a/cui/source/tabpages/grfpage.hrc b/cui/source/tabpages/grfpage.hrc index 438e67a8010f..72b288d8f415 100644 --- a/cui/source/tabpages/grfpage.hrc +++ b/cui/source/tabpages/grfpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FT_BOTTOM 1 +#define FT_BOTTOM 1 #define FT_HEIGHT 2 #define FT_HEIGHTZOOM 3 #define FT_LEFT 4 diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src index 74b9e8e5cda0..863f8787d083 100644 --- a/cui/source/tabpages/grfpage.src +++ b/cui/source/tabpages/grfpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,11 +31,11 @@ #include <svx/dialogs.hrc> /************************************************************/ -/* */ -/* */ -/* Crop-Page */ -/* */ -/* */ +/* */ +/* */ +/* Crop-Page */ +/* */ +/* */ /************************************************************/ TabPage RID_SVXPAGE_GRFCROP { diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 4eeb6be807fe..e722bfa43c6b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,21 +48,21 @@ // define ---------------------------------------------------------------- -#define AZ_OPTIMAL 0 -#define AZ_VON_OBEN 1 -#define AZ_VON_LINKS 2 -#define AZ_HORIZONTAL 3 -#define AZ_VERTIKAL 4 +#define AZ_OPTIMAL 0 +#define AZ_VON_OBEN 1 +#define AZ_VON_LINKS 2 +#define AZ_HORIZONTAL 3 +#define AZ_VERTIKAL 4 -#define AT_OBEN 0 -#define AT_MITTE 1 -#define AT_UNTEN 2 +#define AT_OBEN 0 +#define AT_MITTE 1 +#define AT_UNTEN 2 -#define WK_OPTIMAL 0 -#define WK_30 1 -#define WK_45 2 -#define WK_60 3 -#define WK_90 4 +#define WK_OPTIMAL 0 +#define WK_30 1 +#define WK_45 2 +#define WK_60 3 +#define WK_90 4 // static ---------------------------------------------------------------- @@ -84,27 +84,27 @@ static USHORT pCaptionRanges[] = // ----------------------------------------------------------------------- SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ), - - aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ), - aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ), - aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ), - aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ), - aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ), - aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ), - aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ), - aFT_UM( this, CUI_RES( FT_UM ) ), - aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ), - aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ), - aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ), - aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ), - aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ), - aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ), + + aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ), + aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ), + aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ), + aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ), + aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ), + aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ), + aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ), + aFT_UM( this, CUI_RES( FT_UM ) ), + aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ), + aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ), + aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ), + aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ), + aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ), + aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ), aStrHorzList( CUI_RES(STR_HORZ_LIST) ), aStrVertList( CUI_RES(STR_VERT_LIST) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { //------------NYI------------------------------------------- aFT_WINKEL.Hide(); @@ -138,9 +138,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl)); Image aImage; - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1))); - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2))); - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3))); FillValueSet(); @@ -178,7 +178,7 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) SfxItemPool* pPool = _rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit; + SfxMapUnit eUnit; nCaptionType = aCT_CAPTTYPE.GetSelectItemId()-1; @@ -195,8 +195,8 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) { switch( nEscDir ) { - case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; - case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; + case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; + case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; } } @@ -207,13 +207,13 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) if( bEscRel ) { - long nVal = 0; + long nVal = 0; switch( aLB_ANSATZ_REL.GetSelectEntryPos() ) { - case AT_OBEN: nVal=0;break; - case AT_MITTE: nVal=5000;break; - case AT_UNTEN: nVal=10000;break; + case AT_OBEN: nVal=0;break; + case AT_MITTE: nVal=5000;break; + case AT_UNTEN: nVal=10000;break; } _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) ); } @@ -265,11 +265,11 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) SetFieldUnit( aMF_ANSATZ, eFUnit ); SetFieldUnit( aMF_LAENGE, eFUnit ); - SfxItemPool* pPool = rOutAttrs.GetPool(); + SfxItemPool* pPool = rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - USHORT nWhich; - SfxMapUnit eUnit; + USHORT nWhich; + SfxMapUnit eUnit; //------- Winkel ---------- nWhich = GetWhich( SDRATTR_CAPTIONANGLE ); @@ -311,8 +311,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) { switch( nEscDir ) { - case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; - case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; + case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; + case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; } } @@ -392,7 +392,7 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxCaptionTabPage::GetRanges() +USHORT* SvxCaptionTabPage::GetRanges() { return( pCaptionRanges ); } @@ -401,13 +401,13 @@ USHORT* SvxCaptionTabPage::GetRanges() void SvxCaptionTabPage::SetupAnsatz_Impl( USHORT nType ) { - xub_StrLen nCnt=0, nIdx=0; + xub_StrLen nCnt=0, nIdx=0; switch( nType ) { case AZ_OPTIMAL: -// aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen -// aFT_UM.Hide(); +// aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen +// aFT_UM.Hide(); aMF_ANSATZ.Show(); aFT_UM.Show(); aFT_ANSATZ_REL.Hide(); @@ -580,7 +580,7 @@ void SvxCaptionTabPage::FillValueSet() SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes) - : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ), + : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ), pView ( pSdrView ), nAnchorCtrls(nAnchorTypes) { @@ -590,13 +590,13 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrVie //different positioning page in Writer if(nAnchorCtrls & 0x00ff ) - { - AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, + { + AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage( RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_SWPOSSIZE ); @@ -631,7 +631,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) SvxSwPosSizeTabPage& rSwPage = static_cast<SvxSwPosSizeTabPage&>(rPage); rSwPage.EnableAnchorTypes(nAnchorCtrls); rSwPage.SetValidateFramePosLink( aValidateLink ); - } + } break; case RID_SVXPAGE_CAPTION: @@ -646,7 +646,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) 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..5c82d8c90fcc 100644 --- a/cui/source/tabpages/labdlg.hrc +++ b/cui/source/tabpages/labdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,53 +25,53 @@ * ************************************************************************/ #include <cuires.hrc> -//#define RID_SVXPAGE_CAPTION 1000 -//#define RID_SVXDLG_CAPTION 1001 +//#define RID_SVXPAGE_CAPTION 1000 +//#define RID_SVXDLG_CAPTION 1001 -#define TAB_CONTROL 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define TAB_CONTROL 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 -#define FT_ABSTAND 1 -#define FT_WINKEL 2 -#define FT_ANSATZ 3 -#define FT_LAENGE 4 -#define FT_UM 5 -#define FT_ANSATZ_REL 6 +#define FT_ABSTAND 1 +#define FT_WINKEL 2 +#define FT_ANSATZ 3 +#define FT_LAENGE 4 +#define FT_UM 5 +#define FT_ANSATZ_REL 6 -#define CT_CAPTTYPE 1 +#define CT_CAPTTYPE 1 -#define MF_ABSTAND 1 -#define MF_ANSATZ 2 -#define MF_LAENGE 3 +#define MF_ABSTAND 1 +#define MF_ANSATZ 2 +#define MF_LAENGE 3 -#define CB_LAENGE 1 +#define CB_LAENGE 1 -#define CM_LAENGE 1 +#define CM_LAENGE 1 -#define LB_WINKEL 1 -#define LB_ANSATZ 2 -#define LB_ANSATZ_REL 3 +#define LB_WINKEL 1 +#define LB_ANSATZ 2 +#define LB_ANSATZ_REL 3 -#define STR_CAPTTYPE_1 1 -#define STR_CAPTTYPE_2 2 -#define STR_CAPTTYPE_3 3 -#define STR_CAPTTYPE_4 4 -#define STR_HORZ_LIST 10 -#define STR_VERT_LIST 11 +#define STR_CAPTTYPE_1 1 +#define STR_CAPTTYPE_2 2 +#define STR_CAPTTYPE_3 3 +#define STR_CAPTTYPE_4 4 +#define STR_HORZ_LIST 10 +#define STR_VERT_LIST 11 -#define BMP_CAPTTYPE_1 1 -#define BMP_CAPTTYPE_2 2 -#define BMP_CAPTTYPE_3 3 -#define BMP_CAPTTYPE_4 4 +#define BMP_CAPTTYPE_1 1 +#define BMP_CAPTTYPE_2 2 +#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 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 -#define SHOW_NONE 4 +#define SHOW_HORZ 1 +#define SHOW_VERT 2 +#define SHOW_ABS 3 +#define SHOW_NONE 4 diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index ed13f2de9b49..45e8aa370ff7 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -255,7 +255,7 @@ TabDialog RID_SVXDLG_CAPTION\ Identifier = RID_SVXPAGE_POSITION_SIZE ; PageResID = RID_SVXPAGE_POSITION_SIZE ; _POS_SIZE_TEXT - }; + }; PageItem { Identifier = RID_SVXPAGE_SWPOSSIZE; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index ebdc7554123d..69bc1ac0a319 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,25 +59,25 @@ public: _SfxMacroTabPage_Impl( void ); ~_SfxMacroTabPage_Impl(); - String maStaticMacroLBLabel; - PushButton* pAssignPB; - PushButton* pDeletePB; - String* pStrEvent; - String* pAssignedMacro; - ListBox* pScriptTypeLB; - _HeaderTabListBox* pEventLB; - SfxConfigGroupListBox_Impl* pGroupLB; - FixedText* pFT_MacroLBLabel; - SfxConfigFunctionListBox_Impl* pMacroLB; - - FixedText* pMacroFT; - String* pMacroStr; - FNGetRangeHdl fnGetRange; - FNGetMacrosOfRangeHdl fnGetMacroOfRange; - - BOOL bReadOnly; + String maStaticMacroLBLabel; + PushButton* pAssignPB; + PushButton* pDeletePB; + String* pStrEvent; + String* pAssignedMacro; + ListBox* pScriptTypeLB; + _HeaderTabListBox* pEventLB; + SfxConfigGroupListBox_Impl* pGroupLB; + FixedText* pFT_MacroLBLabel; + SfxConfigFunctionListBox_Impl* pMacroLB; + + FixedText* pMacroFT; + String* pMacroStr; + FNGetRangeHdl fnGetRange; + FNGetMacrosOfRangeHdl fnGetMacroOfRange; + + BOOL bReadOnly; Timer maFillGroupTimer; - BOOL bGotEvents; + BOOL bGotEvents; }; _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) : @@ -130,15 +130,15 @@ static long nTabs[] = 0, 90 }; -#define TAB_WIDTH_MIN 10 +#define TAB_WIDTH_MIN 10 // IDs for items in HeaderBar of EventLB -#define ITEMID_EVENT 1 -#define ITMEID_ASSMACRO 2 +#define ITEMID_EVENT 1 +#define ITMEID_ASSMACRO 2 -#define LB_EVENTS_ITEMPOS 1 -#define LB_MACROS_ITEMPOS 2 +#define LB_EVENTS_ITEMPOS 1 +#define LB_MACROS_ITEMPOS 2 String ConvertToUIName_Impl( SvxMacro *pMacro, const String& /*rLanguage*/ ) { @@ -273,7 +273,7 @@ BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) return FALSE; } -void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) +void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) { const SfxPoolItem* pEventsItem; if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) ) @@ -326,10 +326,10 @@ BOOL _SfxMacroTabPage::IsReadOnly() const IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; - SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); - ULONG nPos; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); + SvLBoxEntry* pE = rListBox.FirstSelected(); + ULONG nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { @@ -360,14 +360,14 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; - String sSel( pImpl->pGroupLB->GetGroup() ); - String aLanguage = pImpl->pScriptTypeLB->GetSelectEntry(); + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + String sSel( pImpl->pGroupLB->GetGroup() ); + String aLanguage = pImpl->pScriptTypeLB->GetSelectEntry(); if( !aLanguage.EqualsAscii( "JavaScript" ) ) { pImpl->pGroupLB->GroupSelected(); - SfxMacroInfo* pMacro = pImpl->pMacroLB->GetMacroInfo(); - String aLabelText; + SfxMacroInfo* pMacro = pImpl->pMacroLB->GetMacroInfo(); + String aLabelText; if( pMacro ) { aLabelText = pImpl->maStaticMacroLBLabel; @@ -387,7 +387,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; pImpl->pMacroLB->FunctionSelected(); pThis->EnableButtons( pImpl->pScriptTypeLB->GetSelectEntry() ); return 0; @@ -401,7 +401,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); SvLBoxEntry* pE = rListBox.FirstSelected(); ULONG nPos; @@ -489,12 +489,12 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG ) void _SfxMacroTabPage::InitAndSetHandler() { // Handler installieren - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); - Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); + Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pMacroLB->SetDoubleClickHdl( aLnk ); - mpImpl->pDeletePB->SetClickHdl( aLnk ); - mpImpl->pAssignPB->SetClickHdl( aLnk ); + mpImpl->pDeletePB->SetClickHdl( aLnk ); + mpImpl->pAssignPB->SetClickHdl( aLnk ); rListBox.SetDoubleClickHdl( aLnk ); rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl )); @@ -507,7 +507,7 @@ void _SfxMacroTabPage::InitAndSetHandler() rListBox.SetTabs( &nTabs[0], MAP_APPFONT ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, *mpImpl->pStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); - aSize.Width() = 1764; // don't know what, so 42^2 is best to use... + aSize.Width() = 1764; // don't know what, so 42^2 is best to use... rHeaderBar.InsertItem( ITMEID_ASSMACRO, *mpImpl->pAssignedMacro, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); rListBox.SetSpaceBetweenEntries( 0 ); @@ -552,23 +552,23 @@ void _SfxMacroTabPage::FillMacroList() void _SfxMacroTabPage::FillEvents() { - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - String aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry(); - ULONG nEntryCnt = rListBox.GetEntryCount(); + String aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry(); + ULONG nEntryCnt = rListBox.GetEntryCount(); // Events aus der Tabelle holen und die EventListBox entsprechen fuellen for( ULONG n = 0 ; n < nEntryCnt ; ++n ) { - SvLBoxEntry* pE = rListBox.GetEntry( n ); + SvLBoxEntry* pE = rListBox.GetEntry( n ); if( pE ) { - SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); + SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); DBG_ASSERT( pLItem && SV_ITEM_ID_LBOXSTRING == pLItem->IsA(), "_SfxMacroTabPage::FillEvents(): no LBoxString" ); - String sOld( pLItem->GetText() ); - String sNew; - USHORT nEventId = ( USHORT ) ( ULONG ) pE->GetUserData(); + String sOld( pLItem->GetText() ); + String sNew; + USHORT nEventId = ( USHORT ) ( ULONG ) pE->GetUserData(); if( aTbl.IsKeyValid( nEventId ) ) sNew = ConvertToUIName_Impl( aTbl.Get( nEventId ), aLanguage ); @@ -583,12 +583,12 @@ void _SfxMacroTabPage::FillEvents() void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId ) { - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - ULONG nEntryCnt = rListBox.GetEntryCount(); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + ULONG nEntryCnt = rListBox.GetEntryCount(); for( ULONG n = 0 ; n < nEntryCnt ; ++n ) { - SvLBoxEntry* pE = rListBox.GetEntry( n ); + SvLBoxEntry* pE = rListBox.GetEntry( n ); if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId ) { rListBox.SetCurEntry( pE ); @@ -674,19 +674,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl( SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rResId, rSet ) { - mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); - mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); - mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); - mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); - mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); - mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) ); + mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); + mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); + mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); + mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); + mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); + mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) ); mpImpl->pScriptTypeLB->Hide(); - mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) ); - mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) ); - mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) ); + mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) ); + mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) ); + mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) ); mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText(); - mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) ); - mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) ); + mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) ); + mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) ); FreeResource(); diff --git a/cui/source/tabpages/macroass.hrc b/cui/source/tabpages/macroass.hrc index 614711e1981e..9c6fd7ccd021 100644 --- a/cui/source/tabpages/macroass.hrc +++ b/cui/source/tabpages/macroass.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,51 +32,51 @@ #include <svtools/controldims.hrc> #endif -#define LB_EVENT 2 -#define PB_ASSIGN 3 -#define PB_DELETE 4 -#define FT_MACRO 5 -#define LB_GROUP 6 -#define LB_MACROS 7 -#define LB_SCRIPTTYPE 8 -#define FT_LABEL4LB_MACROS 9 -#define STR_JAVASCRIPT 10 -#define STR_MACROS 11 -#define ED_JAVASCRIPT 12 -#define STR_EVENT 13 -#define STR_ASSMACRO 14 +#define LB_EVENT 2 +#define PB_ASSIGN 3 +#define PB_DELETE 4 +#define FT_MACRO 5 +#define LB_GROUP 6 +#define LB_MACROS 7 +#define LB_SCRIPTTYPE 8 +#define FT_LABEL4LB_MACROS 9 +#define STR_JAVASCRIPT 10 +#define STR_MACROS 11 +#define ED_JAVASCRIPT 12 +#define STR_EVENT 13 +#define STR_ASSMACRO 14 // COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5 // <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2-> -#define WIDTH_TP 260 // of whole tabpage -#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) -#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) -#define COL3 (COL4-RSC_SP_CTRL_X) -#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) -#define WIDTH1_2 (COL3-COL0) // width of upper listbox -#define SPACE1 4 // space between lower listboxes -#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox -#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox -#define COL1 (COL0+WIDTH1) -#define COL2 (COL1+SPACE1) +#define WIDTH_TP 260 // of whole tabpage +#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) +#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) +#define COL3 (COL4-RSC_SP_CTRL_X) +#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) +#define WIDTH1_2 (COL3-COL0) // width of upper listbox +#define SPACE1 4 // space between lower listboxes +#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox +#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox +#define COL1 (COL0+WIDTH1) +#define COL2 (COL1+SPACE1) -#define HEIGHT_TP 185 // of whole tabpage -#define HEIGHT0 62 // of upper listbox -#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design -#define ROW1 (ROW0+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button -#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) -#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Remove button -#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) -#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) -#define ROW6 (ROW0+HEIGHT0) -#define ROW7 (ROW6+RSC_SP_CTRL_Y) -#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS -#define ROW7A (ROW7+HEIGHT_EXTRA7) -#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) -#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) -#define HEIGHT8 (ROW9-ROW8) // of lower listboxes +#define HEIGHT_TP 185 // of whole tabpage +#define HEIGHT0 62 // of upper listbox +#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design +#define ROW1 (ROW0+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button +#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) +#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Remove button +#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) +#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) +#define ROW6 (ROW0+HEIGHT0) +#define ROW7 (ROW6+RSC_SP_CTRL_Y) +#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS +#define ROW7A (ROW7+HEIGHT_EXTRA7) +#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) +#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) +#define HEIGHT8 (ROW9-ROW8) // of lower listboxes #endif diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 4f5d78ffe795..c64aac6c1284 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index a6f198151f26..13c60ff7378e 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,25 +96,25 @@ SvxMeasureDialog::~SvxMeasureDialog() \************************************************************************/ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ), + SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ), rInAttrs ), aFlLine ( this, CUI_RES( FL_LINE ) ), - aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ), - aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ), - aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ), - aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ), - aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ), - aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ), - aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ), - aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ), - aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ), - aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ), - aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ), - aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ), - aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ), - - aFlLabel ( this, CUI_RES( FL_LABEL ) ), + aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ), + aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ), + aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ), + aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ), + aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ), + aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ), + aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ), + aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ), + aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ), + aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ), + aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ), + aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ), + aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ), + + aFlLabel ( this, CUI_RES( FL_LABEL ) ), aFtPosition ( this, CUI_RES( FT_POSITION ) ), aCtlPosition ( this, CUI_RES( CTL_POSITION ) ), aTsbAutoPosV ( this, CUI_RES( TSB_AUTOPOSV ) ), @@ -123,12 +123,12 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : aLbUnit ( this, CUI_RES( LB_UNIT ) ), aTsbParallel ( this, CUI_RES( TSB_PARALLEL ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ), - + aFlVert ( this, CUI_RES( FL_VERT ) ), rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), pView( 0 ), - + bPositionModified ( FALSE ) { FillUnitLB(); @@ -364,37 +364,37 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) case SDRMEASURE_ABOVE: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MT; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RT; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MT; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RT; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; } break; case SDRMEASURETEXT_VERTICALCENTERED: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; } break; case SDRMEASURE_BELOW: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MB; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RB; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MB; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RB; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; } break; case SDRMEASURE_TEXTVAUTO: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; } break; default: ;//prevent warning @@ -443,8 +443,8 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { - BOOL bModified = FALSE; - INT32 nValue; + BOOL bModified = FALSE; + INT32 nValue; TriState eState; if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() ) @@ -631,7 +631,7 @@ SfxTabPage* SvxMeasurePage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxMeasurePage::GetRanges() +USHORT* SvxMeasurePage::GetRanges() { return( pRanges ); } @@ -866,10 +866,10 @@ void SvxMeasurePage::FillUnitLB() void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); - + if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue())); - + Construct(); } diff --git a/cui/source/tabpages/measure.hrc b/cui/source/tabpages/measure.hrc index 11dfaba27d22..0229ca775d5d 100644 --- a/cui/source/tabpages/measure.hrc +++ b/cui/source/tabpages/measure.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,9 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FL_LINE 1 -#define FL_LABEL 2 -#define FL_VERT 3 +#define FL_LINE 1 +#define FL_LABEL 2 +#define FL_VERT 3 #define FT_LINE_DIST 1 #define FT_HELPLINE_OVERHANG 2 diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src index 79c46b13079b..bec4950362cf 100644 --- a/cui/source/tabpages/measure.src +++ b/cui/source/tabpages/measure.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 1fe6de438dc0..efc287f000a4 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,16 +79,16 @@ static USHORT pRanges[] = }; /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreview +#* Klasse: SvxNumberPreview #* -#* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl +#* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl #* -#* Input: Fenster, Resource-ID +#* Input: Fenster, Resource-ID #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -106,16 +106,16 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId } /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreview +#* Klasse: SvxNumberPreview #* -#* Funktion: Destruktor der Klasse SvxNumberPreviewImpl +#* Funktion: Destruktor der Klasse SvxNumberPreviewImpl #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -124,16 +124,16 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl() } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreviewImpl +#* Klasse: SvxNumberPreviewImpl #* -#* Funktion: Funktion fuer das Aendern des Preview- Strings +#* Funktion: Funktion fuer das Aendern des Preview- Strings #* -#* Input: String, Farbe +#* Input: String, Farbe #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -149,24 +149,24 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr, } /************************************************************************* -#* Methode: Paint Datum:02.10.97 +#* Methode: Paint Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreviewImpl +#* Klasse: SvxNumberPreviewImpl #* -#* Funktion: Funktion fuer das neu zeichnen des Fensters. +#* Funktion: Funktion fuer das neu zeichnen des Fensters. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberPreviewImpl::Paint( const Rectangle& ) { - Font aDrawFont = GetFont(); - Size aSzWnd = GetOutputSizePixel(); - Point aPosText = Point( (aSzWnd.Width() - GetTextWidth( aPrevStr )) /2, + Font aDrawFont = GetFont(); + Size aSzWnd = GetOutputSizePixel(); + Point aPosText = Point( (aSzWnd.Width() - GetTextWidth( aPrevStr )) /2, (aSzWnd.Height() - GetTextHeight())/2 ); aDrawFont.SetColor( aPrevCol ); @@ -225,11 +225,11 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) // class SvxNumberFormatTabPage ------------------------------------------ #define REMOVE_DONTKNOW() \ - if ( !aFtLanguage.IsEnabled() ) \ - { \ - aFtLanguage .Enable(); \ - aLbLanguage .Enable(); \ - aLbLanguage .SelectLanguage( pNumFmtShell->GetCurLanguage() ); \ + if ( !aFtLanguage.IsEnabled() ) \ + { \ + aFtLanguage .Enable(); \ + aLbLanguage .Enable(); \ + aLbLanguage .SelectLanguage( pNumFmtShell->GetCurLanguage() ); \ } #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) @@ -248,16 +248,16 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) #define THIS_CUI_RES CUI_RES #endif /* !ENABLE_LAYOUT */ -SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, - const SfxItemSet& rCoreAttrs ) +SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, + const SfxItemSet& rCoreAttrs ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ), aFtCategory ( this, CUI_RES( FT_CATEGORY ) ), - aLbCategory ( this, CUI_RES( LB_CATEGORY ) ), - aFtFormat ( this, CUI_RES( FT_FORMAT ) ), - aLbCurrency ( this, CUI_RES( LB_CURRENCY) ), - aLbFormat ( this, CUI_RES( LB_FORMAT ) ), + aLbCategory ( this, CUI_RES( LB_CATEGORY ) ), + aFtFormat ( this, CUI_RES( FT_FORMAT ) ), + aLbCurrency ( this, CUI_RES( LB_CURRENCY) ), + aLbFormat ( this, CUI_RES( LB_FORMAT ) ), aFtLanguage ( this, CUI_RES( FT_LANGUAGE ) ), aLbLanguage ( this, CUI_RES( LB_LANGUAGE ), FALSE ), aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ), @@ -268,15 +268,15 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, aBtnNegRed ( this, CUI_RES( BTN_NEGRED ) ), aBtnThousand ( this, CUI_RES( BTN_THOUSAND ) ), aFlOptions ( this, CUI_RES( FL_OPTIONS ) ), - + aFtEdFormat ( this, CUI_RES( FT_EDFORMAT ) ), - aEdFormat ( this, CUI_RES( ED_FORMAT ) ), + aEdFormat ( this, CUI_RES( ED_FORMAT ) ), aIbAdd ( this, CUI_RES( IB_ADD ) ), aIbInfo ( this, CUI_RES( IB_INFO ) ), aIbRemove ( this, CUI_RES( IB_REMOVE ) ), aFtComment ( this, CUI_RES( FT_COMMENT ) ), aEdComment ( this, CUI_RES( ED_COMMENT ) ), - + #if ENABLE_LAYOUT aWndPreview ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ), #else @@ -285,7 +285,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, pNumItem ( NULL ), pNumFmtShell ( NULL ), nInitFormat ( ULONG_MAX ), - + sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)), pLastActivWindow( NULL ) { @@ -307,33 +307,33 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { - ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); - ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); + ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); + ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); bNumItemFlag=TRUE; bOneAreaFlag=FALSE; nCatHeight=aLbCategory.GetSizePixel().Height(); - nCurFormatY =aLbFormat.GetPosPixel().Y(); + nCurFormatY =aLbFormat.GetPosPixel().Y(); nCurFormatHeight=aLbFormat.GetSizePixel().Height(); - nStdFormatY =aLbCurrency.GetPosPixel().Y(); + nStdFormatY =aLbCurrency.GetPosPixel().Y(); nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight; - aIbAdd. SetModeImage( aIconList.GetImage( IID_ADD ) ); - aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST ); + 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 ); + 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 ); + aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); + aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); aIbAdd.Enable(FALSE ); aIbRemove.Enable(FALSE ); aIbInfo.Enable(FALSE ); - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen aEdComment.Hide(); @@ -344,29 +344,29 @@ void SvxNumberFormatTabPage::Init_Impl() // Handler verbinden Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl ); - aLbCategory .SetSelectHdl( aLink ); - aLbFormat .SetSelectHdl( aLink ); - aLbLanguage .SetSelectHdl( aLink ); - aLbCurrency .SetSelectHdl( aLink ); + aLbCategory .SetSelectHdl( aLink ); + aLbFormat .SetSelectHdl( aLink ); + aLbLanguage .SetSelectHdl( aLink ); + aLbCurrency .SetSelectHdl( aLink ); aCbSourceFormat .SetClickHdl( aLink ); aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl ); - aEdDecimals .SetModifyHdl( aLink ); - aEdLeadZeroes .SetModifyHdl( aLink ); - aBtnNegRed .SetClickHdl( aLink ); - aBtnThousand .SetClickHdl( aLink ); - aLbFormat .SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); - aEdFormat .SetModifyHdl( HDL( EditHdl_Impl ) ); + aEdDecimals .SetModifyHdl( aLink ); + aEdLeadZeroes .SetModifyHdl( aLink ); + aBtnNegRed .SetClickHdl( aLink ); + aBtnThousand .SetClickHdl( aLink ); + aLbFormat .SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); + aEdFormat .SetModifyHdl( HDL( EditHdl_Impl ) ); aIbAdd.SetClickHdl( HDL( ClickHdl_Impl ) ); aIbRemove.SetClickHdl( HDL( ClickHdl_Impl ) ); aIbInfo.SetClickHdl( HDL( ClickHdl_Impl ) ); aLink = LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl); - aEdComment .SetLoseFocusHdl( aLink); - aResetWinTimer .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl)); - aResetWinTimer .SetTimeout( 10); + aEdComment .SetLoseFocusHdl( aLink); + aResetWinTimer .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl)); + aResetWinTimer .SetTimeout( 10); // Sprachen-ListBox initialisieren @@ -384,16 +384,16 @@ void SvxNumberFormatTabPage::Init_Impl() } /************************************************************************* -#* Methode: GetRanges Datum:02.10.97 +#* Methode: GetRanges Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Liefert Bereichsangaben zurueck. +#* Funktion: Liefert Bereichsangaben zurueck. #* -#* Input: --- +#* Input: --- #* -#* Output: Bereich +#* Output: Bereich #* #************************************************************************/ @@ -404,20 +404,20 @@ USHORT* SvxNumberFormatTabPage::GetRanges() /************************************************************************* -#* Methode: Create Datum:02.10.97 +#* Methode: Create Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Erzeugt eine neue Zahlenformat- Seite. +#* Funktion: Erzeugt eine neue Zahlenformat- Seite. #* -#* Input: Fenster, SfxItemSet +#* Input: Fenster, SfxItemSet #* -#* Output: neue TabPage +#* Output: neue TabPage #* #************************************************************************/ -SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, +SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxNumberFormatTabPage( pParent, rAttrSet ) ); @@ -425,34 +425,34 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, /************************************************************************* -#* Methode: Reset Datum:02.10.97 +#* Methode: Reset Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Die Attribute des Dialogs werden mit Hilfe -#* des Itemsets neu eingestellt. +#* Funktion: Die Attribute des Dialogs werden mit Hilfe +#* des Itemsets neu eingestellt. #* -#* Input: SfxItemSet +#* Input: SfxItemSet #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) { - const SfxUInt32Item* pValFmtAttr = NULL; - const SfxPoolItem* pItem = NULL; + const SfxUInt32Item* pValFmtAttr = NULL; + const SfxPoolItem* pItem = NULL; const SfxBoolItem* pAutoEntryAttr = NULL; - USHORT nCatLbSelPos = 0; - USHORT nFmtLbSelPos = 0; - LanguageType eLangType = LANGUAGE_DONTKNOW; - SvxDelStrgs aFmtEntryList; - SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; - double nValDouble = 0; - String aValString; - SfxItemState eState = SFX_ITEM_DONTCARE; + USHORT nCatLbSelPos = 0; + USHORT nFmtLbSelPos = 0; + LanguageType eLangType = LANGUAGE_DONTKNOW; + SvxDelStrgs aFmtEntryList; + SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; + double nValDouble = 0; + String aValString; + SfxItemState eState = SFX_ITEM_DONTCARE; eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),TRUE,&pItem); @@ -546,7 +546,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) aValString = pNumItem->GetValueString(); break; case SVX_VALUE_TYPE_NUMBER: - // #50441# string may be set in addition to the value + // #50441# string may be set in addition to the value aValString = pNumItem->GetValueString(); nValDouble = pNumItem->GetValueDouble(); break; @@ -558,11 +558,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // nun sind alle Informationen fuer die Formatierer-Shell beisammen: if ( pNumFmtShell ) - delete pNumFmtShell; // ggF. alte Shell loeschen (==Reset) + delete pNumFmtShell; // ggF. alte Shell loeschen (==Reset) - nInitFormat = ( pValFmtAttr ) // Init-Key merken - ? pValFmtAttr->GetValue() // (fuer FillItemSet()) - : ULONG_MAX; // == DONT_KNOW + nInitFormat = ( pValFmtAttr ) // Init-Key merken + ? pValFmtAttr->GetValue() // (fuer FillItemSet()) + : ULONG_MAX; // == DONT_KNOW if ( eValType == SVX_VALUE_TYPE_STRING ) @@ -621,13 +621,13 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) //! 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? -// SelFormatHdl_Impl( &aLbCategory ); +// SelFormatHdl_Impl( &aLbCategory ); if ( pValFmtAttr ) { EditHdl_Impl( &aEdFormat ); // UpdateOptions_Impl() als Seiteneffekt } - else // DONT_KNOW + else // DONT_KNOW { // Kategoriewechsel und direkte Eingabe sind moeglich, sonst nix: Obstructing(); @@ -643,50 +643,50 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } /************************************************************************* -#* Methode: Obstructing Datum:02.10.97 +#* Methode: Obstructing Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel -#* und direkter Eingabe. +#* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel +#* und direkter Eingabe. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::Obstructing() { - aLbFormat .SetNoSelection(); - aLbLanguage .SetNoSelection(); - aFtLanguage .Disable(); - aLbLanguage .Disable(); + aLbFormat .SetNoSelection(); + aLbLanguage .SetNoSelection(); + aFtLanguage .Disable(); + aLbLanguage .Disable(); aIbAdd.Enable(FALSE ); aIbRemove.Enable(FALSE ); aIbInfo.Enable(FALSE ); - aBtnNegRed .Disable(); - aBtnThousand .Disable(); - aFtLeadZeroes .Disable(); - aFtDecimals .Disable(); - aEdLeadZeroes .Disable(); - aEdDecimals .Disable(); - aFlOptions .Disable(); - aEdDecimals .SetText( String() ); - aEdLeadZeroes .SetText( String() ); - aBtnNegRed .Check( FALSE ); - aBtnThousand .Check( FALSE ); + aBtnNegRed .Disable(); + aBtnThousand .Disable(); + aFtLeadZeroes .Disable(); + aFtDecimals .Disable(); + aEdLeadZeroes .Disable(); + aEdDecimals .Disable(); + aFlOptions .Disable(); + aEdDecimals .SetText( String() ); + aEdLeadZeroes .SetText( String() ); + aBtnNegRed .Check( FALSE ); + aBtnThousand .Check( FALSE ); aWndPreview .NotifyChange( String() ); - aLbCategory .SelectEntryPos( 0 ); - aEdFormat .SetText( String() ); - aFtComment .SetText( String() ); - aEdComment .SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aLbCategory .SelectEntryPos( 0 ); + aEdFormat .SetText( String() ); + aFtComment .SetText( String() ); + aEdComment .SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen - aEdFormat .GrabFocus(); + aEdFormat .GrabFocus(); } @@ -725,16 +725,16 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() /************************************************************************* -#* Methode: HideLanguage Datum:14.05.98 +#* Methode: HideLanguage Datum:14.05.98 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Versteckt die Spracheinstellung: +#* Funktion: Versteckt die Spracheinstellung: #* -#* Input: BOOL nFlag +#* Input: BOOL nFlag #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -758,18 +758,18 @@ void SvxNumberFormatTabPage::HideLanguage(BOOL nFlag) } /************************************************************************* -#* Methode: FillItemSet Datum:02.10.97 +#* Methode: FillItemSet Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Stellt die Attribute im ItemSet ein, -#* sowie in der DocShell den numItem, wenn -#* bNumItemFlag nicht gesetzt ist. +#* Funktion: Stellt die Attribute im ItemSet ein, +#* sowie in der DocShell den numItem, wenn +#* bNumItemFlag nicht gesetzt ist. #* -#* Input: SfxItemSet +#* Input: SfxItemSet #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -779,12 +779,12 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if ( bDataChanged ) { const SfxItemSet& rMyItemSet = GetItemSet(); - USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); + USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); SfxItemState eItemState = rMyItemSet.GetItemState( nWhich, FALSE ); // OK chosen - Is format code input entered already taken over? // If not, simulate Add. Upon syntax error ignore input and prevent Put. - String aFormat = aEdFormat.GetText(); + String aFormat = aEdFormat.GetText(); sal_uInt32 nCurKey = pNumFmtShell->GetCurNumFmtKey(); if ( aIbAdd.IsEnabled() || pNumFmtShell->IsTmpCurrencyFormat(aFormat) ) @@ -824,7 +824,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if ( nDelCount > 0 ) { - sal_uInt32* pDelArr = new sal_uInt32[nDelCount]; + sal_uInt32* pDelArr = new sal_uInt32[nDelCount]; pNumFmtShell->GetUpdateData( pDelArr, nDelCount ); pNumItem->SetDelFormatArray( pDelArr, nDelCount ); @@ -835,7 +835,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) } else { - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -881,7 +881,7 @@ int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { const ULONG nCurKey = pNumFmtShell->GetCurNumFmtKey(); const USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); - SfxItemState eItemState = GetItemSet().GetItemState( nWhich, FALSE ); + SfxItemState eItemState = GetItemSet().GetItemState( nWhich, FALSE ); if ( (nInitFormat == nCurKey) && (SFX_ITEM_DEFAULT == eItemState) ) _pSet->ClearItem( nWhich ); @@ -904,13 +904,13 @@ void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem ) void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) { - String* pEntry; - String aTmpString; - String aTmpCatString; - Font aFont=aLbCategory.GetFont(); - USHORT i = 0; - short nTmpCatPos; - short aPrivCat; + String* pEntry; + String aTmpString; + String aTmpCatString; + Font aFont=aLbCategory.GetFont(); + USHORT i = 0; + short nTmpCatPos; + short aPrivCat; aLbFormat.Clear(); aLbFormat.SetUpdateMode( FALSE ); @@ -932,7 +932,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) { case CAT_ALL: case CAT_TEXT: - case CAT_NUMBER: i=1; + case CAT_NUMBER: i=1; pEntry=rEntries[0]; if(pEntry!=NULL) { @@ -945,7 +945,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) } break; - default: break; + default: break; } if(pNumFmtShell!=NULL) @@ -973,16 +973,16 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: DeleteEntryList_Impl Datum:02.10.97 +#* Methode: DeleteEntryList_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Loescht eine SvStrings- Liste +#* Funktion: Loescht eine SvStrings- Liste #* -#* Input: String-liste +#* Input: String-liste #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -994,32 +994,32 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: UpdateOptions_Impl Datum:02.10.97 +#* Methode: UpdateOptions_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Stellt je nach eingestelltem Format die Options- -#* attribute neu ein. +#* Funktion: Stellt je nach eingestelltem Format die Options- +#* attribute neu ein. #* -#* Input: Flag, ob sich die Kategorie geaendert hat. +#* Input: Flag, ob sich die Kategorie geaendert hat. #* -#* Output: --- +#* Output: --- #* #***?********************************************************************/ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*/ ) { - SvxDelStrgs aEntryList; - String theFormat = aEdFormat.GetText(); - USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); - USHORT nCategory = nCurCategory; - USHORT nDecimals = 0; - USHORT nZeroes = 0; - BOOL bNegRed = FALSE; - BOOL bThousand = FALSE; - short nTmpCatPos; - USHORT nCurrencyPos =aLbCurrency.GetSelectEntryPos(); + SvxDelStrgs aEntryList; + String theFormat = aEdFormat.GetText(); + USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); + USHORT nCategory = nCurCategory; + USHORT nDecimals = 0; + USHORT nZeroes = 0; + BOOL bNegRed = FALSE; + BOOL bThousand = FALSE; + short nTmpCatPos; + USHORT nCurrencyPos =aLbCurrency.GetSelectEntryPos(); if(bOneAreaFlag) { @@ -1088,12 +1088,12 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE* aBtnNegRed.Enable(); aBtnThousand.Enable(); /* - aEdDecimals .SetValue( nDecimals ); + aEdDecimals .SetValue( nDecimals ); aEdLeadZeroes.SetValue( nZeroes ); */ - aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); + aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) ); - aBtnNegRed .Check( bNegRed ); + aBtnNegRed .Check( bNegRed ); aBtnThousand .Check( bThousand ); break; @@ -1106,46 +1106,46 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE* case CAT_SCIENTIFIC: case CAT_FRACTION: default: - aFlOptions .Disable(); - aFtDecimals .Disable(); - aEdDecimals .Disable(); - aFtLeadZeroes .Disable(); - aEdLeadZeroes .Disable(); - aBtnNegRed .Disable(); - aBtnThousand .Disable(); - aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) ); - aEdLeadZeroes .SetText( UniString::CreateFromInt32( 0 ) ); - aBtnNegRed .Check( FALSE ); - aBtnThousand .Check( FALSE ); + aFlOptions .Disable(); + aFtDecimals .Disable(); + aEdDecimals .Disable(); + aFtLeadZeroes .Disable(); + aEdLeadZeroes .Disable(); + aBtnNegRed .Disable(); + aBtnThousand .Disable(); + aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) ); + aEdLeadZeroes .SetText( UniString::CreateFromInt32( 0 ) ); + aBtnNegRed .Check( FALSE ); + aBtnThousand .Check( FALSE ); } } /************************************************************************* -#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 +#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Aktualisiert die Format- Listbox und zusaetzlich -#* wird abhaengig vom bUpdateEdit- Flag der String -#* in der Editbox geaendert. +#* Funktion: Aktualisiert die Format- Listbox und zusaetzlich +#* wird abhaengig vom bUpdateEdit- Flag der String +#* in der Editbox geaendert. #* -#* Input: Flags fuer Kategorie und Editbox +#* Input: Flags fuer Kategorie und Editbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl ( - USHORT bCat, // Category oder Land/Sprache ListBox? - BOOL bUpdateEdit // Format-Edit aktualisieren? + USHORT bCat, // Category oder Land/Sprache ListBox? + BOOL bUpdateEdit // Format-Edit aktualisieren? ) { - SvxDelStrgs aEntryList; - short nFmtLbSelPos = 0; - short nTmpCatPos; + SvxDelStrgs aEntryList; + short nFmtLbSelPos = 0; + short nTmpCatPos; if(bOneAreaFlag) { @@ -1253,18 +1253,18 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl /************************************************************************* -#* Handle: DoubleClickHdl_Impl Datum:02.10.97 +#* Handle: DoubleClickHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Bei einem Doppelklick in die Format- Listbox -#* wird der Wert uebernommen und der OK-Button -#* ausgeloest +#* Funktion: Bei einem Doppelklick in die Format- Listbox +#* wird der Wert uebernommen und der OK-Button +#* ausgeloest #* -#* Input: Pointer auf Listbox +#* Input: Pointer auf Listbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1291,18 +1291,18 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) /************************************************************************* -#* Methode: SelFormatHdl_Impl Datum:02.10.97 +#* Methode: SelFormatHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie -#* oder das Format aendert. Dem entsprechend werden die -#* Einstellungen geaendert. +#* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie +#* oder das Format aendert. Dem entsprechend werden die +#* Einstellungen geaendert. #* -#* Input: Pointer auf Listbox +#* Input: Pointer auf Listbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1330,7 +1330,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) pLb = &aLbFormat; // continue with the current format selected } - short nTmpCatPos; + short nTmpCatPos; if(bOneAreaFlag) { @@ -1353,12 +1353,12 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // Format-ListBox ---------------------------------------------------- if ( (SvxFontListBox *)pLb == &aLbFormat ) { - USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); - String aFormat = aLbFormat.GetSelectEntry(); - String aComment; - SvxDelStrgs aEntryList; + USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); + String aFormat = aLbFormat.GetSelectEntry(); + String aComment; + SvxDelStrgs aEntryList; - short nFmtLbSelPos = nSelPos; + short nFmtLbSelPos = nSelPos; aFormat=pNumFmtShell->GetFormat4Entry(nSelPos); aComment=pNumFmtShell->GetComment4Entry(nSelPos); @@ -1431,25 +1431,25 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) /************************************************************************* -#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 +#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button -#* wird diese Funktion aufgerufen und die Zahlenformat- -#* Liste den entsprechend geaendert. +#* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button +#* wird diese Funktion aufgerufen und die Zahlenformat- +#* Liste den entsprechend geaendert. #* -#* Input: Toolbox- Button +#* Input: Toolbox- Button #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) { - BOOL bAdded = FALSE; - BOOL bDeleted = FALSE; + BOOL bAdded = FALSE; + BOOL bDeleted = FALSE; ULONG nReturn = 0; const ULONG nReturnChanged = 0x1; // THE boolean return value const ULONG nReturnAdded = 0x2; // temp: format added @@ -1458,12 +1458,12 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) if(pIB==&aIbAdd) { // Also called from FillItemSet() if a temporary currency format has // to be added, not only if the Add button is enabled. - String aFormat = aEdFormat.GetText(); - SvxDelStrgs aEntryList; - SvxDelStrgs a2EntryList; - USHORT nCatLbSelPos = 0; - short nFmtLbSelPos = SELPOS_NONE; - xub_StrLen nErrPos=0; + String aFormat = aEdFormat.GetText(); + SvxDelStrgs aEntryList; + SvxDelStrgs a2EntryList; + USHORT nCatLbSelPos = 0; + short nFmtLbSelPos = SELPOS_NONE; + xub_StrLen nErrPos=0; pNumFmtShell->SetCurCurrencyEntry(NULL); bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos, @@ -1504,7 +1504,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) if ( bAdded && (nFmtLbSelPos != SELPOS_NONE) ) { // Alles klar - if(bOneAreaFlag) //@@ ??? + if(bOneAreaFlag) //@@ ??? SetCategory(0); else SetCategory(nCatLbSelPos ); @@ -1524,7 +1524,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) aEdFormat.SetText( aFormat ); //aEdComment.SetText(String()); //@@ ??? - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen ChangePreviewText( (USHORT)nFmtLbSelPos ); } @@ -1540,10 +1540,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) } else if(pIB==&aIbRemove) { - String aFormat = aEdFormat.GetText(); - SvxDelStrgs aEntryList; - USHORT nCatLbSelPos = 0; - short nFmtLbSelPos = SELPOS_NONE; + String aFormat = aEdFormat.GetText(); + SvxDelStrgs aEntryList; + USHORT nCatLbSelPos = 0; + short nFmtLbSelPos = SELPOS_NONE; bDeleted = pNumFmtShell->RemoveFormat( aFormat, nCatLbSelPos, @@ -1555,14 +1555,14 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) { if(nFmtLbSelPos>=0 && nFmtLbSelPos<aEntryList.Count()) { - aFormat = *aEntryList[nFmtLbSelPos]; + aFormat = *aEntryList[nFmtLbSelPos]; } FillFormatListBox_Impl( aEntryList ); if ( nFmtLbSelPos != SELPOS_NONE ) { - if(bOneAreaFlag) //@@ ??? + if(bOneAreaFlag) //@@ ??? SetCategory(0); else SetCategory(nCatLbSelPos ); @@ -1602,17 +1602,17 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) /************************************************************************* -#* Methode: EditHdl_Impl Datum:02.10.97 +#* Methode: EditHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, -#* so wird die Vorschau aktualisiert und +#* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, +#* so wird die Vorschau aktualisiert und #* -#* Input: Pointer auf Editbox +#* Input: Pointer auf Editbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1676,16 +1676,16 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1696,15 +1696,15 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) || ((CheckBox*) pOptCtrl == &aBtnNegRed) || ((CheckBox*) pOptCtrl == &aBtnThousand) ) { - String aFormat; - BOOL bThousand = aBtnThousand.IsEnabled() + String aFormat; + BOOL bThousand = aBtnThousand.IsEnabled() && aBtnThousand.IsChecked(); - BOOL bNegRed = aBtnNegRed.IsEnabled() + BOOL bNegRed = aBtnNegRed.IsEnabled() && aBtnNegRed.IsChecked(); - USHORT nPrecision = (aEdDecimals.IsEnabled()) + USHORT nPrecision = (aEdDecimals.IsEnabled()) ? (USHORT)aEdDecimals.GetValue() : (USHORT)0; - USHORT nLeadZeroes = (aEdLeadZeroes.IsEnabled()) + USHORT nLeadZeroes = (aEdLeadZeroes.IsEnabled()) ? (USHORT)aEdLeadZeroes.GetValue() : (USHORT)0; @@ -1743,16 +1743,16 @@ IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG) /************************************************************************* -#* Methode: LostFocusHdl_Impl Datum:30.10.97 +#* Methode: LostFocusHdl_Impl Datum:30.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1766,10 +1766,10 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) aFtComment.Show(); if(!aIbAdd.IsEnabled()) { - USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); + USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); pNumFmtShell->SetComment4Entry(nSelPos, aEdComment.GetText()); - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen } } @@ -1777,16 +1777,16 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1796,24 +1796,24 @@ String SvxNumberFormatTabPage::GetExpColorString( double nVal = 0; switch (nTmpCatPos) { - case CAT_CURRENCY: nVal=SVX_NUMVAL_CURRENCY; break; + case CAT_CURRENCY: nVal=SVX_NUMVAL_CURRENCY; break; case CAT_SCIENTIFIC: case CAT_FRACTION: - case CAT_NUMBER: nVal=SVX_NUMVAL_STANDARD; break; + case CAT_NUMBER: nVal=SVX_NUMVAL_STANDARD; break; - case CAT_PERCENT: nVal=SVX_NUMVAL_PERCENT; break; + case CAT_PERCENT: nVal=SVX_NUMVAL_PERCENT; break; - case CAT_ALL: nVal=SVX_NUMVAL_STANDARD; break; + case CAT_ALL: nVal=SVX_NUMVAL_STANDARD; break; - case CAT_TIME: nVal=SVX_NUMVAL_TIME; break; - case CAT_DATE: nVal=SVX_NUMVAL_DATE; break; + case CAT_TIME: nVal=SVX_NUMVAL_TIME; break; + case CAT_DATE: nVal=SVX_NUMVAL_DATE; break; - case CAT_BOOLEAN: nVal=SVX_NUMVAL_BOOLEAN; break; + case CAT_BOOLEAN: nVal=SVX_NUMVAL_BOOLEAN; break; case CAT_USERDEFINED: case CAT_TEXT: - default: nVal=0;break; + default: nVal=0;break; } String aPreviewString; @@ -1854,16 +1854,16 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) return SfxTabPage::PreNotify( rNEvt ); } /************************************************************************* -#* Methode: SetOkHdl Datum:01.11.97 +#* Methode: SetOkHdl Datum:01.11.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Setzt den OkHandler neu. +#* Funktion: Setzt den OkHandler neu. #* -#* Input: Neuer OkHandler +#* Input: Neuer OkHandler #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1874,11 +1874,11 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler ) void SvxNumberFormatTabPage::FillCurrencyBox() { - SvStringsDtor aList; + SvStringsDtor aList; NfShCurrencyEntries rEntries; - XubString* pEntry = NULL; - USHORT nPos=0; - USHORT nSelPos=0; + XubString* pEntry = NULL; + USHORT nPos=0; + USHORT nSelPos=0; pNumFmtShell->GetCurrencySymbols( aList, &nSelPos); @@ -1892,7 +1892,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox() void SvxNumberFormatTabPage::SetCategory(USHORT nPos) { - USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); + USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); Point aPos=aLbFormat.GetPosPixel(); Size aSize=aLbFormat.GetSizePixel(); USHORT nTmpCatPos; diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index f863a303c800..5e549c18e994 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,44 +31,44 @@ //================================================ // Zahlen-TabPage: -#define WND_NUMBER_PREVIEW 2 -#define FT_CATEGORY 3 -#define FT_FORMAT 4 -#define FT_OPTIONS 5 -#define FT_EDFORMAT 6 -#define LB_CATEGORY 9 -#define LB_FORMAT 10 +#define WND_NUMBER_PREVIEW 2 +#define FT_CATEGORY 3 +#define FT_FORMAT 4 +#define FT_OPTIONS 5 +#define FT_EDFORMAT 6 +#define LB_CATEGORY 9 +#define LB_FORMAT 10 #define FL_OPTIONS 11 -#define FT_LANGUAGE 12 -#define LB_LANGUAGE 13 -#define ED_FORMAT 14 -#define BTN_ADD 15 -#define BTN_REMOVE 16 -#define BMP_CHECK 17 -#define BMP_DCHECK 18 -#define BMP_CROSS 19 -#define BMP_DCROSS 20 -#define FT_DECIMALS 21 -#define ED_DECIMALS 22 -#define FT_LEADZEROES 23 -#define ED_LEADZEROES 24 -#define BTN_NEGRED 25 -#define BTN_THOUSAND 26 -#define FT_COMMENT 27 -#define ED_COMMENT 28 -#define IB_ADD 29 -#define IB_REMOVE 30 -#define IB_INFO 31 -#define IL_ICON 32 -#define LB_CURRENCY 33 +#define FT_LANGUAGE 12 +#define LB_LANGUAGE 13 +#define ED_FORMAT 14 +#define BTN_ADD 15 +#define BTN_REMOVE 16 +#define BMP_CHECK 17 +#define BMP_DCHECK 18 +#define BMP_CROSS 19 +#define BMP_DCROSS 20 +#define FT_DECIMALS 21 +#define ED_DECIMALS 22 +#define FT_LEADZEROES 23 +#define ED_LEADZEROES 24 +#define BTN_NEGRED 25 +#define BTN_THOUSAND 26 +#define FT_COMMENT 27 +#define ED_COMMENT 28 +#define IB_ADD 29 +#define IB_REMOVE 30 +#define IB_INFO 31 +#define IL_ICON 32 +#define LB_CURRENCY 33 #define CB_SOURCEFORMAT 34 -#define IL_ICON_HC 35 +#define IL_ICON_HC 35 #define STR_AUTO_ENTRY 36 -#define TBX_ADDREMOVE 1 -#define IID_ADD 1 -#define IID_REMOVE 2 -#define IID_INFO 3 +#define TBX_ADDREMOVE 1 +#define IID_ADD 1 +#define IID_REMOVE 2 +#define IID_INFO 3 #endif diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index 2538b196932c..78074755ed4a 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0a1e02b78a9e..582f34b6982c 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -97,20 +97,20 @@ SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr); /*-----------------07.02.97 15.37------------------- --------------------------------------------------*/ -#define NUM_PAGETYPE_BULLET 0 +#define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 #define PAGETYPE_USER_START 10 -#define SHOW_NUMBERING 0 -#define SHOW_BULLET 1 -#define SHOW_BITMAP 2 +#define SHOW_NUMBERING 0 +#define SHOW_BULLET 1 +#define SHOW_BITMAP 2 -#define MAX_BMP_WIDTH 16 -#define MAX_BMP_HEIGHT 16 +#define MAX_BMP_WIDTH 16 +#define MAX_BMP_HEIGHT 16 -static BOOL bLastRelative = FALSE; +static BOOL bLastRelative = FALSE; static const sal_Char cNumberingType[] = "NumberingType"; static const sal_Char cValue[] = "Value"; static const sal_Char cParentNumbering[] = "ParentNumbering"; @@ -228,10 +228,10 @@ Font& lcl_GetDefaultBulletFont() SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, - const SfxItemSet& rSet) : + const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -289,7 +289,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxSingleNumPickTabPage(pParent, rAttrSet); @@ -370,7 +370,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// 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, FALSE, &pItem); if(eState != SFX_ITEM_SET) @@ -457,10 +457,10 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, - const SfxItemSet& rSet) : + const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -491,7 +491,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBulletPickTabPage(pParent, rAttrSet); @@ -586,7 +586,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); @@ -640,7 +640,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); if (pBulletCharFmt) SetCharFmtName( pBulletCharFmt->GetValue()); @@ -658,7 +658,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -726,7 +726,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPickTabPage(pParent, rAttrSet); @@ -821,7 +821,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -925,8 +925,8 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); if (pNumCharFmt &&pBulletCharFmt) @@ -963,8 +963,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), pExamplesVS( new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )), - aErrorText( this, CUI_RES(FT_ERROR)), - aLinkedCB( this, CUI_RES(CB_LINKED)), + aErrorText( this, CUI_RES(FT_ERROR)), + aLinkedCB( this, CUI_RES(CB_LINKED)), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -1025,7 +1025,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBitmapPickTabPage(pParent, rAttrSet); @@ -1040,7 +1040,7 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = FALSE; BOOL bIsPreset = FALSE; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -1089,7 +1089,7 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) if ( !aGrfNames.Count() ) { // das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); +// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } if( (bPreset || bModified) && pActNum) @@ -1235,13 +1235,13 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 aFormatTimer.Stop(); //CHINA001 } //CHINA001 -//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) +//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) //CHINA001 { //CHINA001 SvxNumValueSet::UserDraw(rUDEvt); //CHINA001 //CHINA001 Rectangle aRect = rUDEvt.GetRect(); //CHINA001 OutputDevice* pDev = rUDEvt.GetDevice(); -//CHINA001 USHORT nItemId = rUDEvt.GetItemId(); +//CHINA001 USHORT nItemId = rUDEvt.GetItemId(); //CHINA001 Point aBLPos = aRect.TopLeft(); //CHINA001 //CHINA001 int nRectHeight = aRect.GetHeight(); @@ -1252,8 +1252,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 &aGraphic, NULL)) //CHINA001 { //CHINA001 bGrfNotFound = TRUE; -//CHINA001 } -//CHINA001 else +//CHINA001 } +//CHINA001 else //CHINA001 { //CHINA001 Point aPos(aBLPos.X() + 5, 0); //CHINA001 for( USHORT i = 0; i < 3; i++ ) @@ -1261,8 +1261,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 USHORT nY = 11 + i * 33; //CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; //CHINA001 aGraphic.Draw( pDev, aPos, aSize ); -//CHINA001 } -//CHINA001 } +//CHINA001 } +//CHINA001 } //CHINA001 } //CHINA001 //CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) @@ -1272,7 +1272,7 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 { //CHINA001 bGrfNotFound = FALSE; //CHINA001 Format(); -//CHINA001 } +//CHINA001 } //CHINA001 Invalidate(); //CHINA001 return 0; //CHINA001 } @@ -1286,38 +1286,38 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, aFormatFL( this, CUI_RES(FL_FORMAT )), aLevelFT( this, CUI_RES(FT_LEVEL )), - aLevelLB( this, CUI_RES(LB_LEVEL )), - aFmtFT( this, CUI_RES(FT_FMT )), - aFmtLB( this, CUI_RES(LB_FMT )), - aPrefixFT( this, CUI_RES(FT_PREFIX )), - aPrefixED( this, CUI_RES(ED_PREFIX )), - aSuffixFT( this, CUI_RES(FT_SUFFIX )), - aSuffixED( this, CUI_RES(ED_SUFFIX )), - aCharFmtFT( this, CUI_RES(FT_CHARFMT )), - aCharFmtLB( this, CUI_RES(LB_CHARFMT )), - aBulColorFT( this, CUI_RES(FT_BUL_COLOR)), - aBulColLB( this, CUI_RES(LB_BUL_COLOR)), - aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)), - aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)), - aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)), - aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)), - aStartFT( this, CUI_RES(FT_START )), - aStartED( this, CUI_RES(ED_START )), - aBulletPB( this, CUI_RES(PB_BULLET )), - aAlignFT( this, CUI_RES(FT_ALIGN )), - aAlignLB( this, CUI_RES(LB_ALIGN )), - aBitmapFT( this, CUI_RES(FT_BITMAP )), - aBitmapMB( this, CUI_RES(MB_BITMAP )), - aSizeFT( this, CUI_RES(FT_SIZE )), - aWidthMF( this, CUI_RES(MF_WIDTH )), - aMultFT( this, CUI_RES(FT_MULT )), - aHeightMF( this, CUI_RES(MF_HEIGHT )), - aRatioCB( this, CUI_RES(CB_RATIO )), - aOrientFT( this, CUI_RES(FT_ORIENT )), - aOrientLB( this, CUI_RES(LB_ORIENT )), + aLevelLB( this, CUI_RES(LB_LEVEL )), + aFmtFT( this, CUI_RES(FT_FMT )), + aFmtLB( this, CUI_RES(LB_FMT )), + aPrefixFT( this, CUI_RES(FT_PREFIX )), + aPrefixED( this, CUI_RES(ED_PREFIX )), + aSuffixFT( this, CUI_RES(FT_SUFFIX )), + aSuffixED( this, CUI_RES(ED_SUFFIX )), + aCharFmtFT( this, CUI_RES(FT_CHARFMT )), + aCharFmtLB( this, CUI_RES(LB_CHARFMT )), + aBulColorFT( this, CUI_RES(FT_BUL_COLOR)), + aBulColLB( this, CUI_RES(LB_BUL_COLOR)), + aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)), + aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)), + aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)), + aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)), + aStartFT( this, CUI_RES(FT_START )), + aStartED( this, CUI_RES(ED_START )), + aBulletPB( this, CUI_RES(PB_BULLET )), + aAlignFT( this, CUI_RES(FT_ALIGN )), + aAlignLB( this, CUI_RES(LB_ALIGN )), + aBitmapFT( this, CUI_RES(FT_BITMAP )), + aBitmapMB( this, CUI_RES(MB_BITMAP )), + aSizeFT( this, CUI_RES(FT_SIZE )), + aWidthMF( this, CUI_RES(MF_WIDTH )), + aMultFT( this, CUI_RES(FT_MULT )), + aHeightMF( this, CUI_RES(MF_HEIGHT )), + aRatioCB( this, CUI_RES(CB_RATIO )), + aOrientFT( this, CUI_RES(FT_ORIENT )), + aOrientLB( this, CUI_RES(LB_ORIENT )), aSameLevelFL( this, CUI_RES(FL_SAME_LEVEL)), - aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)), - pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), + aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)), + pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), pSaveNum(0), bLastWidthModified(FALSE), @@ -1359,7 +1359,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, PopupMenu* pPopup = new PopupMenu; aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup ); - pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) ); + pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) ); pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE ); eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); @@ -1456,7 +1456,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) /*-----------------01.12.97 16:30------------------- --------------------------------------------------*/ -SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, +SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumOptionsTabPage(pParent, rAttrSet); @@ -1464,7 +1464,7 @@ SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) +void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); @@ -1507,7 +1507,7 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) +int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(*_pSet); @@ -1516,7 +1516,7 @@ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) @@ -1530,7 +1530,7 @@ BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; //im Draw gibt es das Item als WhichId, im Writer nur als SlotId @@ -1569,7 +1569,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); USHORT nMask = 1; aLevelLB.SetUpdateMode(FALSE); aLevelLB.SetNoSelection(); @@ -1707,19 +1707,19 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) --------------------------------------------------*/ void SvxNumOptionsTabPage::InitControls() { - BOOL bShowBullet = TRUE; - BOOL bShowBitmap = TRUE; - BOOL bSameType = TRUE; - BOOL bSameStart = TRUE; - BOOL bSamePrefix = TRUE; - BOOL bSameSuffix = TRUE; - BOOL bAllLevel = TRUE; - BOOL bSameCharFmt = TRUE; - BOOL bSameVOrient = TRUE; - BOOL bSameSize = TRUE; - BOOL bSameBulColor = TRUE; + BOOL bShowBullet = TRUE; + BOOL bShowBitmap = TRUE; + BOOL bSameType = TRUE; + BOOL bSameStart = TRUE; + BOOL bSamePrefix = TRUE; + BOOL bSameSuffix = TRUE; + BOOL bAllLevel = TRUE; + BOOL bSameCharFmt = TRUE; + BOOL bSameVOrient = TRUE; + BOOL bSameSize = TRUE; + BOOL bSameBulColor = TRUE; BOOL bSameBulRelSize= TRUE; - BOOL bSameAdjust = TRUE; + BOOL bSameAdjust = TRUE; const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; String sFirstCharFmt; @@ -1755,13 +1755,13 @@ void SvxNumOptionsTabPage::InitControls() bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix(); bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix(); bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels(); - bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName(); + bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName(); bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient(); if(bShowBitmap && bSameSize) bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize; bSameBulColor &= aNumFmtArr[i]->GetBulletColor() == aNumFmtArr[nLvl]->GetBulletColor(); bSameBulRelSize &= aNumFmtArr[i]->GetBulletRelSize() == aNumFmtArr[nLvl]->GetBulletRelSize(); - bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); + bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); } nHighestLevel = i; } @@ -1852,10 +1852,10 @@ void SvxNumOptionsTabPage::InitControls() break; case SHOW_BULLET: { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); +// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); +// if(pFnt) +// ChgTxtFont(aBulletFT, *pFnt); +// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); } break; case SHOW_BITMAP: @@ -1936,31 +1936,31 @@ void SvxNumOptionsTabPage::SwitchNumberType( BYTE nType, BOOL ) aBulletPB.Show(bBullet); BOOL bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); - aBulColorFT.Show( !bBitmap && bBullColor ); - aBulColLB.Show( !bBitmap && bBullColor ); + aBulColorFT.Show( !bBitmap && bBullColor ); + aBulColLB.Show( !bBitmap && bBullColor ); BOOL bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); - aBulRelSizeFT.Show( !bBitmap && bBullResSize ); - aBulRelSizeMF.Show( !bBitmap && bBullResSize ); + aBulRelSizeFT.Show( !bBitmap && bBullResSize ); + aBulRelSizeMF.Show( !bBitmap && bBullResSize ); - aBitmapFT .Show(bBitmap); - aBitmapMB .Show(bBitmap); + aBitmapFT .Show(bBitmap); + aBitmapMB .Show(bBitmap); - aSizeFT .Show(bBitmap); - aWidthMF .Show(bBitmap); - aMultFT .Show(bBitmap); - aHeightMF .Show(bBitmap); - aRatioCB .Show(bBitmap); + aSizeFT .Show(bBitmap); + aWidthMF .Show(bBitmap); + aMultFT .Show(bBitmap); + aHeightMF .Show(bBitmap); + aRatioCB .Show(bBitmap); - aOrientFT .Show(bBitmap && bAllLevelFeature); - aOrientLB .Show(bBitmap && bAllLevelFeature); + aOrientFT .Show(bBitmap && bAllLevelFeature); + aOrientLB .Show(bBitmap && bAllLevelFeature); - aSizeFT .Enable(bEnableBitmap); - aWidthMF .Enable(bEnableBitmap); - aMultFT .Enable(bEnableBitmap); - aHeightMF .Enable(bEnableBitmap); - aRatioCB .Enable(bEnableBitmap); - aOrientFT .Enable(bEnableBitmap); - aOrientLB .Enable(bEnableBitmap); + aSizeFT .Enable(bEnableBitmap); + aWidthMF .Enable(bEnableBitmap); + aMultFT .Enable(bEnableBitmap); + aHeightMF .Enable(bEnableBitmap); + aRatioCB .Enable(bEnableBitmap); + aOrientFT .Enable(bEnableBitmap); + aOrientLB .Enable(bEnableBitmap); } /*-----------------02.12.97 13:51------------------- @@ -2094,7 +2094,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); +// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -2241,12 +2241,12 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) --------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { - USHORT nItemId = pButton->GetCurItemId(); - String aGrfName; - Size aSize; - sal_Bool bSucc(sal_False); - SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); + USHORT nItemId = pButton->GetCurItemId(); + String aGrfName; + Size aSize; + sal_Bool bSucc(sal_False); + SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); +// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { @@ -2267,7 +2267,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) // ausgewaehlten Filter merken aGrfName = aGrfDlg.GetPath(); - Graphic aGraphic; + Graphic aGraphic; if( !aGrfDlg.GetGraphic(aGraphic) ) { aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic); @@ -2385,7 +2385,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) { if(nActNumLvl & nMask) { - const SvxNumberFormat& rCurFmt = pActNum->GetLevel(i); + const SvxNumberFormat& rCurFmt = pActNum->GetLevel(i); if(bFirst) { cBullet = rCurFmt.GetBulletChar(); @@ -2448,7 +2448,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) MAP_100TH_MM, (MapUnit)eCoreUnit ); nHeightVal = OutputDevice::LogicToLogic( nHeightVal, MAP_100TH_MM, (MapUnit)eCoreUnit); - double fSizeRatio; + double fSizeRatio; BOOL bRepaint = FALSE; USHORT nMask = 1; @@ -2656,7 +2656,7 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev, /*-----------------02.12.97 10:34------------------- Vorschau der Numerierung painten --------------------------------------------------*/ -void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) +void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); Rectangle aRect(Point(0,0), aSize); @@ -2948,7 +2948,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } } } - DrawOutDev( Point(0,0), aSize, + DrawOutDev( Point(0,0), aSize, Point(0,0), aSize, *pVDev ); delete pVDev; @@ -2963,16 +2963,16 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ), aPositionFL( this, CUI_RES(FL_POSITION )), aLevelFT( this, CUI_RES(FT_LEVEL )), - aLevelLB( this, CUI_RES(LB_LEVEL )), - aDistBorderFT( this, CUI_RES(FT_BORDERDIST )), - aDistBorderMF( this, CUI_RES(MF_BORDERDIST )), - aRelativeCB( this, CUI_RES(CB_RELATIVE )), - aIndentFT( this, CUI_RES(FT_INDENT )), - aIndentMF( this, CUI_RES(MF_INDENT )), - aDistNumFT( this, CUI_RES(FT_NUMDIST )), - aDistNumMF( this, CUI_RES(MF_NUMDIST )), - aAlignFT( this, CUI_RES(FT_ALIGN )), - aAlignLB( this, CUI_RES(LB_ALIGN )), + aLevelLB( this, CUI_RES(LB_LEVEL )), + aDistBorderFT( this, CUI_RES(FT_BORDERDIST )), + aDistBorderMF( this, CUI_RES(MF_BORDERDIST )), + aRelativeCB( this, CUI_RES(CB_RELATIVE )), + aIndentFT( this, CUI_RES(FT_INDENT )), + aIndentMF( this, CUI_RES(MF_INDENT )), + aDistNumFT( this, CUI_RES(FT_NUMDIST )), + aDistNumMF( this, CUI_RES(MF_NUMDIST )), + aAlignFT( this, CUI_RES(FT_ALIGN )), + aAlignLB( this, CUI_RES(LB_ALIGN )), aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ), aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ), aListtabFT( this, CUI_RES(FT_LISTTAB) ), @@ -2984,7 +2984,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, 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 ))), + pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -3076,7 +3076,7 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage() #if OSL_DEBUG_LEVEL > 1 void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) { -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) sal_Char const sHash[] = " # "; if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) @@ -3106,7 +3106,7 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) --------------------------------------------------*/ void SvxNumPositionTabPage::InitControls() { - bInInintControl = TRUE; + bInInintControl = TRUE; const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && @@ -3300,7 +3300,7 @@ void SvxNumPositionTabPage::InitControls() if ( bSetDistEmpty ) aDistBorderMF.SetText(aEmptyStr); - bInInintControl = FALSE; + bInInintControl = FALSE; } /*-----------------03.12.97 10:02------------------- @@ -3508,7 +3508,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() /*-----------------03.12.97 10:02------------------- --------------------------------------------------*/ -SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPositionTabPage(pParent, rAttrSet); @@ -3517,20 +3517,20 @@ SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, /*-----------------04.12.97 12:51------------------- --------------------------------------------------*/ -void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) +void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) { aDistBorderMF .SetDecimalDigits(1); - aDistNumMF .SetDecimalDigits(1); - aIndentMF .SetDecimalDigits(1); + aDistNumMF .SetDecimalDigits(1); + aIndentMF .SetDecimalDigits(1); aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); aIndentAtMF.SetDecimalDigits(1); } aDistBorderMF .SetUnit( eMetric ); - aDistNumMF .SetUnit( eMetric ); - aIndentMF .SetUnit( eMetric ); + aDistNumMF .SetUnit( eMetric ); + aIndentMF .SetUnit( eMetric ); aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); aIndentAtMF.SetUnit( eMetric ); @@ -3723,7 +3723,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) } String aEmptyStr; if(bSetValue) - SetMetricValue(aDistBorderMF, nValue, eCoreUnit); + SetMetricValue(aDistBorderMF, nValue, eCoreUnit); else aDistBorderMF.SetText(aEmptyStr); aDistBorderMF.Enable(bOn || bSingleSelection); @@ -3938,10 +3938,10 @@ void SvxNumOptionsTabPage::SetModified(BOOL bRepaint) void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); if (pNumCharFmt &&pBulletCharFmt) SetCharFmts( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); @@ -3963,7 +3963,7 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc index 02fb93676658..1482de300adb 100644 --- a/cui/source/tabpages/numpages.hrc +++ b/cui/source/tabpages/numpages.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FT_ALIGN 50 +#define FT_ALIGN 50 #define LB_ALIGN 51 #define FT_DIST_BORDER 52 #define MF_DIST_BORDER 53 @@ -33,7 +33,7 @@ #define MF_DIST_NUM 55 #define GB_POS 56 -#define LB_FMT_CHAR 60 +#define LB_FMT_CHAR 60 #define FT_FMT_CHAR 61 #define FT_WIDTH 67 @@ -41,13 +41,13 @@ #define FT_HEIGHT 70 -#define MN_STD_NUMBER 120 +#define MN_STD_NUMBER 120 #define MD_DEL_NUMBER 121 #define MN_STD_BULLET 122 #define MN_DEL_BULLET 123 #define STR_BULLET 200 -//#define STR_NUMFMT_1 201 +//#define STR_NUMFMT_1 201 //#define STR_NUMFMT_2 202 //#define STR_NUMFMT_3 203 //#define STR_NUMFMT_4 204 @@ -65,57 +65,57 @@ #define FL_VALUES 220 #define VS_VALUES 221 -#define ST_CUSTOMIZE 222 -#define FT_ERROR 223 -#define CB_LINKED 224 +#define ST_CUSTOMIZE 222 +#define FT_ERROR 223 +#define CB_LINKED 224 #define FT_LEVEL 151 #define LB_LEVEL 152 #define FL_FORMAT 153 #define FL_POSITION 154 -#define FT_PREFIX 155 -#define ED_PREFIX 156 -#define FT_FMT 157 -#define LB_FMT 158 -#define FT_SUFFIX 159 -#define ED_SUFFIX 160 +#define FT_PREFIX 155 +#define ED_PREFIX 156 +#define FT_FMT 157 +#define LB_FMT 158 +#define FT_SUFFIX 159 +#define ED_SUFFIX 160 #define FT_BORDERDIST 161 #define MF_BORDERDIST 162 -#define FT_NUMDIST 163 -#define MF_NUMDIST 164 -#define FT_INDENT 165 -#define MF_INDENT 166 -#define FT_CHARFMT 167 -#define LB_CHARFMT 168 +#define FT_NUMDIST 163 +#define MF_NUMDIST 164 +#define FT_INDENT 165 +#define MF_INDENT 166 +#define FT_CHARFMT 167 +#define LB_CHARFMT 168 #define NF_ALL_LEVEL 169 -#define FT_START 170 -#define ED_START 171 -#define FT_BULLET 172 -#define PB_BULLET 173 +#define FT_START 170 +#define ED_START 171 +#define FT_BULLET 172 +#define PB_BULLET 173 #define WIN_PREVIEW 174 -#define FT_BITMAP 175 -#define PB_SEARCH 176 -#define CB_RATIO 177 -#define FT_SIZE 178 -#define MF_WIDTH 179 -#define FT_MULT 180 -#define MF_HEIGHT 181 -#define FT_ORIENT 182 -#define LB_ORIENT 183 +#define FT_BITMAP 175 +#define PB_SEARCH 176 +#define CB_RATIO 177 +#define FT_SIZE 178 +#define MF_WIDTH 179 +#define FT_MULT 180 +#define MF_HEIGHT 181 +#define FT_ORIENT 182 +#define LB_ORIENT 183 #define MB_BITMAP 184 #define CB_RELATIVE 185 #define FT_ALL_LEVEL 186 #define PB_STANDARD 187 #define CB_SAME_LEVEL 188 #define FL_SAME_LEVEL 189 -#define FT_BUL_COLOR 190 +#define FT_BUL_COLOR 190 #define LB_BUL_COLOR 191 #define FT_BUL_REL_SIZE 192 #define MF_BUL_REL_SIZE 193 // 194 removed #define ST_POPUP_EMPTY_ENTRY 195 -#define MN_GRAPHIC_DLG 1 +#define MN_GRAPHIC_DLG 1 #define MN_GALLERY 2 #define MN_GALLERY_ENTRY 100 diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src index 323b5cdd6ba6..7613771422db 100644 --- a/cui/source/tabpages/numpages.src +++ b/cui/source/tabpages/numpages.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_BULLET @@ -56,7 +56,7 @@ TabPage RID_SVXPAGE_PICK_BULLET }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_SINGLE_NUM @@ -80,7 +80,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_NUM @@ -104,7 +104,7 @@ TabPage RID_SVXPAGE_PICK_NUM }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_BMP @@ -144,7 +144,7 @@ TabPage RID_SVXPAGE_PICK_BMP }; /**************************************************************************/ /* */ -/* TabPage Numerierungsoptionen */ +/* TabPage Numerierungsoptionen */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_NUM_OPTIONS @@ -189,17 +189,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS CurPos = 0 ; StringList [ en-US ] = { - < "1, 2, 3, ... " ; 4/*SVX_NUM_ARABIC */; > ; - < "A, B, C, ... " ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; - < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; - < "I, II, III, ... " ; 2/*SVX_NUM_ROMAN_UPPER */; > ; - < "i, ii, iii, ... " ; 3/*SVX_NUM_ROMAN_LOWER */; > ; - < "A, .., AA, .., AAA, ... " ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "1, 2, 3, ... " ; 4/*SVX_NUM_ARABIC */; > ; + < "A, B, C, ... " ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I, II, III, ... " ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i, ii, iii, ... " ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "A, .., AA, .., AAA, ... " ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; - < "Linked graphics" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ; - < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; + < "Linked graphics" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ; + < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ; < "Ð, Б, .., Ðа, Ðб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ; < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ; @@ -520,7 +520,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; /**************************************************************************/ /* */ -/* TabPage Positionen */ +/* TabPage Positionen */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_NUM_POSITION diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5ac69582c99e..49d7221974dc 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,9 +126,9 @@ void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequen // static ---------------------------------------------------------------- -static const long MINBODY = 284; // 0,5cm in twips aufgerundet -//static const long PRINT_OFFSET = 17; // 0,03cm in twips abgerundet -static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins. +static const long MINBODY = 284; // 0,5cm in twips aufgerundet +//static const long PRINT_OFFSET = 17; // 0,03cm in twips abgerundet +static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins. static USHORT pRanges[] = { @@ -208,14 +208,14 @@ BOOL IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) // ----------------------------------------------------------------------- -#define MARGIN_LEFT ( (MarginPosition)0x0001 ) -#define MARGIN_RIGHT ( (MarginPosition)0x0002 ) -#define MARGIN_TOP ( (MarginPosition)0x0004 ) -#define MARGIN_BOTTOM ( (MarginPosition)0x0008 ) +#define MARGIN_LEFT ( (MarginPosition)0x0001 ) +#define MARGIN_RIGHT ( (MarginPosition)0x0002 ) +#define MARGIN_TOP ( (MarginPosition)0x0004 ) +#define MARGIN_BOTTOM ( (MarginPosition)0x0008 ) struct SvxPage_Impl { - MarginPosition m_nPos; + MarginPosition m_nPos; Printer* mpDefPrinter; bool mbDelPrinter; @@ -266,37 +266,37 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : aPaperTrayBox ( this, CUI_RES( LB_PAPER_TRAY ) ), aMarginFl ( this, CUI_RES( FL_MARGIN ) ), aLeftMarginLbl ( this, CUI_RES( FT_LEFT_MARGIN ) ), - aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ), - aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ), - aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ), - aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ), - aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ), - aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ), - aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ), + aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ), + aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ), + aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ), + aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ), + aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ), + aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ), + aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ), aLayoutFL ( this, CUI_RES( FL_LAYOUT ) ), - aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ), + aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ), aLayoutBox ( this, CUI_RES( LB_LAYOUT ) ), - aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ), - aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ), + aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ), + aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ), aBottomSeparatorFl ( this, CUI_RES( FL_BOTTOM_SEP ) ), aTblAlignFT ( this, CUI_RES( FT_TBL_ALIGN ) ), aHorzBox ( this, CUI_RES( CB_HORZ ) ), - aVertBox ( this, CUI_RES( CB_VERT ) ), - aAdaptBox ( this, CUI_RES( CB_ADAPT ) ), + aVertBox ( this, CUI_RES( CB_VERT ) ), + aAdaptBox ( this, CUI_RES( CB_ADAPT ) ), aRegisterCB ( this, CUI_RES( CB_REGISTER ) ), aRegisterFT ( this, CUI_RES( FT_REGISTER ) ), - aRegisterLB ( this, CUI_RES( LB_REGISTER ) ), + aRegisterLB ( this, CUI_RES( LB_REGISTER ) ), - aInsideText ( CUI_RES( STR_INSIDE ) ), - aOutsideText ( CUI_RES( STR_OUTSIDE ) ), - aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ), + aInsideText ( CUI_RES( STR_INSIDE ) ), + aOutsideText ( CUI_RES( STR_OUTSIDE ) ), + aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ), - bLandscape ( FALSE ), - eMode ( SVX_PAGE_MODE_STANDARD ), - ePaperStart ( PAPER_A3 ), - ePaperEnd ( PAPER_ENV_DL ), - pImpl ( new SvxPage_Impl ) + bLandscape ( FALSE ), + eMode ( SVX_PAGE_MODE_STANDARD ), + ePaperStart ( PAPER_A3 ), + ePaperEnd ( PAPER_ENV_DL ), + pImpl ( new SvxPage_Impl ) { bBorderModified = FALSE; @@ -546,7 +546,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) String aBinName; - if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin ) + if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin ) aBinName = EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ); else aBinName = pImpl->mpDefPrinter->GetPaperBinName( (USHORT)nPaperBin ); @@ -668,7 +668,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) // im Beispiel Hintergrund und Umrandung anzeigen ResetBackground_Impl( rSet ); -//! UpdateExample_Impl(); +//! UpdateExample_Impl(); RangeHdl_Impl( 0 ); // Header Footer anzeigen @@ -822,7 +822,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( PAPER_USER == ePaper ) { - if ( nOld != nPos || + if ( nOld != nPos || aPaperWidthEdit.IsValueModified() || aPaperHeightEdit.IsValueModified() || bChecked != aLandscapeBtn.GetSavedValue() ) @@ -860,7 +860,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // sonstiges Zeug der Page nWhich = GetWhich( SID_ATTR_PAGE ); SvxPageItem aPage( (const SvxPageItem&)rOldSet.Get( nWhich ) ); - bMod = aLayoutBox.GetSelectEntryPos() != aLayoutBox.GetSavedValue(); + bMod = aLayoutBox.GetSelectEntryPos() != aLayoutBox.GetSavedValue(); if ( bMod ) aPage.SetPageUsage( @@ -1158,7 +1158,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); - Orientation eOri = ORIENTATION_PORTRAIT; + Orientation eOri = ORIENTATION_PORTRAIT; if ( bLandscape ) eOri = ORIENTATION_LANDSCAPE; @@ -1202,7 +1202,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) nFirstRightMargin = static_cast<long>(aRightMarginEdit.GetFirst()); aTopMarginEdit.SetFirst( aTopMarginEdit.Normalize( nNewT ), FUNIT_TWIP ); nFirstTopMargin = static_cast<long>(aTopMarginEdit.GetFirst()); - aBottomMarginEdit.SetFirst( aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP ); + aBottomMarginEdit.SetFirst( aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP ); nFirstBottomMargin = static_cast<long>(aBottomMarginEdit.GetFirst()); if ( bSet ) @@ -1239,7 +1239,7 @@ IMPL_LINK_INLINE_END( SvxPageDescPage, BorderModify_Impl, MetricField *, EMPTYAR void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) { // Size - Size aSize( GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ), + Size aSize( GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ), GetCoreValue( aPaperHeightEdit, SFX_MAPUNIT_TWIP ) ); aBspWin.SetSize( aSize ); @@ -1478,13 +1478,13 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) MetricField* pField = NULL; if ( IsPrinterRangeOverflow( aLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) ) pField = &aLeftMarginEdit; - if ( IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT ) + if ( IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT ) && !pField ) pField = &aRightMarginEdit; - if ( IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP ) + if ( IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP ) && !pField ) pField = &aTopMarginEdit; - if ( IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM ) + if ( IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM ) && !pField ) pField = &aBottomMarginEdit; if ( pField ) @@ -1569,8 +1569,8 @@ IMPL_LINK( SvxPageDescPage, RangeHdl_Impl, Edit *, EMPTYARG ) nW = static_cast<long>(aPaperWidthEdit.Denormalize(aPaperWidthEdit.GetValue(FUNIT_TWIP))); // Top - long nMax = nH - nBB - aBorder.Height() - MINBODY - - nFDist - nFHeight - nHDist - nHHeight; + long nMax = nH - nBB - aBorder.Height() - MINBODY - + nFDist - nFHeight - nHDist - nHHeight; aTopMarginEdit.SetMax(aTopMarginEdit.Normalize(nMax), FUNIT_TWIP); diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 733ef66a0aab..eeb9ce3a6f5c 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,43 +30,43 @@ // define ---------------------------------------------------------------- -#define PAPERSIZE_A0 0 -#define PAPERSIZE_A1 1 -#define PAPERSIZE_A2 2 -#define PAPERSIZE_A3 3 -#define PAPERSIZE_A4 4 -#define PAPERSIZE_A5 5 -#define PAPERSIZE_B4_ISO 6 -#define PAPERSIZE_B5_ISO 7 -#define PAPERSIZE_LETTER 8 -#define PAPERSIZE_LEGAL 9 -#define PAPERSIZE_TABLOID 10 -#define PAPERSIZE_USER 11 -#define PAPERSIZE_B6_ISO 12 -#define PAPERSIZE_C4 13 -#define PAPERSIZE_C5 14 -#define PAPERSIZE_C6 15 -#define PAPERSIZE_C65 16 -#define PAPERSIZE_DL 17 -#define PAPERSIZE_DIA 18 -#define PAPERSIZE_SCREEN 19 -#define PAPERSIZE_C 20 -#define PAPERSIZE_D 21 -#define PAPERSIZE_E 22 -#define PAPERSIZE_EXECUTIVE 23 -#define PAPERSIZE_LEGAL2 24 -#define PAPERSIZE_MONARCH 25 -#define PAPERSIZE_COM675 26 -#define PAPERSIZE_COM9 27 -#define PAPERSIZE_COM10 28 -#define PAPERSIZE_COM11 29 -#define PAPERSIZE_COM12 30 -#define PAPERSIZE_KAI16 31 -#define PAPERSIZE_KAI32 32 -#define PAPERSIZE_KAI32BIG 33 -#define PAPERSIZE_B4_JIS 34 -#define PAPERSIZE_B5_JIS 35 -#define PAPERSIZE_B6_JIS 36 +#define PAPERSIZE_A0 0 +#define PAPERSIZE_A1 1 +#define PAPERSIZE_A2 2 +#define PAPERSIZE_A3 3 +#define PAPERSIZE_A4 4 +#define PAPERSIZE_A5 5 +#define PAPERSIZE_B4_ISO 6 +#define PAPERSIZE_B5_ISO 7 +#define PAPERSIZE_LETTER 8 +#define PAPERSIZE_LEGAL 9 +#define PAPERSIZE_TABLOID 10 +#define PAPERSIZE_USER 11 +#define PAPERSIZE_B6_ISO 12 +#define PAPERSIZE_C4 13 +#define PAPERSIZE_C5 14 +#define PAPERSIZE_C6 15 +#define PAPERSIZE_C65 16 +#define PAPERSIZE_DL 17 +#define PAPERSIZE_DIA 18 +#define PAPERSIZE_SCREEN 19 +#define PAPERSIZE_C 20 +#define PAPERSIZE_D 21 +#define PAPERSIZE_E 22 +#define PAPERSIZE_EXECUTIVE 23 +#define PAPERSIZE_LEGAL2 24 +#define PAPERSIZE_MONARCH 25 +#define PAPERSIZE_COM675 26 +#define PAPERSIZE_COM9 27 +#define PAPERSIZE_COM10 28 +#define PAPERSIZE_COM11 29 +#define PAPERSIZE_COM12 30 +#define PAPERSIZE_KAI16 31 +#define PAPERSIZE_KAI32 32 +#define PAPERSIZE_KAI32BIG 33 +#define PAPERSIZE_B4_JIS 34 +#define PAPERSIZE_B5_JIS 35 +#define PAPERSIZE_B6_JIS 36 #endif diff --git a/cui/source/tabpages/page.hrc b/cui/source/tabpages/page.hrc index de66988c2b0c..55ffdbd0c772 100644 --- a/cui/source/tabpages/page.hrc +++ b/cui/source/tabpages/page.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,55 +29,55 @@ // defines --------------------------------------------------------------- -#define FT_LEFT_MARGIN 10 -#define ED_LEFT_MARGIN 11 -#define FT_RIGHT_MARGIN 12 -#define ED_RIGHT_MARGIN 13 -#define FT_TOP_MARGIN 14 -#define ED_TOP_MARGIN 15 -#define FT_BOTTOM_MARGIN 16 -#define ED_BOTTOM_MARGIN 17 -#define FL_MARGIN 18 +#define FT_LEFT_MARGIN 10 +#define ED_LEFT_MARGIN 11 +#define FT_RIGHT_MARGIN 12 +#define ED_RIGHT_MARGIN 13 +#define FT_TOP_MARGIN 14 +#define ED_TOP_MARGIN 15 +#define FT_BOTTOM_MARGIN 16 +#define ED_BOTTOM_MARGIN 17 +#define FL_MARGIN 18 -#define LB_LAYOUT 20 -#define FT_PAGELAYOUT 21 +#define LB_LAYOUT 20 +#define FT_PAGELAYOUT 21 -#define LB_NUMBER_FORMAT 30 +#define LB_NUMBER_FORMAT 30 #define FL_LAYOUT 31 -#define FT_NUMBER_FORMAT 32 +#define FT_NUMBER_FORMAT 32 -#define FT_TEXT_FLOW 35 -#define LB_TEXT_FLOW 36 +#define FT_TEXT_FLOW 35 +#define LB_TEXT_FLOW 36 -#define WN_BSP 40 +#define WN_BSP 40 #define FT_ORIENTATION 48 #define FT_PAPER_FORMAT 49 -#define LB_PAPER_SIZE 50 -#define RB_PORTRAIT 51 -#define RB_LANDSCAPE 52 -#define FT_PAPER_WIDTH 53 -#define ED_PAPER_WIDTH 54 -#define FT_PAPER_HEIGHT 55 -#define ED_PAPER_HEIGHT 56 -#define FT_PAPER_TRAY 57 -#define LB_PAPER_TRAY 58 -#define FL_PAPER_SIZE 59 +#define LB_PAPER_SIZE 50 +#define RB_PORTRAIT 51 +#define RB_LANDSCAPE 52 +#define FT_PAPER_WIDTH 53 +#define ED_PAPER_WIDTH 54 +#define FT_PAPER_HEIGHT 55 +#define ED_PAPER_HEIGHT 56 +#define FT_PAPER_TRAY 57 +#define LB_PAPER_TRAY 58 +#define FL_PAPER_SIZE 59 #define CB_REGISTER 60 #define FT_REGISTER 61 #define LB_REGISTER 62 #define FL_BOTTOM_SEP 64 -#define CB_HORZ 70 -#define CB_VERT 71 -#define CB_ADAPT 72 +#define CB_HORZ 70 +#define CB_VERT 71 +#define CB_ADAPT 72 #define FT_TBL_ALIGN 73 -#define PB_BACK 80 +#define PB_BACK 80 -#define STR_INSIDE 90 -#define STR_OUTSIDE 91 +#define STR_INSIDE 90 +#define STR_OUTSIDE 91 #define STR_QUERY_PRINTRANGE 92 #endif diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index c96b43a5a966..35c06cce5dc1 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index bae6fde93b8b..5351d90b9779 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,28 +69,28 @@ static USHORT pStdRanges[] = { - SID_ATTR_PARA_LINESPACE, // 10033 + SID_ATTR_PARA_LINESPACE, // 10033 SID_ATTR_PARA_LINESPACE, - SID_ATTR_LRSPACE, // 10048 - - SID_ATTR_ULSPACE, // 10049 - SID_ATTR_PARA_REGISTER, // 10413 + SID_ATTR_LRSPACE, // 10048 - + SID_ATTR_ULSPACE, // 10049 + SID_ATTR_PARA_REGISTER, // 10413 SID_ATTR_PARA_REGISTER, 0 }; static USHORT pAlignRanges[] = { - SID_ATTR_PARA_ADJUST, // 10027 + SID_ATTR_PARA_ADJUST, // 10027 SID_ATTR_PARA_ADJUST, 0 }; static USHORT pExtRanges[] = { - SID_ATTR_PARA_PAGEBREAK, // 10037 - - SID_ATTR_PARA_WIDOWS, // 10041 - SID_ATTR_PARA_MODEL, // 10065 - - SID_ATTR_PARA_KEEP, // 10066 + SID_ATTR_PARA_PAGEBREAK, // 10037 - + SID_ATTR_PARA_WIDOWS, // 10041 + SID_ATTR_PARA_MODEL, // 10065 - + SID_ATTR_PARA_KEEP, // 10066 0 }; @@ -110,7 +110,7 @@ enum LineSpaceList LLINESPACE_PROP = 3, LLINESPACE_MIN = 4, LLINESPACE_DURCH= 5, - LLINESPACE_FIX = 6, + LLINESPACE_FIX = 6, LLINESPACE_END }; @@ -182,7 +182,7 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { //! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! +//! return 0; //!!! SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -334,7 +334,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || aRightIndent.IsValueModified() - || aAutoCB.GetSavedValue() != aAutoCB.IsChecked() ) + || aAutoCB.GetSavedValue() != aAutoCB.IsChecked() ) { nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); @@ -665,7 +665,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, aLeftIndent ( this, CUI_RES( ED_LEFTINDENT ) ), aRightLabel ( this, CUI_RES( FT_RIGHTINDENT ) ), aRightIndent ( this, CUI_RES( ED_RIGHTINDENT ) ), - + aFLineLabel ( this, CUI_RES( FT_FLINEINDENT ) ), aFLineIndent ( this, CUI_RES( ED_FLINEINDENT ) ), aAutoCB ( this, CUI_RES( CB_AUTO ) ), @@ -988,14 +988,14 @@ void SvxStdParagraphTabPage::EnableAutoFirstLine() } -void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) +void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) { aLineDist.InsertEntry(sAbsDist); nMinFixDist = nMinTwip; } -void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) +void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) { /* different bit represent call to different method of SvxStdParagraphTabPage @@ -1006,9 +1006,9 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) */ - SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); - SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); + SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False); if (pPageWidthItem) SetPageWidth(pPageWidthItem->GetValue()); @@ -1029,17 +1029,17 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) EnableAbsLineDist(pLineDistItem->GetValue()); if (pFlagSetItem) - if (( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 ) + if (( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 ) EnableNegativeMode(); } -#define LASTLINEPOS_DEFAULT 0 -#define LASTLINEPOS_LEFT 1 +#define LASTLINEPOS_DEFAULT 0 +#define LASTLINEPOS_LEFT 1 -#define LASTLINECOUNT_OLD 3 -#define LASTLINECOUNT_NEW 4 +#define LASTLINECOUNT_OLD 3 +#define LASTLINECOUNT_NEW 4 // class SvxParaAlignTabPage ------------------------------------------------ @@ -1047,22 +1047,22 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet), aAlignFrm ( this, CUI_RES( FL_ALIGN ) ), aLeft ( this, CUI_RES( BTN_LEFTALIGN ) ), - aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ), - aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ), - aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ), + aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ), + aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ), + aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ), aLastLineFT ( this, CUI_RES( FT_LASTLINE ) ), - aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ), - aExpandCB ( this, CUI_RES( CB_EXPAND ) ), - aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ), - aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ), + aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ), + aExpandCB ( this, CUI_RES( CB_EXPAND ) ), + aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ), + aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ), - aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ), - aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ), - aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ), + aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ), + aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ), + aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ), - aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )), - aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )), - aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION )) + aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )), + aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )), + aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION )) { SvtLanguageOptions aLangOptions; USHORT nLastLinePos = LASTLINEPOS_DEFAULT; @@ -1122,12 +1122,12 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxParaAlignTabPage(pParent, rSet); } -USHORT* SvxParaAlignTabPage::GetRanges() +USHORT* SvxParaAlignTabPage::GetRanges() { return pAlignRanges; @@ -1344,9 +1344,9 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) switch ( eDir ) { // check the default alignment for this text direction - case FRMDIR_HORI_LEFT_TOP : aLeft.Check( TRUE ); break; - case FRMDIR_HORI_RIGHT_TOP : aRight.Check( TRUE ); break; - case FRMDIR_ENVIRONMENT : /* do nothing */ break; + case FRMDIR_HORI_LEFT_TOP : aLeft.Check( TRUE ); break; + case FRMDIR_HORI_RIGHT_TOP : aRight.Check( TRUE ); break; + case FRMDIR_ENVIRONMENT : /* do nothing */ break; default: { DBG_ERRORFILE( "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not supported" ); @@ -1356,7 +1356,7 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) return 0; } -void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll ) +void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll ) { if ( aLeft.IsChecked() ) aExampleWin.SetAdjust( SVX_ADJUST_LEFT ); @@ -1394,7 +1394,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); if (pBoolItem) if(pBoolItem->GetValue()) EnableJustifyExt(); @@ -1415,9 +1415,9 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) const TriState eHyphenState = aHyphenBox.GetState(); const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE ); - if ( eHyphenState != aHyphenBox.GetSavedValue() || - aExtHyphenBeforeBox.IsValueModified() || - aExtHyphenAfterBox.IsValueModified() || + if ( eHyphenState != aHyphenBox.GetSavedValue() || + aExtHyphenBeforeBox.IsValueModified() || + aExtHyphenAfterBox.IsValueModified() || aMaxHyphenEdit.IsValueModified() ) { SvxHyphenZoneItem aHyphen( @@ -1496,7 +1496,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, FALSE); if ( (eModelState == SFX_ITEM_SET && STATE_CHECK == aPageBreakBox.GetState()) || - eState != aPageBreakBox.GetSavedValue() || + eState != aPageBreakBox.GetSavedValue() || aBreakTypeLB.GetSelectEntryPos() != aBreakTypeLB.GetSavedValue() || aBreakPositionLB.GetSelectEntryPos() != aBreakPositionLB.GetSavedValue() ) { @@ -1534,7 +1534,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGEBREAK ); - if ( eState != aPageBreakBox.GetSavedValue() || + if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { bModified = TRUE; @@ -1711,7 +1711,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(FALSE); aPagenumText.Enable(FALSE); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); +//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1923,13 +1923,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ), - aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ), - aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ), + aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ), + aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ), aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ), - aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ), + aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ), aExtHyphenAfterBox ( this, CUI_RES( ED_HYPHENAFTER ) ), aMaxHyphenLabel ( this, CUI_RES( FT_MAXHYPH ) ), - aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ), + aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ), aExtFL ( this, CUI_RES( FL_HYPHEN ) ), aBreaksFL ( this, CUI_RES( FL_BREAKS ) ), aPageBreakBox ( this, CUI_RES( BTN_PAGEBREAK ) ), @@ -1943,11 +1943,11 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), - aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), - aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ), + aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), + aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ), aExtendFL ( this, CUI_RES( FL_OPTIONS ) ), aKeepTogetherBox ( this, CUI_RES( BTN_KEEPTOGETHER ) ), - aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ), + aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ), aOrphanBox ( this, CUI_RES( BTN_ORPHANS ) ), aOrphanRowNo ( this, CUI_RES( ED_ORPHANS ) ), aOrphanRowLabel ( this, CUI_RES( FT_ORPHANS ) ), @@ -1963,12 +1963,12 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // diese Page braucht ExchangeSupport SetExchangeSupport(); - aHyphenBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) ); - aPageBreakBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) ); - aKeepTogetherBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) ); - aWidowBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) ); - aOrphanBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) ); - aApplyCollBtn.SetClickHdl( LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) ); + aHyphenBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) ); + aPageBreakBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) ); + aKeepTogetherBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) ); + aWidowBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) ); + aOrphanBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) ); + aApplyCollBtn.SetClickHdl( LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) ); aBreakTypeLB.SetSelectHdl( LINK( this, SvxExtParagraphTabPage, PageBreakTypeHdl_Impl ) ); aBreakPositionLB.SetSelectHdl( LINK( this, SvxExtParagraphTabPage, PageBreakPosHdl_Impl ) ); @@ -1995,13 +1995,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe if ( nHtmlMode & HTMLMODE_ON ) { bHtmlMode = TRUE; - aHyphenBox .Enable(FALSE); - aBeforeText .Enable(FALSE); + aHyphenBox .Enable(FALSE); + aBeforeText .Enable(FALSE); aExtHyphenBeforeBox .Enable(FALSE); - aAfterText .Enable(FALSE); + aAfterText .Enable(FALSE); aExtHyphenAfterBox .Enable(FALSE); aMaxHyphenLabel .Enable(FALSE); - aMaxHyphenEdit .Enable(FALSE); + aMaxHyphenEdit .Enable(FALSE); aExtFL .Enable(FALSE); aPagenumText .Enable(FALSE); aPagenumEdit .Enable(FALSE); @@ -2221,7 +2221,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False); + SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False); if (pDisablePageBreakItem) if ( pDisablePageBreakItem->GetValue()) @@ -2235,7 +2235,7 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )), aForbiddenRulesCB( this, CUI_RES(CB_AS_FORBIDDEN )), aHangingPunctCB( this, CUI_RES(CB_AS_HANG_PUNC )), - aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//, + aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//, { FreeResource(); @@ -2251,12 +2251,12 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxAsianTabPage(pParent, rSet); } -USHORT* SvxAsianTabPage::GetRanges() +USHORT* SvxAsianTabPage::GetRanges() { static USHORT pRanges[] = { @@ -2266,7 +2266,7 @@ USHORT* SvxAsianTabPage::GetRanges() return pRanges; } -BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) +BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { BOOL bRet = FALSE; SfxItemPool* pPool = rSet.GetPool(); @@ -2320,17 +2320,17 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT 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, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); +// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(FALSE); -// aPuntuationCB .Enable(FALSE); -// aAdjustNumbersCB .Enable(FALSE); +// lcl_SetBox(rSet, , aAdjustNumbersCB ); +// aAllowWordBreakCB .Enable(FALSE); +// aPuntuationCB .Enable(FALSE); +// aAdjustNumbersCB .Enable(FALSE); } /* -----------------------------19.12.00 12:59-------------------------------- diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc index 8a14407a9cd0..b521366ef9f1 100644 --- a/cui/source/tabpages/paragrph.hrc +++ b/cui/source/tabpages/paragrph.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,24 +29,24 @@ // StandardTabPage ---------------------------------------------------------- -#define FT_LEFTINDENT 10 -#define ED_LEFTINDENT 11 -#define FT_FLINEINDENT 12 -#define ED_FLINEINDENT 13 -#define FT_RIGHTINDENT 14 -#define ED_RIGHTINDENT 15 +#define FT_LEFTINDENT 10 +#define ED_LEFTINDENT 11 +#define FT_FLINEINDENT 12 +#define ED_FLINEINDENT 13 +#define FT_RIGHTINDENT 14 +#define ED_RIGHTINDENT 15 #define FL_INDENT 16 #define FT_TOPDIST 20 #define ED_TOPDIST 21 -#define FT_BOTTOMDIST 22 -#define ED_BOTTOMDIST 23 +#define FT_BOTTOMDIST 22 +#define ED_BOTTOMDIST 23 #define FL_DIST 24 -#define BTN_LEFTALIGN 30 -#define BTN_RIGHTALIGN 31 -#define BTN_CENTERALIGN 32 -#define BTN_JUSTIFYALIGN 33 +#define BTN_LEFTALIGN 30 +#define BTN_RIGHTALIGN 31 +#define BTN_CENTERALIGN 32 +#define BTN_JUSTIFYALIGN 33 #define FL_ALIGN 34 #define FL_VERTALIGN 35 #define LB_VERTALIGN 36 @@ -57,8 +57,8 @@ #define LB_LINEDIST 40 #define FT_LINEDIST 41 -#define ED_LINEDISTPERCENT 42 -#define ED_LINEDISTMETRIC 43 +#define ED_LINEDISTPERCENT 42 +#define ED_LINEDISTMETRIC 43 #define FL_LINEDIST 44 #define WN_EXAMPLE 46 @@ -73,20 +73,20 @@ // ExtendedTabPage ---------------------------------------------------------- #define BTN_HYPHEN 50 -#define ED_HYPHENBEFORE 52 -#define FT_HYPHENBEFORE 53 -#define ED_HYPHENAFTER 55 -#define FT_HYPHENAFTER 56 +#define ED_HYPHENBEFORE 52 +#define FT_HYPHENBEFORE 53 +#define ED_HYPHENAFTER 55 +#define FT_HYPHENAFTER 56 #define FL_HYPHEN 57 -#define BTN_PAGEBREAK 60 +#define BTN_PAGEBREAK 60 #define FT_BREAKTYPE 61 #define LB_BREAKTYPE 62 #define FT_BREAKPOSITION 63 #define LB_BREAKPOSITION 64 -#define BTN_PAGECOLL 65 +#define BTN_PAGECOLL 65 #define LB_PAGECOLL 66 -#define BTN_KEEPTOGETHER 67 +#define BTN_KEEPTOGETHER 67 #define BTN_WIDOWS 68 #define ED_WIDOWS 69 #define FT_WIDOWS 70 @@ -96,10 +96,10 @@ #define FL_OPTIONS 74 #define FT_PAGENUM 75 #define ED_PAGENUM 76 -#define FL_BREAKS 77 +#define FL_BREAKS 77 #define CB_KEEPTOGETHER 80 -#define FT_MAXHYPH 81 +#define FT_MAXHYPH 81 #define ED_MAXHYPH 83 #define CB_REGISTER 84 @@ -115,7 +115,7 @@ #define CB_AS_FORBIDDEN 4 -#define CB_AS_SCRIPT_SPACE 7 +#define CB_AS_SCRIPT_SPACE 7 #endif diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index d52283ceea8f..9b06d2612a80 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -486,7 +486,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH Text [ en-US ] = "Hyphenation" ; }; FixedLine FL_OPTIONS - { // is moved one section deeper to not raise unnecessary translations + { // is moved one section deeper to not raise unnecessary translations Pos = MAP_APPFONT ( 6 , 116 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Options" ; @@ -501,7 +501,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGEBREAK { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 61 , 10 ) ; Text [ en-US ] = "Insert" ; @@ -546,7 +546,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGECOLL { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT (21 , 100 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "With Page St~yle" ; @@ -554,7 +554,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; ListBox LB_PAGECOLL { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 98 , 98 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; DropDown = TRUE ; diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..2bc1c595f584 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index b8bfdf5c5052..1f8889569373 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/swpossizetabpage.hrc b/cui/source/tabpages/swpossizetabpage.hrc index 9c5170b21d83..b7e69c27c83b 100644 --- a/cui/source/tabpages/swpossizetabpage.hrc +++ b/cui/source/tabpages/swpossizetabpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index 4ad36b9aa1d7..224504cc14d7 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage FixedText m_aHeightFT; MetricField m_aHeightMF; CheckBox m_aKeepRatioCB; - + FixedLine m_aSeparatorFL; FixedLine m_aAnchorFL; @@ -71,7 +71,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage MetricField m_aHoriByMF; FixedText m_aHoriToFT; ListBox m_aHoriToLB; - + CheckBox m_aHoriMirrorCB; FixedText m_aVertFT; @@ -82,16 +82,16 @@ class SvxSwPosSizeTabPage : public SfxTabPage ListBox m_aVertToLB; CheckBox m_aFollowCB; - + SvxSwFrameExample m_aExampleWN; - + Link m_aValidateLink; - + //'string provider' SvxSwFramePosString m_aFramePosString; - + Rectangle m_aRect; //size of all selected objects - Rectangle m_aWorkArea; + Rectangle m_aWorkArea; Point m_aAnchorPos; FrmMap* m_pVMap; @@ -103,7 +103,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage short m_nOldHRel; short m_nOldV; short m_nOldVRel; - + double m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button USHORT m_nHtmlMode; bool m_bHtmlMode; @@ -115,7 +115,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - + DECL_LINK( RangeModifyHdl, Edit * ); DECL_LINK( AnchorTypeHdl, RadioButton * ); DECL_LINK( PosHdl, ListBox * ); @@ -123,7 +123,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK( MirrorHdl, CheckBox * ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( ProtectHdl, TriStateBox *); - + void InitPos(short nAnchorType, USHORT nH, USHORT nHRel, USHORT nV, USHORT nVRel, long nX, long nY); @@ -136,10 +136,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage void UpdateExample(); -public: +public: SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); ~SvxSwPosSizeTabPage(); - + static SfxTabPage* Create( Window*, const SfxItemSet& ); static USHORT* GetRanges(); @@ -149,9 +149,9 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ); void EnableAnchorTypes(USHORT nAnchorEnable); - + void SetValidateFramePosLink( const Link& rLink ) - {m_aValidateLink = rLink;} + {m_aValidateLink = rLink;} void SetView( const SdrView* pSdrView ); }; diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src index c5fd8e8816e9..d8bcad8e81ed 100644 --- a/cui/source/tabpages/swpossizetabpage.src +++ b/cui/source/tabpages/swpossizetabpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 49fd6bcf393e..4f8b1bc5e760 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc index 10fe10f1495d..dfa14dd7f04b 100644 --- a/cui/source/tabpages/tabarea.hrc +++ b/cui/source/tabpages/tabarea.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -141,7 +141,7 @@ #define FT_Y_OFFSET 2 #define MTR_FLD_X_OFFSET 1 #define MTR_FLD_Y_OFFSET 2 -#define LB_AREA_TYPE 19 +#define LB_AREA_TYPE 19 #define RBT_ROW 6 #define RBT_COLUMN 7 #define MTR_FLD_OFFSET 3 @@ -152,36 +152,36 @@ #define FT_Y_SIZE 11 #define FT_BITMAPS_HIDDEN 12 -#define RBT_TRANS_OFF 8 -#define RBT_TRANS_LINEAR 9 -#define RBT_TRANS_GRADIENT 10 -#define GRP_TRANS_MODE 9 -#define GRP_TRANS_GRADIENT 10 -#define CTL_TRANS_PREVIEW 19 +#define RBT_TRANS_OFF 8 +#define RBT_TRANS_LINEAR 9 +#define RBT_TRANS_GRADIENT 10 +#define GRP_TRANS_MODE 9 +#define GRP_TRANS_GRADIENT 10 +#define CTL_TRANS_PREVIEW 19 -#define FT_TRGR_TYPE 12 -#define LB_TRGR_GRADIENT_TYPES 3 -#define FT_TRGR_CENTER_X 13 -#define MTR_TRGR_CENTER_X 4 -#define FT_TRGR_CENTER_Y 14 -#define MTR_TRGR_CENTER_Y 5 -#define FT_TRGR_ANGLE 15 -#define MTR_TRGR_ANGLE 6 -#define FT_TRGR_BORDER 16 -#define MTR_TRGR_BORDER 7 -#define FT_TRGR_START_VALUE 17 -#define MTR_TRGR_START_VALUE 8 -#define FT_TRGR_END_VALUE 18 -#define MTR_TRGR_END_VALUE 9 +#define FT_TRGR_TYPE 12 +#define LB_TRGR_GRADIENT_TYPES 3 +#define FT_TRGR_CENTER_X 13 +#define MTR_TRGR_CENTER_X 4 +#define FT_TRGR_CENTER_Y 14 +#define MTR_TRGR_CENTER_Y 5 +#define FT_TRGR_ANGLE 15 +#define MTR_TRGR_ANGLE 6 +#define FT_TRGR_BORDER 16 +#define MTR_TRGR_BORDER 7 +#define FT_TRGR_START_VALUE 17 +#define MTR_TRGR_START_VALUE 8 +#define FT_TRGR_END_VALUE 18 +#define MTR_TRGR_END_VALUE 9 #define MTR_TRANSPARENT 10 #define MTR_SHADOW_TRANSPARENT 11 // Hatch-Background on Area-TabPage -#define GRP_HATCHBCKGRD 20 -#define CB_HATCHBCKGRD 21 -#define LB_HATCHBCKGRDCOLOR 22 +#define GRP_HATCHBCKGRD 20 +#define CB_HATCHBCKGRD 21 +#define LB_HATCHBCKGRDCOLOR 22 -#define IMG_LOAD_H 23 -#define IMG_SAVE_H 24 +#define IMG_LOAD_H 23 +#define IMG_SAVE_H 24 diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index f5ff6b24ff66..9ff8c0d6f919 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include "tabarea.hrc" #include <svx/dialogs.hrc> -#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; +#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; // RID_SVXPAGE_AREA ------------------------------------------------------ -#define TRANS_GRAD_OFFSET_X 6 -#define TRANS_GRAD_OFFSET_Y 64 -#define TRANS_GRAD_FIELD_SEPARATION 24 +#define TRANS_GRAD_OFFSET_X 6 +#define TRANS_GRAD_OFFSET_Y 64 +#define TRANS_GRAD_FIELD_SEPARATION 24 TabPage RID_SVXPAGE_TRANSPARENCE { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 42e4a867b181..2a50f906c088 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,9 +69,9 @@ SvxLineTabDialog::SvxLineTabDialog BOOL bHasObj ) : - SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ), - pDrawModel ( pModel ), - pObj ( pSdrObj ), + SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ), + pDrawModel ( pModel ), + pObj ( pSdrObj ), rOutAttrs ( *pAttr ), pColorTab ( pModel->GetColorTable() ), mpNewColorTab ( pModel->GetColorTable() ), @@ -121,7 +121,7 @@ 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 ); +// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc index 0034e2126bf5..34b7e7fe4085 100644 --- a/cui/source/tabpages/tabline.hrc +++ b/cui/source/tabpages/tabline.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,9 +77,9 @@ #define TSB_CENTER_END 5 #define FT_TRANSPARENT 10 #define MTR_LINE_TRANSPARENT 5 -#define FL_SEPARATOR 4 -#define FT_LINE_END_STYLE 11 -#define FT_TITLE 12 +#define FL_SEPARATOR 4 +#define FT_LINE_END_STYLE 11 +#define FT_TITLE 12 // #116827# #define FL_EDGE_STYLE 5 @@ -87,16 +87,16 @@ #define LB_EDGE_STYLE 5 //Symbole (fuer StarChart) -#define FT_SYMBOL_WIDTH 20 -#define FT_SYMBOL_HEIGHT 21 -#define MF_SYMBOL_WIDTH 22 -#define MF_SYMBOL_HEIGHT 23 -#define CB_SYMBOL_RATIO 24 -#define FL_SYMBOL_FORMAT 25 -#define MB_SYMBOL_BITMAP 26 +#define FT_SYMBOL_WIDTH 20 +#define FT_SYMBOL_HEIGHT 21 +#define MF_SYMBOL_WIDTH 22 +#define MF_SYMBOL_HEIGHT 23 +#define CB_SYMBOL_RATIO 24 +#define FL_SYMBOL_FORMAT 25 +#define MB_SYMBOL_BITMAP 26 -#define MN_GRAPHIC_DLG 1 +#define MN_GRAPHIC_DLG 1 #define MN_GALLERY 2 #define MN_SYMBOLS 3 #define MN_SYMBOLS_NONE 4 diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index e16c3d7e9529..57d821389ad9 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ // Selecting LineStyle / Color / Width -------------------- -#define MASKCOLOR MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; +#define MASKCOLOR MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; TabPage RID_SVXPAGE_LINE @@ -744,7 +744,7 @@ TabDialog RID_SVXDLG_LINE Identifier = RID_SVXPAGE_SHADOW ; PageResID = RID_SVXPAGE_SHADOW ; Text [ en-US ] = "Shadow" ; - }; + }; PageItem { Identifier = RID_SVXPAGE_LINE_DEF ; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index b6d047977c64..a40a1a448340 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -738,7 +738,7 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG ) void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); + SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); if (pControlItem) DisableControls(pControlItem->GetValue()); } diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc index be3823fd9cd4..97ae4d947381 100644 --- a/cui/source/tabpages/tabstpge.hrc +++ b/cui/source/tabpages/tabstpge.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,25 +33,25 @@ #define FL_TABPOS 11 #define FL_TABPOS_VERT 12 -#define BTN_TABTYPE_LEFT 20 +#define BTN_TABTYPE_LEFT 20 #define WIN_TABLEFT 21 -#define BTN_TABTYPE_RIGHT 22 -#define WIN_TABRIGHT 23 -#define BTN_TABTYPE_CENTER 24 -#define WIN_TABCENTER 25 -#define BTN_TABTYPE_DECIMAL 26 -#define WIN_TABDECIMAL 27 -#define ED_TABTYPE_DECCHAR 28 -#define FT_TABTYPE_DECCHAR 29 +#define BTN_TABTYPE_RIGHT 22 +#define WIN_TABRIGHT 23 +#define BTN_TABTYPE_CENTER 24 +#define WIN_TABCENTER 25 +#define BTN_TABTYPE_DECIMAL 26 +#define WIN_TABDECIMAL 27 +#define ED_TABTYPE_DECCHAR 28 +#define FT_TABTYPE_DECCHAR 29 #define FL_TABTYPE 30 -#define BTN_FILLCHAR_NO 40 -#define BTN_FILLCHAR_POINTS 41 +#define BTN_FILLCHAR_NO 40 +#define BTN_FILLCHAR_POINTS 41 #define BTN_FILLCHAR_DASHLINE 42 #define BTN_FILLCHAR_UNDERSCORE 43 -#define BTN_FILLCHAR_OTHER 44 -#define ED_FILLCHAR_OTHER 45 +#define BTN_FILLCHAR_OTHER 44 +#define ED_FILLCHAR_OTHER 45 #define FL_FILLCHAR 46 #define BTN_NEW 50 diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src index 3bd0467f2f0c..cb743cf849a1 100644 --- a/cui/source/tabpages/tabstpge.src +++ b/cui/source/tabpages/tabstpge.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e489a91546e5..5c1a3ea232a8 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,8 +63,8 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ), - rOutAttrs ( *pAttr ), - pView ( pSdrView ) + rOutAttrs ( *pAttr ), + pView ( pSdrView ) { FreeResource(); @@ -105,36 +105,36 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) \************************************************************************/ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ), rInAttrs ), - aFlEffect ( this, CUI_RES(FL_EFFECT)), - aFtEffects ( this, CUI_RES(FT_EFFECTS)), - aLbEffect ( this, CUI_RES( LB_EFFECT ) ), - //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ), - aFtDirection ( this, CUI_RES(FT_DIRECTION) ), - aBtnUp ( this, CUI_RES( BTN_UP ) ), - aBtnLeft ( this, CUI_RES( BTN_LEFT ) ), - aBtnRight ( this, CUI_RES( BTN_RIGHT ) ), - aBtnDown ( this, CUI_RES( BTN_DOWN ) ), + aFlEffect ( this, CUI_RES(FL_EFFECT)), + aFtEffects ( this, CUI_RES(FT_EFFECTS)), + aLbEffect ( this, CUI_RES( LB_EFFECT ) ), + //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ), + aFtDirection ( this, CUI_RES(FT_DIRECTION) ), + aBtnUp ( this, CUI_RES( BTN_UP ) ), + aBtnLeft ( this, CUI_RES( BTN_LEFT ) ), + aBtnRight ( this, CUI_RES( BTN_RIGHT ) ), + aBtnDown ( this, CUI_RES( BTN_DOWN ) ), aFlProperties ( this, CUI_RES(FL_PROPERTIES)), - aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ), - aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ), + aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ), + aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ), - aFtCount ( this, CUI_RES(FT_COUNT)), - aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ), - aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ), + aFtCount ( this, CUI_RES(FT_COUNT)), + aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ), + aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ), - aFtAmount ( this, CUI_RES(FT_AMOUNT)), - aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ), - aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ), + aFtAmount ( this, CUI_RES(FT_AMOUNT)), + aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ), + aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ), - aFtDelay ( this, CUI_RES(FT_DELAY)), - aTsbAuto ( this, CUI_RES( TSB_AUTO ) ), - aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ), + aFtDelay ( this, CUI_RES(FT_DELAY)), + aTsbAuto ( this, CUI_RES( TSB_AUTO ) ), + aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ), - rOutAttrs ( rInAttrs ), - eAniKind ( SDRTEXTANI_NONE ) + rOutAttrs ( rInAttrs ), + eAniKind ( SDRTEXTANI_NONE ) { FreeResource(); @@ -494,7 +494,7 @@ void SvxTextAnimationPage::Construct() |* \************************************************************************/ -USHORT* SvxTextAnimationPage::GetRanges() +USHORT* SvxTextAnimationPage::GetRanges() { return( pRanges ); } diff --git a/cui/source/tabpages/textanim.hrc b/cui/source/tabpages/textanim.hrc index 2f29d81a146a..9fc1d207e8fe 100644 --- a/cui/source/tabpages/textanim.hrc +++ b/cui/source/tabpages/textanim.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index 229875a6ad4d..346426f24ea9 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,40 +32,40 @@ #include <svx/dialogs.hrc> // direction image buttons -#define MA_HALFBUTTON_WIDTH 7 -#define MA_BUTTON_WIDTH (2 * MA_HALFBUTTON_WIDTH) -#define MA_BUTTON_HEIGHT (2 * MA_HALFBUTTON_WIDTH) -#define BUTTON_SIZE MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH ) +#define MA_HALFBUTTON_WIDTH 7 +#define MA_BUTTON_WIDTH (2 * MA_HALFBUTTON_WIDTH) +#define MA_BUTTON_HEIGHT (2 * MA_HALFBUTTON_WIDTH) +#define BUTTON_SIZE MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH ) #define MA_MOVEBUT_GRACE_X 6 // height of first group Text effects -#define MA_EFFECTSGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + \ +#define MA_EFFECTSGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + \ RSC_SP_FLGR_INNERBORDER_LEFT + \ -/* direction buttons */ 3*MA_BUTTON_HEIGHT + \ +/* direction buttons */ 3*MA_BUTTON_HEIGHT + \ RSC_SP_FLGR_INNERBORDER_BOTTOM + RSC_SP_FLGR_SPACE_Y) -// height of second group height of FIXEDTEXT -#define MA_PROPERTIESGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \ -/* text initially visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* text finally visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* animation runs */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* number of runs */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* step size */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* number of pixel */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* step delay */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* delay time */ RSC_CD_TEXTBOX_HEIGHT) +// height of second group height of FIXEDTEXT +#define MA_PROPERTIESGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \ +/* text initially visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* text finally visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* animation runs */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* number of runs */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* step size */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* number of pixel */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* step delay */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* delay time */ RSC_CD_TEXTBOX_HEIGHT) // left space for real controls -#define MA_LEFT_SPACE (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) +#define MA_LEFT_SPACE (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) // tabpage total size -#define MA_TOTAL_WIDTH 260 -#define MA_TOTAL_HEIGHT RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM +#define MA_TOTAL_WIDTH 260 +#define MA_TOTAL_HEIGHT RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM // X position and width of effects drop down -#define MA_EFFECTLIST_X 50 -#define MA_EFFECTLIST_WIDTH 95 +#define MA_EFFECTLIST_X 50 +#define MA_EFFECTLIST_WIDTH 95 // RID_SVXPAGE_TEXTANIMATION --------------------------------------------- @@ -81,7 +81,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Text animation effects" ; }; -#define MA_CURR_Y RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT +#define MA_CURR_Y RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT FixedText FT_EFFECTS { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y + 3 ) ; @@ -154,7 +154,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Properties" ; }; -#define MA_CURR_Y2 RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y2 RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_START_INSIDE { TabStop = TRUE ; @@ -162,7 +162,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "S~tart inside" ; }; -#define MA_CURR_Y3 MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y3 MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y TriStateBox TSB_STOP_INSIDE { TabStop = TRUE ; @@ -170,7 +170,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Text visible when exiting" ; }; -#define MA_CURR_Y4 MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y4 MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_COUNT { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y4 ) ; @@ -178,7 +178,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Animation cycles" ; }; -#define MA_CURR_Y5 MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y5 MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_ENDLESS { TabStop = TRUE ; @@ -198,7 +198,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Minimum = 1 ; First = 1 ; }; -#define MA_CURR_Y6 MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y6 MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_AMOUNT { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y6 ) ; @@ -206,7 +206,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Increment" ; }; -#define MA_CURR_Y7 MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y7 MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_PIXEL { TabStop = TRUE ; @@ -231,7 +231,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Maximum = 10000 ; Last = 10000 ; }; -#define MA_CURR_Y8 MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y8 MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_DELAY { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y8 ) ; @@ -239,7 +239,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Delay" ; }; -#define MA_CURR_Y9 MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y9 MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_AUTO { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 8ca6d49e4ab1..152f1b911256 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -71,8 +71,8 @@ static USHORT pRanges[] = \************************************************************************/ //CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs, -//CHINA001 const SdrView* pSdrView ) : -//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) +//CHINA001 const SdrView* pSdrView ) : +//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) //CHINA001 { //CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs ); //CHINA001 @@ -99,34 +99,34 @@ static USHORT pRanges[] = \************************************************************************/ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ), + SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ), rInAttrs ), - aFlText ( this, CUI_RES( FL_TEXT ) ), + aFlText ( this, CUI_RES( FL_TEXT ) ), aTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), - aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ), - aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ), + aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ), + aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ), aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ), aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ), - aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), - aFtLeft ( this, CUI_RES( FT_LEFT ) ), - aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ), - aFtRight ( this, CUI_RES( FT_RIGHT ) ), - aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ), - aFtTop ( this, CUI_RES( FT_TOP ) ), - aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ), - aFtBottom ( this, CUI_RES( FT_BOTTOM ) ), - aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ), - - aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), - - aFlPosition ( this, CUI_RES( FL_POSITION ) ), - aCtlPosition ( this, CUI_RES( CTL_POSITION ), + aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), + aFtLeft ( this, CUI_RES( FT_LEFT ) ), + aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ), + aFtRight ( this, CUI_RES( FT_RIGHT ) ), + aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ), + aFtTop ( this, CUI_RES( FT_TOP ) ), + aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ), + aFtBottom ( this, CUI_RES( FT_BOTTOM ) ), + aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ), + + aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), + + aFlPosition ( this, CUI_RES( FL_POSITION ) ), + aCtlPosition ( this, CUI_RES( CTL_POSITION ), RP_MM, 240, 100 ), - aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ), + aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { FreeResource(); @@ -384,7 +384,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); - INT32 nValue; + INT32 nValue; TriState eState; if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() ) @@ -595,7 +595,7 @@ SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxTextAttrPage::GetRanges() +USHORT* SvxTextAttrPage::GetRanges() { return( pRanges ); } @@ -715,8 +715,8 @@ IMPL_LINK( SvxTextAttrPage, ClickHdl_Impl, void *, EMPTYARG ) { BOOL bAutoGrowWidth = aTsbAutoGrowWidth.GetState() == STATE_CHECK; BOOL bAutoGrowHeight = aTsbAutoGrowHeight.GetState() == STATE_CHECK; - BOOL bFitToSize = aTsbFitToSize.GetState() == STATE_CHECK; - BOOL bContour = aTsbContour.GetState() == STATE_CHECK; + BOOL bFitToSize = aTsbFitToSize.GetState() == STATE_CHECK; + BOOL bContour = aTsbContour.GetState() == STATE_CHECK; aTsbContour.Enable( !bFitToSize && !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) && diff --git a/cui/source/tabpages/textattr.hrc b/cui/source/tabpages/textattr.hrc index b5da04f607e5..70d4512c51c4 100644 --- a/cui/source/tabpages/textattr.hrc +++ b/cui/source/tabpages/textattr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src index 59b0a534472d..23a2138cbe57 100644 --- a/cui/source/tabpages/textattr.src +++ b/cui/source/tabpages/textattr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_WORDWRAP_TEXT { - TabStop = TRUE; + TabStop = TRUE; Pos = MAP_APPFONT( 132, 14 ) ; Size = MAP_APPFONT( 127 , 10 ) ; Text [ en-US ] = "~Word wrap text in shape"; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 5ba3c1b9511e..ffb0f487ccf9 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ static USHORT pTransparenceRanges[] = /************************************************************************* |* -|* Dialog for transparence +|* Dialog for transparence |* \************************************************************************/ @@ -251,33 +251,33 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS) } SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs) -: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs), +: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs), rOutAttrs ( rInAttrs ), nPageType(0), nDlgType(0), - + aFlProp ( this, CUI_RES( FL_PROP ) ), - aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ), + aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ), aRbtTransLinear ( this, CUI_RES( RBT_TRANS_LINEAR ) ), - aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ), + aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ), aMtrTransparent ( this, CUI_RES( MTR_TRANSPARENT ) ), - aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ), - aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ), - aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ), - aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ), - aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ), - aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ), - aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ), - aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ), - aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ), - aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ), - aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ), - aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ), - aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ), - aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ), - + aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ), + aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ), + aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ), + aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ), + aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ), + aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ), + aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ), + aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ), + aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ), + aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ), + aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ), + aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ), + aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ), + aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ), + aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), aCtlXRectPreview ( this, CUI_RES( CTL_TRANS_PREVIEW ) ), bBitmap ( FALSE ), @@ -605,22 +605,22 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) } /************************************************************************* |* -|* Dialog to modify fill-attributes +|* Dialog to modify fill-attributes |* \************************************************************************/ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aTypeLB ( this, CUI_RES( LB_AREA_TYPE ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), - aLbGradient ( this, CUI_RES( LB_GRADIENT ) ), - aLbHatching ( this, CUI_RES( LB_HATCHING ) ), - aLbBitmap ( this, CUI_RES( LB_BITMAP ) ), - aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), + aLbGradient ( this, CUI_RES( LB_GRADIENT ) ), + aLbHatching ( this, CUI_RES( LB_HATCHING ) ), + aLbBitmap ( this, CUI_RES( LB_BITMAP ) ), + aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), aTsbStepCount ( this, CUI_RES( TSB_STEPCOUNT ) ), aFlStepCount ( this, CUI_RES( FL_STEPCOUNT ) ), @@ -643,14 +643,14 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : aFtYOffset ( this, CUI_RES( FT_Y_OFFSET ) ), aMtrFldYOffset ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ), aTsbTile ( this, CUI_RES( TSB_TILE ) ), - aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ), + aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ), aFlOffset ( this, CUI_RES( FL_OFFSET ) ), aRbtRow ( this, CUI_RES( RBT_ROW ) ), - aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ), + aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ), aMtrFldOffset ( this, CUI_RES( MTR_FLD_OFFSET ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), - + rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -975,7 +975,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; USHORT _nPos; - BOOL bModified = FALSE; + BOOL bModified = FALSE; if( nDlgType != 0 || *pbAreaTP ) { @@ -1442,7 +1442,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { XFillGradientItem aGradientItem( ( ( const XFillGradientItem& ) rAttrs.Get( XATTR_FILLGRADIENT ) ) ); - String aString( aGradientItem.GetName() ); + String aString( aGradientItem.GetName() ); XGradient aGradient( aGradientItem.GetGradientValue() ); aLbGradient.SelectEntryByList( pGradientList, aString, aGradient ); @@ -1725,7 +1725,7 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxAreaTabPage::GetRanges() +USHORT* SvxAreaTabPage::GetRanges() { return( pAreaRanges ); } @@ -1834,8 +1834,8 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Hide(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pColorTab->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pColorTab->GetPath() ); aURL.Append( pColorTab->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -1924,8 +1924,8 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Hide(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pGradientList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pGradientList->GetPath() ); aURL.Append( pGradientList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -2016,8 +2016,8 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Enable(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pHatchingList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pHatchingList->GetPath() ); aURL.Append( pHatchingList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -2177,8 +2177,8 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) aFlOffset.Show(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pBitmapList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pBitmapList->GetPath() ); aURL.Append( pBitmapList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2b1ae42646c9..dd42c0a14b23 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -74,7 +74,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Bitmaps +|* Dialog zum Aendern und Definieren der Bitmaps |* \************************************************************************/ @@ -84,26 +84,26 @@ SvxBitmapTabPage::SvxBitmapTabPage const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ), aCtlPixel ( this, CUI_RES( CTL_PIXEL ) ), aFtPixelEdit ( this, CUI_RES( FT_PIXEL_EDIT ) ), aFtColor ( this, CUI_RES( FT_COLOR ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), - aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ), - aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), + aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ), + aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ), // This fix text is used only to provide the name for the following // bitmap list box. The fixed text is not displayed. aLbBitmapsHidden ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ), - aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ), + aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ), aFlProp ( this, CUI_RES( FL_PROP ) ), - aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), aBtnImport ( this, CUI_RES( BTN_IMPORT ) ), aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aBitmapCtl ( this, aCtlPreview.GetSizePixel() ), rOutAttrs ( rInAttrs ), @@ -210,8 +210,8 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pBitmapList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pBitmapList->GetPath() ); aURL.Append( pBitmapList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -359,13 +359,13 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //USHORT nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //BOOL bPixelColor = FALSE; - //USHORT nWidth = pBitmap->GetSizePixel().Width(); - //USHORT nHeight = pBitmap->GetSizePixel().Height(); + //WorkWindow aTmpWW( DLGWIN ); + //VirtualDevice aVD( aTmpWW ); + //USHORT nLines = aCtlPixel.GetLineCount(); + //Color aPixelColor, aBackColor; + //BOOL bPixelColor = FALSE; + //USHORT nWidth = pBitmap->GetSizePixel().Width(); + //USHORT nHeight = pBitmap->GetSizePixel().Height(); // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) @@ -688,7 +688,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbBitmaps.Invalidate(); @@ -731,8 +731,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( !aDlg.Execute() ) { - Graphic aGraphic; - int nError = 1; + Graphic aGraphic; + int nError = 1; EnterWait(); nError = aDlg.GetGraphic( aGraphic ); @@ -744,8 +744,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) WarningBox* pWarnBox = NULL; // convert file URL to UI name - String aName; - INetURLObject aURL( aDlg.GetPath() ); + String aName; + INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc ); @@ -797,7 +797,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbBitmaps.Invalidate(); @@ -1053,8 +1053,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); @@ -1150,7 +1150,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) -Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const +Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const { if (pLabeled == &aLbBitmaps) return const_cast<FixedText*>(&aLbBitmapsHidden); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 00f5fb5739cb..efb6a0d82172 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Farben +|* Dialog zum Aendern und Definieren der Farben |* \************************************************************************/ @@ -83,13 +83,13 @@ SvxColorTabPage::SvxColorTabPage const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ), + SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aFtName ( this, CUI_RES( FT_NAME ) ), - aEdtName ( this, CUI_RES( EDT_NAME ) ), - aFtColor ( this, CUI_RES( FT_COLOR ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), + aEdtName ( this, CUI_RES( EDT_NAME ) ), + aFtColor ( this, CUI_RES( FT_COLOR ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), aTableNameFT ( this, CUI_RES( FT_TABLE_NAME ) ), aValSetColorTable ( this, CUI_RES( CTL_COLORTABLE ) ), @@ -98,20 +98,20 @@ SvxColorTabPage::SvxColorTabPage aCtlPreviewNew ( this, CUI_RES( CTL_PREVIEW_NEW ) ), aLbColorModel ( this, CUI_RES( LB_COLORMODEL ) ), - aFtColorModel1 ( this, CUI_RES( FT_1 ) ), - aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ), - aFtColorModel2 ( this, CUI_RES( FT_2 ) ), - aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ), - aFtColorModel3 ( this, CUI_RES( FT_3 ) ), - aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ), - aFtColorModel4 ( this, CUI_RES( FT_4 ) ), - aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aFtColorModel1 ( this, CUI_RES( FT_1 ) ), + aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ), + aFtColorModel2 ( this, CUI_RES( FT_2 ) ), + aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ), + aFtColorModel3 ( this, CUI_RES( FT_3 ) ), + aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ), + aFtColorModel4 ( this, CUI_RES( FT_4 ) ), + aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -227,8 +227,8 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pColorTab->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pColorTab->GetPath() ); aURL.Append( pColorTab->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index ef48bbbe9483..270c7b9384e5 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -61,7 +61,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Farbverlaeufe +|* Dialog zum Aendern und Definieren der Farbverlaeufe |* \************************************************************************/ @@ -70,20 +70,20 @@ SvxGradientTabPage::SvxGradientTabPage Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ), + SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbGradientType ( this, CUI_RES( LB_GRADIENT_TYPES ) ), - aFtCenterX ( this, CUI_RES( FT_CENTER_X ) ), - aMtrCenterX ( this, CUI_RES( MTR_CENTER_X ) ), - aFtCenterY ( this, CUI_RES( FT_CENTER_Y ) ), - aMtrCenterY ( this, CUI_RES( MTR_CENTER_Y ) ), - aFtAngle ( this, CUI_RES( FT_ANGLE ) ), - aMtrAngle ( this, CUI_RES( MTR_ANGLE ) ), - aFtBorder ( this, CUI_RES( FT_BORDER ) ), - aMtrBorder ( this, CUI_RES( MTR_BORDER ) ), - aFtColorFrom ( this, CUI_RES( FT_COLOR_FROM ) ), + aLbGradientType ( this, CUI_RES( LB_GRADIENT_TYPES ) ), + aFtCenterX ( this, CUI_RES( FT_CENTER_X ) ), + aMtrCenterX ( this, CUI_RES( MTR_CENTER_X ) ), + aFtCenterY ( this, CUI_RES( FT_CENTER_Y ) ), + aMtrCenterY ( this, CUI_RES( MTR_CENTER_Y ) ), + aFtAngle ( this, CUI_RES( FT_ANGLE ) ), + aMtrAngle ( this, CUI_RES( MTR_ANGLE ) ), + aFtBorder ( this, CUI_RES( FT_BORDER ) ), + aMtrBorder ( this, CUI_RES( MTR_BORDER ) ), + aFtColorFrom ( this, CUI_RES( FT_COLOR_FROM ) ), aLbColorFrom ( this, CUI_RES( LB_COLOR_FROM ) ), aMtrColorFrom ( this, CUI_RES( MTR_COLOR_FROM ) ), aFtColorTo ( this, CUI_RES( FT_COLOR_TO ) ), @@ -91,11 +91,11 @@ SvxGradientTabPage::SvxGradientTabPage aMtrColorTo ( this, CUI_RES( MTR_COLOR_TO ) ), aLbGradients ( this, CUI_RES( LB_GRADIENTS ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), @@ -218,8 +218,8 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pGradientList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pGradientList->GetPath() ); aURL.Append( pGradientList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -338,9 +338,9 @@ BOOL SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { // CheckChanges(); <-- doppelte Abfrage ? - XGradient* pXGradient = NULL; - String aString; - USHORT nPos = aLbGradients.GetSelectEntryPos(); + XGradient* pXGradient = NULL; + String aString; + USHORT nPos = aLbGradients.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXGradient = new XGradient( pGradientList->GetGradient( nPos )->GetGradient() ); @@ -513,7 +513,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbGradients.GetPosPixel(), aLbGradients.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbGradients.Invalidate(); @@ -771,8 +771,8 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 3ff6cb8134be..4d14a8558174 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -62,7 +62,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Schraffuren +|* Dialog zum Aendern und Definieren der Schraffuren |* \************************************************************************/ @@ -72,26 +72,26 @@ SvxHatchTabPage::SvxHatchTabPage const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ), aFtDistance ( this, CUI_RES( FT_LINE_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), - aFtAngle ( this, CUI_RES( FT_LINE_ANGLE ) ), - aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), - aCtlAngle ( this, CUI_RES( CTL_ANGLE ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aFtAngle ( this, CUI_RES( FT_LINE_ANGLE ) ), + aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), + aCtlAngle ( this, CUI_RES( CTL_ANGLE ), RP_RB, 200, 80, CS_ANGLE ), aFlProp ( this, CUI_RES( FL_PROP ) ), - aFtLineType ( this, CUI_RES( FT_LINE_TYPE ) ), - aLbLineType ( this, CUI_RES( LB_LINE_TYPE ) ), - aFtLineColor ( this, CUI_RES( FT_LINE_COLOR ) ), - aLbLineColor ( this, CUI_RES( LB_LINE_COLOR ) ), - aLbHatchings ( this, CUI_RES( LB_HATCHINGS ) ), - aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aFtLineType ( this, CUI_RES( FT_LINE_TYPE ) ), + aLbLineType ( this, CUI_RES( LB_LINE_TYPE ) ), + aFtLineColor ( this, CUI_RES( FT_LINE_COLOR ) ), + aLbLineColor ( this, CUI_RES( LB_LINE_COLOR ) ), + aLbHatchings ( this, CUI_RES( LB_HATCHINGS ) ), + aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -202,8 +202,8 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pHatchingList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pHatchingList->GetPath() ); aURL.Append( pHatchingList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -251,9 +251,9 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) long SvxHatchTabPage::CheckChanges_Impl() { - if( aMtrDistance.GetText() != aMtrDistance.GetSavedValue() || - aMtrAngle.GetText() != aMtrAngle.GetSavedValue() || - aLbLineType.GetSelectEntryPos() != aLbLineType.GetSavedValue() || + if( aMtrDistance.GetText() != aMtrDistance.GetSavedValue() || + aMtrAngle.GetText() != aMtrAngle.GetSavedValue() || + aLbLineType.GetSelectEntryPos() != aLbLineType.GetSavedValue() || aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() || aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() ) { @@ -311,9 +311,9 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { // CheckChanges(); <-- doppelte Abfrage ? - XHatch* pXHatch = NULL; - String aString; - USHORT nPos = aLbHatchings.GetSelectEntryPos(); + XHatch* pXHatch = NULL; + String aString; + USHORT nPos = aLbHatchings.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() ); @@ -572,7 +572,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbHatchings.GetPosPixel(), aLbHatchings.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbHatchings.Invalidate(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 024de010e4db..2b48ff26dcc3 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include <svx/svdmodel.hxx> #include "svx/svxgrahicitem.hxx" #include <sfx2/request.hxx> -#include "svx/ofaitem.hxx" +#include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdmodel.hxx> @@ -69,7 +69,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#define MAX_BMP_WIDTH 16 +#define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 // define ---------------------------------------------------------------- @@ -92,7 +92,7 @@ static USHORT pLineRanges[] = /************************************************************************* |* -|* Dialog zum Aendern der Linien +|* Dialog zum Aendern der Linien |* \************************************************************************/ @@ -101,7 +101,7 @@ SvxLineTabPage::SvxLineTabPage Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ), aFtLineStyle ( this, CUI_RES( FT_LINE_STYLE ) ), aLbLineStyle ( this, CUI_RES( LB_LINE_STYLE ) ), aFtColor ( this, CUI_RES( FT_COLOR ) ), @@ -123,26 +123,26 @@ SvxLineTabPage::SvxLineTabPage aFlLineEnds ( this, CUI_RES( FL_LINE_ENDS ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), aFLSeparator ( this, CUI_RES( FL_SEPARATOR ) ), - + // #116827# maFLEdgeStyle ( this, CUI_RES( FL_EDGE_STYLE ) ), maFTEdgeStyle ( this, CUI_RES( FT_EDGE_STYLE ) ), maLBEdgeStyle ( this, CUI_RES( LB_EDGE_STYLE ) ), - + pSymbolList(NULL), bNewSize(false), nNumMenuGalleryItems(0), nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged pSymbolAttr(NULL), - //#58425# Symbole auf einer Linie (z.B. StarChart) + //#58425# Symbole auf einer Linie (z.B. StarChart) aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)), aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)), aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)), - aSymbolWidthMF ( this, CUI_RES(MF_SYMBOL_WIDTH)), - aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)), - aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)), + aSymbolWidthMF ( this, CUI_RES(MF_SYMBOL_WIDTH)), + aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)), + aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)), aSymbolRatioCB ( this, CUI_RES(CB_SYMBOL_RATIO)), - + bLastWidthModified(FALSE), aSymbolLastSize(Size(0,0)), bSymbols(FALSE), @@ -343,7 +343,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) // SelectStyleHdl_Impl( this ); } - INetURLObject aDashURL( pDashList->GetPath() ); + INetURLObject aDashURL( pDashList->GetPath() ); aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -474,8 +474,8 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; - USHORT nPos; - BOOL bModified = FALSE; + USHORT nPos; + BOOL bModified = FALSE; // Um evtl. Modifikationen der Liste vorzubeugen // werden Items anderer Seiten nicht gesetzt @@ -485,7 +485,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLineStyle.GetSavedValue() ) { - XLineStyleItem* pStyleItem = NULL; + XLineStyleItem* pStyleItem = NULL; if( nPos == 0 ) pStyleItem = new XLineStyleItem( XLINE_NONE ); @@ -859,8 +859,8 @@ BOOL SvxLineTabPage::FillXLSet_Impl() void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { - String aString; - XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH + String aString; + XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH // Linienstil const SfxPoolItem *pPoolItem; @@ -1172,10 +1172,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) else aMtrTransparent.SetText( String() ); - if( !aLbStartStyle.IsEnabled() && - !aLbEndStyle.IsEnabled() && + if( !aLbStartStyle.IsEnabled() && + !aLbEndStyle.IsEnabled() && !aMtrStartWidth.IsEnabled() && - !aMtrEndWidth.IsEnabled() && + !aMtrEndWidth.IsEnabled() && !aTsbCenterStart.IsEnabled()&& !aTsbCenterEnd.IsEnabled() ) { @@ -1244,7 +1244,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxLineTabPage::GetRanges() +USHORT* SvxLineTabPage::GetRanges() { return( pLineRanges ); } @@ -1740,7 +1740,7 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit ); nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MAP_100TH_MM,(MapUnit)ePoolUnit); aSymbolSize=Size(nWidthVal,nHeightVal); - double fSizeRatio = (double)1; + double fSizeRatio = (double)1; if(bRatio) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4aeb0959456e..48471ae74e6d 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -65,7 +65,7 @@ /************************************************************************* |* -|* Dialog zum Definieren von Linienstilen +|* Dialog zum Definieren von Linienstilen |* \************************************************************************/ @@ -81,22 +81,22 @@ SvxLineDefTabPage::SvxLineDefTabPage aFTLinestyle ( this, CUI_RES( FT_LINESTYLE ) ), aLbLineStyles ( this, CUI_RES( LB_LINESTYLES ) ), aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ), - aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ), - aFtNumber ( this, CUI_RES( FT_NUMBER ) ), - aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ), - aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ), + aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ), + aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ), + aFtNumber ( this, CUI_RES( FT_NUMBER ) ), + aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ), + aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ), aFtLength ( this, CUI_RES( FT_LENGTH ) ), aMtrLength1 ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ), aMtrLength2 ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ), aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ), aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), rOutAttrs ( rInAttrs ), @@ -204,13 +204,13 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pDashList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pDashList->GetPath() ); aURL.Append( pDashList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* if ( aURL.getBase().Len() > 18 ) +/* if ( aURL.getBase().Len() > 18 ) { aString += aURL.getBase().Copy( 0, 15 ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); @@ -245,13 +245,13 @@ void SvxLineDefTabPage::CheckChanges_Impl() // wird hier benutzt, um Aenderungen NICHT zu verlieren //XDashStyle eXDS; - if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() || - aMtrLength1.GetText() != aMtrLength1.GetSavedValue() || + if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() || + aMtrLength1.GetText() != aMtrLength1.GetSavedValue() || aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() || - aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() || - aMtrLength2.GetText() != aMtrLength2.GetSavedValue() || + aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() || + aMtrLength2.GetText() != aMtrLength2.GetSavedValue() || aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() || - aMtrDistance.GetText() != aMtrDistance.GetSavedValue() ) + aMtrDistance.GetText() != aMtrDistance.GetSavedValue() ) { ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); @@ -820,7 +820,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pDashList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -898,7 +898,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pDashList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -934,7 +934,7 @@ void SvxLineDefTabPage::FillDash_Impl() { XDashStyle eXDS; -/* Alle Stile werden z.Z. nicht benutzt +/* Alle Stile werden z.Z. nicht benutzt if( aRbtEnds1.IsChecked() ) eXDS = XDASH_ROUND; else if( aRbtEnds2.IsChecked() ) diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 68cbc76aa7a0..749e83f12e21 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ /************************************************************************* |* -|* Dialog zum Definieren von Linienenden-Stilen +|* Dialog zum Definieren von Linienenden-Stilen |* \************************************************************************/ @@ -90,7 +90,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aFiTip ( this, CUI_RES( FI_TIP ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), @@ -186,13 +186,13 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) aLbLineEnds.SelectEntryPos( *pPosLineEndLb ); SelectLineEndHdl_Impl( this ); } - INetURLObject aURL( pLineEndList->GetPath() ); + INetURLObject aURL( pLineEndList->GetPath() ); aURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); if ( aURL.getBase().Len() > 18 ) { @@ -629,7 +629,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pLineEndList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -694,8 +694,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); @@ -705,7 +705,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pLineEndList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index bf615350c5c8..e57c19c874f5 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,26 +66,26 @@ static USHORT pShadowRanges[] = /************************************************************************* |* -|* Dialog zum Aendern des Schattens +|* Dialog zum Aendern des Schattens |* \************************************************************************/ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aTsbShowShadow ( this, CUI_RES( TSB_SHOW_SHADOW ) ), aFtPosition ( this, CUI_RES( FT_POSITION ) ), aCtlPosition ( this, CUI_RES( CTL_POSITION ) ), - aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), - aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), - aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), + aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), + aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ), aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), - rOutAttrs ( rInAttrs ), + rOutAttrs ( rInAttrs ), pColorTab( NULL ), bDisable ( FALSE ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), @@ -279,8 +279,8 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { - const SfxPoolItem* pOld = NULL; - BOOL bModified = FALSE; + const SfxPoolItem* pOld = NULL; + BOOL bModified = FALSE; if( !bDisable ) { @@ -305,14 +305,14 @@ BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) switch( aCtlPosition.GetActualRP() ) { - case RP_LT: nX = nY = -nXY; break; - case RP_MT: nY = -nXY; break; + case RP_LT: nX = nY = -nXY; break; + case RP_MT: nY = -nXY; break; case RP_RT: nX = nXY; nY = -nXY; break; - case RP_LM: nX = -nXY; break; - case RP_RM: nX = nXY; break; + case RP_LM: nX = -nXY; break; + case RP_RM: nX = nXY; break; case RP_LB: nX = -nXY; nY = nXY; break; - case RP_MB: nY = nXY; break; - case RP_RB: nX = nY = nXY; break; + case RP_MB: nY = nXY; break; + case RP_RB: nX = nY = nXY; break; case RP_MM: break; } @@ -425,7 +425,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) SetMetricValue( aMtrDistance, nY < 0L ? -nY : nY, ePoolUnit ); // Setzen des Schatten-Controls - if ( nX < 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_LT ); + if ( nX < 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_LT ); else if( nX == 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_MT ); else if( nX > 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_RT ); else if( nX < 0L && nY == 0L ) aCtlPosition.SetActualRP( RP_LM ); @@ -502,7 +502,7 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxShadowTabPage::GetRanges() +USHORT* SvxShadowTabPage::GetRanges() { return( pShadowRanges ); } @@ -564,14 +564,14 @@ IMPL_LINK( SvxShadowTabPage, ModifyShadowHdl_Impl, void *, EMPTYARG ) INT32 nXY = GetCoreValue( aMtrDistance, ePoolUnit ); switch( aCtlPosition.GetActualRP() ) { - case RP_LT: nX = nY = -nXY; break; - case RP_MT: nY = -nXY; break; + case RP_LT: nX = nY = -nXY; break; + case RP_MT: nY = -nXY; break; case RP_RT: nX = nXY; nY = -nXY; break; - case RP_LM: nX = -nXY; break; - case RP_RM: nX = nXY; break; + case RP_LM: nX = -nXY; break; + case RP_RM: nX = nXY; break; case RP_LB: nX = -nXY; nY = nXY; break; - case RP_MB: nY = nXY; break; - case RP_RB: nX = nY = nXY; break; + case RP_MB: nY = nXY; break; + case RP_RB: nX = nY = nXY; break; case RP_MM: break; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 2c6b73bc2985..c54658e495e3 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,12 +132,12 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* //different positioning page in Writer if(nAnchorCtrls & 0x00ff) - { + { AddTabPage(RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage(RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_SWPOSSIZE); } @@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) SvxPositionSizeTabPage& rSvxPos = static_cast<SvxPositionSizeTabPage&>(rPage); rSvxPos.SetView(pView); rSvxPos.Construct(); - + if(nAnchorCtrls & SVX_OBJ_NORESIZE) { rSvxPos.DisableResize(); @@ -174,7 +174,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxPos.DisableProtect(); rSvxPos.UpdateControlStates(); } - + break; } case RID_SVXPAGE_SWPOSSIZE : @@ -194,7 +194,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxAng.SetView( pView ); rSvxAng.Construct(); - + break; } @@ -226,18 +226,18 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ), - aFlPosition ( this, CUI_RES( FL_POSITION ) ), + aFlPosition ( this, CUI_RES( FL_POSITION ) ), aFtPosX ( this, CUI_RES( FT_POS_X ) ), aMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), aFtPosY ( this, CUI_RES( FT_POS_Y ) ), aMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), - aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), + aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), aCtlRect ( this, CUI_RES( CTL_RECT ) ), - + aFlAngle ( this, CUI_RES( FL_ANGLE ) ), aFtAngle ( this, CUI_RES( FT_ANGLE ) ), aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), - aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), + aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), aCtlAngle ( this, CUI_RES( CTL_ANGLE ), RP_RB, 200, 80, CS_ANGLE ), rOutAttrs ( rInAttrs ) @@ -707,34 +707,34 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ), - maFlPosition ( this, CUI_RES( FL_POSITION ) ), - maFtPosX ( this, CUI_RES( FT_POS_X ) ), - maMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), - maFtPosY ( this, CUI_RES( FT_POS_Y ) ), - maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), + maFlPosition ( this, CUI_RES( FL_POSITION ) ), + maFtPosX ( this, CUI_RES( FT_POS_X ) ), + maMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), + maFtPosY ( this, CUI_RES( FT_POS_Y ) ), + maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), maFtPosReference ( this, CUI_RES( FT_POSREFERENCE ) ), maCtlPos ( this, CUI_RES( CTL_POSRECT ), RP_LT ), - + maFlSize ( this, CUI_RES( FL_SIZE ) ), maFtWidth ( this, CUI_RES( FT_WIDTH ) ), maMtrWidth ( this, CUI_RES( MTR_FLD_WIDTH ) ), maFtHeight ( this, CUI_RES( FT_HEIGHT ) ), maMtrHeight ( this, CUI_RES( MTR_FLD_HEIGHT ) ), maCbxScale ( this, CUI_RES( CBX_SCALE ) ), - maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), + maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), maCtlSize ( this, CUI_RES( CTL_SIZERECT ), RP_LT ), - + maFlProtect ( this, CUI_RES( FL_PROTECT) ), maTsbPosProtect ( this, CUI_RES( TSB_POSPROTECT ) ), maTsbSizeProtect ( this, CUI_RES( TSB_SIZEPROTECT ) ), - + maFlAdjust ( this, CUI_RES( FL_ADJUST ) ), - maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), - maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), - - maFlDivider (this, CUI_RES( FL_DIVIDER ) ), + maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), + maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), + maFlDivider (this, CUI_RES( FL_DIVIDER ) ), + mrOutAttrs ( rInAttrs ), mnProtectSizeState( STATE_NOCHECK ), mbPageDisabled ( FALSE ), @@ -830,7 +830,7 @@ void SvxPositionSizeTabPage::Construct() } } - // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE + // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE if(1 == rMarkList.GetMarkCount()) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -1622,7 +1622,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) { sal_Int64 nHeight(basegfx::fround64((mfOldHeight * (double)maMtrWidth.GetValue()) / mfOldWidth)); - + if(nHeight <= maMtrHeight.GetMax(FUNIT_NONE)) { maMtrHeight.SetUserValue(nHeight, FUNIT_NONE); @@ -1631,7 +1631,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) { nHeight = maMtrHeight.GetMax(FUNIT_NONE); maMtrHeight.SetUserValue(nHeight); - + const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * (double)nHeight) / mfOldHeight)); maMtrWidth.SetUserValue(nWidth, FUNIT_NONE); } diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc index 2d57b7208f68..28d81fa62355 100644 --- a/cui/source/tabpages/transfrm.hrc +++ b/cui/source/tabpages/transfrm.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,53 +24,53 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_CONTROL 1 -#define BTN_OK 2 -#define BTN_CANCEL 3 -#define BTN_HELP 4 -#define FT_POS_X 5 -#define FT_POS_Y 6 -#define MTR_FLD_POS_X 7 -#define MTR_FLD_POS_Y 8 -#define CBX_COPY 9 -#define TSB_PROTECT 10 -#define TSB_AUTO 11 -#define TSB_AUTOGROW_HEIGHT 12 -#define TSB_AUTOGROW_WIDTH 13 -#define BTN_RESET 14 -#define FT_WIDTH 15 -#define FT_HEIGHT 16 -#define MTR_FLD_WIDTH 17 -#define MTR_FLD_HEIGHT 18 -#define MTR_FLD_ANGLE 19 -#define CTL_RECT 20 -#define CTL_ANGLE 21 -#define CBX_SCALE 22 -#define FL_ADJUST 23 -#define FL_POSITION 24 -#define FL_SIZE 25 -#define FL_SLANT 26 -#define FL_RADIUS 27 -#define FT_RADIUS 28 -#define MTR_FLD_RADIUS 29 -#define FL_ANGLE 30 -#define FT_ANGLE 31 -#define TSB_VERTICAL 32 -#define FL_ANCHOR 33 -#define FT_ANCHOR 34 -#define LB_ANCHOR 35 -#define FT_ORIENT 36 -#define FT_REFERENCE 37 -#define FT_POSPRESETS 38 -#define FT_ANGLEPRESETS 39 -#define LB_ORIENT 40 -#define FT_SIZEREFERENCE 41 -#define CTL_SIZERECT 42 -#define FT_POSREFERENCE 43 -#define CTL_POSRECT 44 -#define TSB_POSPROTECT 45 -#define TSB_SIZEPROTECT 46 -#define FL_PROTECT 47 -#define FL_DIVIDER 48 +#define TAB_CONTROL 1 +#define BTN_OK 2 +#define BTN_CANCEL 3 +#define BTN_HELP 4 +#define FT_POS_X 5 +#define FT_POS_Y 6 +#define MTR_FLD_POS_X 7 +#define MTR_FLD_POS_Y 8 +#define CBX_COPY 9 +#define TSB_PROTECT 10 +#define TSB_AUTO 11 +#define TSB_AUTOGROW_HEIGHT 12 +#define TSB_AUTOGROW_WIDTH 13 +#define BTN_RESET 14 +#define FT_WIDTH 15 +#define FT_HEIGHT 16 +#define MTR_FLD_WIDTH 17 +#define MTR_FLD_HEIGHT 18 +#define MTR_FLD_ANGLE 19 +#define CTL_RECT 20 +#define CTL_ANGLE 21 +#define CBX_SCALE 22 +#define FL_ADJUST 23 +#define FL_POSITION 24 +#define FL_SIZE 25 +#define FL_SLANT 26 +#define FL_RADIUS 27 +#define FT_RADIUS 28 +#define MTR_FLD_RADIUS 29 +#define FL_ANGLE 30 +#define FT_ANGLE 31 +#define TSB_VERTICAL 32 +#define FL_ANCHOR 33 +#define FT_ANCHOR 34 +#define LB_ANCHOR 35 +#define FT_ORIENT 36 +#define FT_REFERENCE 37 +#define FT_POSPRESETS 38 +#define FT_ANGLEPRESETS 39 +#define LB_ORIENT 40 +#define FT_SIZEREFERENCE 41 +#define CTL_SIZERECT 42 +#define FT_POSREFERENCE 43 +#define CTL_POSRECT 44 +#define TSB_POSPROTECT 45 +#define TSB_SIZEPROTECT 46 +#define FL_PROTECT 47 +#define FL_DIVIDER 48 // diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src index 761fdcfb2349..5e57d5742344 100644 --- a/cui/source/tabpages/transfrm.src +++ b/cui/source/tabpages/transfrm.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/cui/util/hidother.src b/cui/util/hidother.src index 258d6404f19a..d5299d854fa5 100644 --- a/cui/util/hidother.src +++ b/cui/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #include "../source/inc/helpid.hrc" // HID_XXX -hidspecial HID_AUTOCORR_LANGUAGE { HelpId = HID_AUTOCORR_LANGUAGE; }; +hidspecial HID_AUTOCORR_LANGUAGE { HelpId = HID_AUTOCORR_LANGUAGE; }; hidspecial HID_CLB_EDIT_MODULES_DICS { HelpID = HID_CLB_EDIT_MODULES_DICS ;}; hidspecial HID_CLB_EDIT_MODULES_MODULES { HelpID = HID_CLB_EDIT_MODULES_MODULES ;}; hidspecial HID_CLB_LINGU_MODULES { HelpID = HID_CLB_LINGU_MODULES ;}; |