Skip to content

C
core
Kaydet (Commit) 0d20725f authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

remove whitespace 

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