diff options
Diffstat (limited to 'cui/source/tabpages/tpline.cxx')
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
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) { |