remove whitespace

Change-Id: Iae0f6b9818f84a92c46b24f90d3051c7b6a45d94
This commit is contained in:
Markus Mohrhard
2014-06-04 05:45:21 +02:00
parent 41a1f95abe
commit 0d20725fcc

View File

@@ -62,14 +62,6 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
// ColorListBox
// - ImplColorListData -
class ImplColorListData class ImplColorListData
{ {
public: public:
@@ -80,8 +72,6 @@ public:
ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; } ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; }
}; };
void ColorListBox::ImplInit() void ColorListBox::ImplInit()
{ {
pColorList = new ImpColorList(); pColorList = new ImpColorList();
@@ -92,8 +82,6 @@ void ColorListBox::ImplInit()
SetUserItemSize( aImageSize ); SetUserItemSize( aImageSize );
} }
void ColorListBox::ImplDestroyColorEntries() void ColorListBox::ImplDestroyColorEntries()
{ {
for ( size_t n = pColorList->size(); n; ) for ( size_t n = pColorList->size(); n; )
@@ -101,8 +89,6 @@ void ColorListBox::ImplDestroyColorEntries()
pColorList->clear(); pColorList->clear();
} }
ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) : ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) :
ListBox( pParent, nWinStyle ) ListBox( pParent, nWinStyle )
{ {
@@ -110,8 +96,6 @@ ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) :
SetEdgeBlending(true); SetEdgeBlending(true);
} }
ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) : ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) :
ListBox( pParent, rResId ) ListBox( pParent, rResId )
{ {
@@ -131,16 +115,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParen
return pListBox; return pListBox;
} }
ColorListBox::~ColorListBox() ColorListBox::~ColorListBox()
{ {
ImplDestroyColorEntries(); ImplDestroyColorEntries();
delete pColorList; delete pColorList;
} }
sal_Int32 ColorListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos ) sal_Int32 ColorListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos )
{ {
nPos = ListBox::InsertEntry( rStr, nPos ); nPos = ListBox::InsertEntry( rStr, nPos );
@@ -162,8 +142,6 @@ sal_Int32 ColorListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos )
return nPos; return nPos;
} }
sal_Int32 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr, sal_Int32 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr,
sal_Int32 nPos ) sal_Int32 nPos )
{ {
@@ -186,16 +164,12 @@ sal_Int32 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr,
return nPos; return nPos;
} }
void ColorListBox::InsertAutomaticEntryColor(const Color &rColor) void ColorListBox::InsertAutomaticEntryColor(const Color &rColor)
{ {
// insert the "Automatic"-entry always on the first position // insert the "Automatic"-entry always on the first position
InsertEntry( rColor, SVT_RESSTR(STR_SVT_AUTOMATIC_COLOR), 0 ); InsertEntry( rColor, SVT_RESSTR(STR_SVT_AUTOMATIC_COLOR), 0 );
} }
void ColorListBox::RemoveEntry( sal_Int32 nPos ) void ColorListBox::RemoveEntry( sal_Int32 nPos )
{ {
ListBox::RemoveEntry( nPos ); ListBox::RemoveEntry( nPos );
@@ -208,16 +182,12 @@ void ColorListBox::RemoveEntry( sal_Int32 nPos )
} }
} }
void ColorListBox::Clear() void ColorListBox::Clear()
{ {
ImplDestroyColorEntries(); ImplDestroyColorEntries();
ListBox::Clear(); ListBox::Clear();
} }
void ColorListBox::CopyEntries( const ColorListBox& rBox ) void ColorListBox::CopyEntries( const ColorListBox& rBox )
{ {
// Liste leeren // Liste leeren
@@ -245,8 +215,6 @@ void ColorListBox::CopyEntries( const ColorListBox& rBox )
} }
} }
sal_Int32 ColorListBox::GetEntryPos( const Color& rColor ) const sal_Int32 ColorListBox::GetEntryPos( const Color& rColor ) const
{ {
for( sal_Int32 n = (sal_Int32) pColorList->size(); n; ) for( sal_Int32 n = (sal_Int32) pColorList->size(); n; )
@@ -258,8 +226,6 @@ sal_Int32 ColorListBox::GetEntryPos( const Color& rColor ) const
return LISTBOX_ENTRY_NOTFOUND; return LISTBOX_ENTRY_NOTFOUND;
} }
Color ColorListBox::GetEntryColor( sal_Int32 nPos ) const Color ColorListBox::GetEntryColor( sal_Int32 nPos ) const
{ {
Color aColor; Color aColor;
@@ -270,8 +236,6 @@ Color ColorListBox::GetEntryColor( sal_Int32 nPos ) const
return aColor; return aColor;
} }
void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt ) void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt )
{ {
size_t nPos = rUDEvt.GetItemId(); size_t nPos = rUDEvt.GetItemId();
@@ -318,10 +282,6 @@ void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt )
ListBox::DrawEntry( rUDEvt, true, true, false ); ListBox::DrawEntry( rUDEvt, true, true, false );
} }
// LineListBox
BorderWidthImpl::BorderWidthImpl( sal_uInt16 nFlags, double nRate1, double nRate2, double nRateGap ): BorderWidthImpl::BorderWidthImpl( sal_uInt16 nFlags, double nRate1, double nRate2, double nRateGap ):
m_nFlags( nFlags ), m_nFlags( nFlags ),
m_nRate1( nRate1 ), m_nRate1( nRate1 ),
@@ -548,8 +508,6 @@ sal_uInt16 ImpLineListData::GetStyle( )
return m_nStyle; return m_nStyle;
} }
void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing ) void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing )
{ {
sal_uInt16 nOldAA = rDev.GetAntialiasing(); sal_uInt16 nOldAA = rDev.GetAntialiasing();
@@ -750,8 +708,6 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
} }
} }
void LineListBox::ImplInit() void LineListBox::ImplInit()
{ {
aTxtSize.Width() = GetTextWidth( OUString( " " ) ); aTxtSize.Width() = GetTextWidth( OUString( " " ) );
@@ -766,8 +722,6 @@ void LineListBox::ImplInit()
UpdatePaintLineColor(); UpdatePaintLineColor();
} }
LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) :
ListBox( pParent, nWinStyle ), ListBox( pParent, nWinStyle ),
m_nWidth( 5 ), m_nWidth( 5 ),
@@ -790,8 +744,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent
return pListBox; return pListBox;
} }
LineListBox::~LineListBox() LineListBox::~LineListBox()
{ {
for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) { for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
@@ -827,7 +779,6 @@ sal_Int32 LineListBox::GetStylePos( sal_Int32 nListPos, long nWidth )
return nPos; return nPos;
} }
void LineListBox::SelectEntry( sal_uInt16 nStyle, bool bSelect ) void LineListBox::SelectEntry( sal_uInt16 nStyle, bool bSelect )
{ {
sal_Int32 nPos = GetEntryPos( nStyle ); sal_Int32 nPos = GetEntryPos( nStyle );
@@ -835,8 +786,6 @@ void LineListBox::SelectEntry( sal_uInt16 nStyle, bool bSelect )
ListBox::SelectEntryPos( nPos, bSelect ); ListBox::SelectEntryPos( nPos, bSelect );
} }
sal_Int32 LineListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos ) sal_Int32 LineListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos )
{ {
nPos = ListBox::InsertEntry( rStr, nPos ); nPos = ListBox::InsertEntry( rStr, nPos );
@@ -852,8 +801,6 @@ sal_Int32 LineListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos )
return nPos; return nPos;
} }
void LineListBox::InsertEntry( void LineListBox::InsertEntry(
BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth, BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth,
ColorFunc pColor1Fn, ColorFunc pColor2Fn, ColorDistFunc pColorDistFn ) ColorFunc pColor1Fn, ColorFunc pColor2Fn, ColorDistFunc pColorDistFn )
@@ -863,8 +810,6 @@ void LineListBox::InsertEntry(
pLineList->push_back( pData ); pLineList->push_back( pData );
} }
void LineListBox::RemoveEntry( sal_Int32 nPos ) void LineListBox::RemoveEntry( sal_Int32 nPos )
{ {
ListBox::RemoveEntry( nPos ); ListBox::RemoveEntry( nPos );
@@ -877,8 +822,6 @@ void LineListBox::RemoveEntry( sal_Int32 nPos )
} }
} }
void LineListBox::Clear() void LineListBox::Clear()
{ {
for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) { for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
@@ -891,8 +834,6 @@ void LineListBox::Clear()
ListBox::Clear(); ListBox::Clear();
} }
sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
{ {
for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) { for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
@@ -911,16 +852,12 @@ sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
return LISTBOX_ENTRY_NOTFOUND; return LISTBOX_ENTRY_NOTFOUND;
} }
sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const
{ {
ImpLineListData* pData = (0 <= nPos && static_cast<size_t>(nPos) < pLineList->size()) ? (*pLineList)[ nPos ] : NULL; ImpLineListData* pData = (0 <= nPos && static_cast<size_t>(nPos) < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE; return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
} }
bool LineListBox::UpdatePaintLineColor( void ) bool LineListBox::UpdatePaintLineColor( void )
{ {
const StyleSettings& rSettings = GetSettings().GetStyleSettings(); const StyleSettings& rSettings = GetSettings().GetStyleSettings();
@@ -979,8 +916,6 @@ void LineListBox::UpdateEntries( long nOldWidth )
Invalidate(); Invalidate();
} }
Color LineListBox::GetColorLine1( sal_Int32 nPos ) Color LineListBox::GetColorLine1( sal_Int32 nPos )
{ {
Color rResult = GetPaintColor( ); Color rResult = GetPaintColor( );
@@ -1017,8 +952,6 @@ Color LineListBox::GetColorDist( sal_Int32 nPos )
return rResult; return rResult;
} }
void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) void LineListBox::DataChanged( const DataChangedEvent& rDCEvt )
{ {
ListBox::DataChanged( rDCEvt ); ListBox::DataChanged( rDCEvt );
@@ -1027,11 +960,6 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt )
UpdateEntries( m_nWidth ); UpdateEntries( m_nWidth );
} }
// FontNameBox
FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
ComboBox( pParent, nWinStyle ) ComboBox( pParent, nWinStyle )
{ {
@@ -1040,8 +968,6 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
InitFontMRUEntriesFile(); InitFontMRUEntriesFile();
} }
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap)
{ {
bool bDropdown = VclBuilder::extractDropdown(rMap); bool bDropdown = VclBuilder::extractDropdown(rMap);
@@ -1054,16 +980,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent
return pListBox; return pListBox;
} }
FontNameBox::~FontNameBox() FontNameBox::~FontNameBox()
{ {
SaveMRUEntries (maFontMRUEntriesFile); SaveMRUEntries (maFontMRUEntriesFile);
ImplDestroyFontList(); ImplDestroyFontList();
} }
void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const
{ {
OString aEntries(OUStringToOString(GetMRUEntries(cSep), OString aEntries(OUStringToOString(GetMRUEntries(cSep),
@@ -1087,8 +1009,6 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
aStream.WriteLine( OString() ); aStream.WriteLine( OString() );
} }
void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep )
{ {
if( aFontMRUEntriesFile.isEmpty() ) if( aFontMRUEntriesFile.isEmpty() )
@@ -1110,8 +1030,6 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
SetMRUEntries( aEntries, cSep ); SetMRUEntries( aEntries, cSep );
} }
void FontNameBox::InitFontMRUEntriesFile() void FontNameBox::InitFontMRUEntriesFile()
{ {
OUString sUserConfigDir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); OUString sUserConfigDir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}");
@@ -1124,15 +1042,11 @@ void FontNameBox::InitFontMRUEntriesFile()
} }
} }
void FontNameBox::ImplDestroyFontList() void FontNameBox::ImplDestroyFontList()
{ {
delete mpFontList; delete mpFontList;
} }
void FontNameBox::Fill( const FontList* pList ) void FontNameBox::Fill( const FontList* pList )
{ {
// store old text and clear box // store old text and clear box
@@ -1174,8 +1088,6 @@ void FontNameBox::Fill( const FontList* pList )
SetText( aOldText ); SetText( aOldText );
} }
void FontNameBox::EnableWYSIWYG( bool bEnable ) void FontNameBox::EnableWYSIWYG( bool bEnable )
{ {
if ( bEnable != mbWYSIWYG ) if ( bEnable != mbWYSIWYG )
@@ -1186,8 +1098,6 @@ void FontNameBox::EnableWYSIWYG( bool bEnable )
} }
} }
void FontNameBox::ImplCalcUserItemSize() void FontNameBox::ImplCalcUserItemSize()
{ {
Size aUserItemSz; Size aUserItemSz;
@@ -1414,8 +1324,6 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
} }
} }
// FontStyleBox
FontStyleBox::FontStyleBox(Window* pParent, WinBits nBits) FontStyleBox::FontStyleBox(Window* pParent, WinBits nBits)
: ComboBox(pParent, nBits) : ComboBox(pParent, nBits)
{ {
@@ -1456,8 +1364,6 @@ FontStyleBox::~FontStyleBox()
{ {
} }
void FontStyleBox::Select() void FontStyleBox::Select()
{ {
// keep text over fill operation // keep text over fill operation
@@ -1465,8 +1371,6 @@ void FontStyleBox::Select()
ComboBox::Select(); ComboBox::Select();
} }
void FontStyleBox::LoseFocus() void FontStyleBox::LoseFocus()
{ {
// keep text over fill operation // keep text over fill operation
@@ -1474,8 +1378,6 @@ void FontStyleBox::LoseFocus()
ComboBox::LoseFocus(); ComboBox::LoseFocus();
} }
void FontStyleBox::Modify() void FontStyleBox::Modify()
{ {
CharClass aChrCls( ::comphelper::getProcessComponentContext(), CharClass aChrCls( ::comphelper::getProcessComponentContext(),
@@ -1501,8 +1403,6 @@ void FontStyleBox::Modify()
ComboBox::Modify(); ComboBox::Modify();
} }
void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
{ {
// note: this method must call ComboBox::SetText(), // note: this method must call ComboBox::SetText(),
@@ -1642,10 +1542,6 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
} }
} }
// FontSizeBox
FontSizeBox::FontSizeBox( Window* pParent, WinBits nWinSize ) : FontSizeBox::FontSizeBox( Window* pParent, WinBits nWinSize ) :
MetricBox( pParent, nWinSize ) MetricBox( pParent, nWinSize )
{ {
@@ -1664,14 +1560,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent
return pListBox; return pListBox;
} }
FontSizeBox::~FontSizeBox() FontSizeBox::~FontSizeBox()
{ {
} }
void FontSizeBox::ImplInit() void FontSizeBox::ImplInit()
{ {
EnableAutocomplete( false ); EnableAutocomplete( false );
@@ -1689,8 +1581,6 @@ void FontSizeBox::ImplInit()
SetProminentEntryType( PROMINENT_MIDDLE ); SetProminentEntryType( PROMINENT_MIDDLE );
} }
void FontSizeBox::Reformat() void FontSizeBox::Reformat()
{ {
FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() ); FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
@@ -1707,8 +1597,6 @@ void FontSizeBox::Reformat()
MetricBox::Reformat(); MetricBox::Reformat();
} }
void FontSizeBox::Modify() void FontSizeBox::Modify()
{ {
MetricBox::Modify(); MetricBox::Modify();
@@ -1761,8 +1649,6 @@ void FontSizeBox::Modify()
} }
} }
void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
{ {
// remember for relative mode // remember for relative mode
@@ -1851,8 +1737,6 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
SetSelection( aSelection ); SetSelection( aSelection );
} }
void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep )
{ {
bRelativeMode = true; bRelativeMode = true;
@@ -1862,8 +1746,6 @@ void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt
SetUnit( FUNIT_POINT ); SetUnit( FUNIT_POINT );
} }
void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep ) void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep )
{ {
bRelativeMode = true; bRelativeMode = true;
@@ -1873,8 +1755,6 @@ void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep )
SetUnit( FUNIT_POINT ); SetUnit( FUNIT_POINT );
} }
void FontSizeBox::SetRelative( bool bNewRelative ) void FontSizeBox::SetRelative( bool bNewRelative )
{ {
if ( bRelativeMode ) if ( bRelativeMode )
@@ -1939,8 +1819,6 @@ void FontSizeBox::SetRelative( bool bNewRelative )
} }
} }
OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const
{ {
OUString sRet( MetricBox::CreateFieldText( nValue ) ); OUString sRet( MetricBox::CreateFieldText( nValue ) );
@@ -1949,8 +1827,6 @@ OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const
return sRet; return sRet;
} }
void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
{ {
if ( !bRelative ) if ( !bRelative )
@@ -1973,15 +1849,11 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
MetricBox::SetValue( nNewValue, eInUnit ); MetricBox::SetValue( nNewValue, eInUnit );
} }
void FontSizeBox::SetValue( sal_Int64 nNewValue ) void FontSizeBox::SetValue( sal_Int64 nNewValue )
{ {
SetValue( nNewValue, FUNIT_NONE ); SetValue( nNewValue, FUNIT_NONE );
} }
sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
{ {
if ( !bRelative ) if ( !bRelative )
@@ -1995,8 +1867,6 @@ sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
return MetricBox::GetValue( eOutUnit ); return MetricBox::GetValue( eOutUnit );
} }
sal_Int64 FontSizeBox::GetValue() const sal_Int64 FontSizeBox::GetValue() const
{ {
// implementation not inline, because it is a virtual function // implementation not inline, because it is a virtual function