[Libreoffice-commits] core.git: 12 commits - chart2/inc chart2/source cui/source editeng/source framework/source include/svtools include/vcl sc/source starmath/source svtools/source svx/source sw/source vcl/source vcl/workben
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Tue Jun 3 22:54:54 PDT 2014
chart2/inc/ChartView.hxx | 3
chart2/source/view/main/ChartView.cxx | 43 +++
cui/source/options/fontsubs.cxx | 2
cui/source/tabpages/chardlg.cxx | 18 -
cui/source/tabpages/numpages.cxx | 2
editeng/source/editeng/editview.cxx | 2
framework/source/uielement/fontsizemenucontroller.cxx | 2
include/svtools/ctrlbox.hxx | 29 --
include/svtools/ctrltool.hxx | 45 +---
include/svtools/stdmenu.hxx | 14 -
include/vcl/metric.hxx | 20 -
include/vcl/outdev.hxx | 7
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/xml/xmldpimp.cxx | 2
starmath/source/dialog.cxx | 2
svtools/source/control/ctrlbox.cxx | 140 ------------
svtools/source/control/ctrltool.cxx | 94 +-------
svtools/source/control/stdmenu.cxx | 27 --
svx/source/mnuctrls/fntszctl.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 44 ++--
svx/source/tbxctrls/tbcontrl.cxx | 198 ------------------
svx/source/tbxctrls/tbunocontroller.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/unocore/unostyle.cxx | 2
sw/source/filter/html/svxcss1.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/ui/config/optpage.cxx | 6
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/uibase/docvw/srcedtw.cxx | 2
vcl/source/gdi/metric.cxx | 12 -
vcl/source/outdev/font.cxx | 6
vcl/workben/svptest.cxx | 2
34 files changed, 170 insertions(+), 572 deletions(-)
New commits:
commit f634cda2a26aba91277738f2c6f09405a2bf915c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 07:48:15 2014 +0200
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 868c6e1..efe9f71 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -326,7 +326,7 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
for(sal_uInt16 nFont = 0; nFont < nFontCount; nFont++)
{
- const FontInfo& rInfo = aFntLst.GetFontName( nFont );
+ const vcl::FontInfo& rInfo = aFntLst.GetFontName( nFont );
if(!bNonPropOnly || rInfo.GetPitch() == PITCH_FIXED)
m_pFontNameLB->InsertEntry(rInfo.GetName());
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f36ae8e..85e6d76 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -435,7 +435,7 @@ const FontList* SvxCharNamePage::GetFontList() const
namespace
{
- FontInfo calcFontInfo( SvxFont& _rFont,
+ vcl::FontInfo calcFontInfo( SvxFont& _rFont,
SvxCharNamePage* _pPage,
const FontNameBox* _pFontNameLB,
const FontStyleBox* _pFontStyleLB,
@@ -447,7 +447,7 @@ namespace
{
Size aSize = _rFont.GetSize();
aSize.Width() = 0;
- FontInfo aFontInfo;
+ vcl::FontInfo aFontInfo;
OUString sFontName(_pFontNameLB->GetText());
bool bFontAvailable = _pFontList->IsAvailable( sFontName );
if (bFontAvailable || _pFontNameLB->IsValueChangedFromSaved())
@@ -520,19 +520,19 @@ void SvxCharNamePage::UpdatePreview_Impl()
// Font
const FontList* pFontList = GetFontList();
- FontInfo aWestFontInfo = calcFontInfo(rFont, this, m_pWestFontNameLB,
+ vcl::FontInfo aWestFontInfo = calcFontInfo(rFont, this, m_pWestFontNameLB,
m_pWestFontStyleLB, m_pWestFontSizeLB, m_pWestFontLanguageLB,
pFontList, GetWhich(SID_ATTR_CHAR_FONT),
GetWhich(SID_ATTR_CHAR_FONTHEIGHT));
m_pWestFontTypeFT->SetText(pFontList->GetFontMapText(aWestFontInfo));
- FontInfo aEastFontInfo = calcFontInfo(rCJKFont, this, m_pEastFontNameLB,
+ vcl::FontInfo aEastFontInfo = calcFontInfo(rCJKFont, this, m_pEastFontNameLB,
m_pEastFontStyleLB, m_pEastFontSizeLB, m_pEastFontLanguageLB,
pFontList, GetWhich(SID_ATTR_CHAR_CJK_FONT),
GetWhich(SID_ATTR_CHAR_CJK_FONTHEIGHT));
m_pEastFontTypeFT->SetText(pFontList->GetFontMapText(aEastFontInfo));
- FontInfo aCTLFontInfo = calcFontInfo(rCTLFont,
+ vcl::FontInfo aCTLFontInfo = calcFontInfo(rCTLFont,
this, m_pCTLFontNameLB, m_pCTLFontStyleLB, m_pCTLFontSizeLB,
m_pCTLFontLanguageLB, pFontList, GetWhich(SID_ATTR_CHAR_CTL_FONT),
GetWhich(SID_ATTR_CHAR_CTL_FONTHEIGHT));
@@ -609,7 +609,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
return;
}
- FontInfo _aFontInfo( pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) );
+ vcl::FontInfo _aFontInfo( pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) );
pSizeBox->Fill( &_aFontInfo, pFontList );
}
@@ -720,7 +720,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
// currently chosen font
if ( bStyle && pFontItem )
{
- FontInfo aInfo = pFontList->Get( pFontItem->GetFamilyName(), eWeight, eItalic );
+ vcl::FontInfo aInfo = pFontList->Get( pFontItem->GetFamilyName(), eWeight, eItalic );
pStyleBox->SetText( pFontList->GetStyleName( aInfo ) );
}
else if ( !m_pImpl->m_bInSearchMode || !bStyle )
@@ -729,7 +729,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
}
else if ( bStyle )
{
- FontInfo aInfo = pFontList->Get( OUString(), eWeight, eItalic );
+ vcl::FontInfo aInfo = pFontList->Get( OUString(), eWeight, eItalic );
pStyleBox->SetText( pFontList->GetStyleName( aInfo ) );
}
if (!bStyleAvailable)
@@ -891,7 +891,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
sal_Int32 nEntryPos = pStyleBox->GetEntryPos( aStyleBoxText );
if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
aStyleBoxText = "";
- FontInfo aInfo( pFontList->Get( rFontName, aStyleBoxText ) );
+ vcl::FontInfo aInfo( pFontList->Get( rFontName, aStyleBoxText ) );
SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetName(), aInfo.GetStyleName(),
aInfo.GetPitch(), aInfo.GetCharSet(), nWhich );
pOld = GetOldItem( rSet, nSlot );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7091120..c57db72 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -710,7 +710,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
}
if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
{
- FontInfo aInfo = pList->Get(
+ vcl::FontInfo aInfo = pList->Get(
pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index b363d1f..9721217 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1184,7 +1184,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
const SfxMapUnit eUnit = rSet.GetPool()->GetMetric( *pWhich );
nHeight = OutputDevice::LogicToLogic( nHeight * 10, (MapUnit)eUnit, MAP_POINT );
- FontInfo aFontInfo = pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() );
+ vcl::FontInfo aFontInfo = pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() );
const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontInfo );
if( bGrow )
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index d530931..63cb6ad 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -152,7 +152,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
if ( !pFontList )
pFontList.reset(new FontList( Application::GetDefaultDevice() ));
- FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName );
+ vcl::FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName );
// setup font size array
if ( m_pHeightArray )
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index d206a91..5d72814 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -37,7 +37,7 @@ class ImpLineListData;
typedef ::std::vector< ImplColorListData* > ImpColorList;
typedef ::std::vector< ImpLineListData* > ImpLineList;
-typedef ::std::vector< FontInfo > ImplFontList;
+typedef ::std::vector< vcl::FontInfo > ImplFontList;
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
#define CHANGE_LINE2 ( ( sal_uInt16 ) 2 )
@@ -457,7 +457,7 @@ inline void FontStyleBox::SetText( const OUString& rText )
class SVT_DLLPUBLIC FontSizeBox : public MetricBox
{
- FontInfo aFontInfo;
+ vcl::FontInfo aFontInfo;
const FontList* pFontList;
sal_uInt16 nRelMin;
sal_uInt16 nRelMax;
@@ -483,7 +483,7 @@ public:
void Reformat() SAL_OVERRIDE;
void Modify() SAL_OVERRIDE;
- void Fill( const FontInfo* pInfo, const FontList* pList );
+ void Fill( const vcl::FontInfo* pInfo, const FontList* pList );
void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
sal_uInt16 nStep = 5 );
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index b55419d..a28ff1d 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -71,28 +71,28 @@ With sal_False vectorized and scalable fonts will be queried.
--------------------------------------------------------------------------
-String FontList::GetStyleName( const FontInfo& rInfo ) const;
+String FontList::GetStyleName( const vcl::FontInfo& rInfo ) const;
-This method returns the StyleName of a FontInfo.
+This method returns the StyleName of a vcl::FontInfo.
If no StyleName is set, a name will be generated from the set attributes.
--------------------------------------------------------------------------
-OUString FontList::GetFontMapText( const FontInfo& rInfo ) const;
+OUString FontList::GetFontMapText( const vcl::FontInfo& rInfo ) const;
This method returns a Matchstring which indicates the problem that could
arise when using a font. This string should be displayed to the user.
--------------------------------------------------------------------------
-FontInfo FontList::Get( const String& rName, const String& rStyleName ) const;
+vcl::FontInfo FontList::Get( const String& rName, const String& rStyleName ) const;
-This method search a FontInfo for the given name and the given style name.
+This method search a vcl::FontInfo for the given name and the given style name.
The Stylename can also be a synthetic one.
-In that case the relevant FontInfo fields will be set.
-If a StyleName is provived, a FontInfo structure without a Stylename can be
+In that case the relevant vcl::FontInfo fields will be set.
+If a StyleName is provived, a vcl::FontInfo structure without a Stylename can be
returned. To get a representation of the StyleName for displaying it to the user,
-call GetStyleName() on this FontInfo structure.
+call GetStyleName() on this vcl::FontInfo structure.
Links:
@@ -100,13 +100,13 @@ FontList::GetStyleName()
--------------------------------------------------------------------------
-FontInfo FontList::Get( const String& rName, FontWeight eWeight,
+vcl::FontInfo FontList::Get( const String& rName, FontWeight eWeight,
FontItalic eItalic ) const;
-This method search a FontInfo structure for a provided name and styles.
-This method can also return a FontInfo without a Stylename.
+This method search a vcl::FontInfo structure for a provided name and styles.
+This method can also return a vcl::FontInfo without a Stylename.
To get a representation of the StyleName to be presented to the user
-call GetStyleName() with this FontInfo.
+call GetStyleName() with this vcl::FontInfo.
Links:
@@ -114,7 +114,7 @@ FontList::GetStyleName()
--------------------------------------------------------------------------
-const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const;
+const sal_IntPtr* FontList::GetSizeAry( const vcl::FontInfo& rInfo ) const;
This method returns the available sizes for the given font.
If it is a scalable font, standard sizes are returned.
@@ -168,18 +168,18 @@ public:
OutputDevice* GetDevice() const { return mpDev; }
OutputDevice* GetDevice2() const { return mpDev2; }
- OUString GetFontMapText( const FontInfo& rInfo ) const;
+ OUString GetFontMapText( const vcl::FontInfo& rInfo ) const;
const OUString& GetNormalStr() const { return maNormal; }
const OUString& GetItalicStr() const { return maNormalItalic; }
const OUString& GetBoldStr() const { return maBold; }
const OUString& GetBoldItalicStr() const { return maBoldItalic; }
const OUString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const;
- OUString GetStyleName( const FontInfo& rInfo ) const;
+ OUString GetStyleName( const vcl::FontInfo& rInfo ) const;
- FontInfo Get( const OUString& rName,
+ vcl::FontInfo Get( const OUString& rName,
const OUString& rStyleName ) const;
- FontInfo Get( const OUString& rName,
+ vcl::FontInfo Get( const OUString& rName,
FontWeight eWeight,
FontItalic eItalic ) const;
@@ -188,12 +188,12 @@ public:
{
return (sal_uInt16)maEntries.size();
}
- const FontInfo& GetFontName( sal_uInt16 nFont ) const;
+ const vcl::FontInfo& GetFontName( sal_uInt16 nFont ) const;
sal_Handle GetFirstFontInfo( const OUString& rName ) const;
sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const;
- const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const;
+ const vcl::FontInfo& GetFontInfo( sal_Handle hFontInfo ) const;
- const sal_IntPtr* GetSizeAry( const FontInfo& rInfo ) const;
+ const sal_IntPtr* GetSizeAry( const vcl::FontInfo& rInfo ) const;
static const sal_IntPtr* GetStdSizeAry();
private:
diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
index ea73bc6..7f4e9af 100644
--- a/include/svtools/stdmenu.hxx
+++ b/include/svtools/stdmenu.hxx
@@ -25,7 +25,9 @@
#include <vcl/menu.hxx>
class FontList;
-class FontInfo;
+namespace vcl {
+ class FontInfo;
+}
/*************************************************************************
@@ -137,7 +139,7 @@ public:
virtual void Select() SAL_OVERRIDE;
virtual void Highlight() SAL_OVERRIDE;
- void Fill( const FontInfo& rInfo, const FontList* pList );
+ void Fill( const vcl::FontInfo& rInfo, const FontList* pList );
void SetCurHeight( long nHeight );
long GetCurHeight() const { return mnCurHeight; }
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 10a61fb..160b9b3 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -22,18 +22,21 @@
#include <vcl/dllapi.h>
#include <vcl/font.hxx>
+#include <vcl/outdev.hxx>
class ImplFontMetric;
class ImplFontCharMap;
typedef sal_uInt32 sal_UCS4;
+namespace vcl {
+
+// avoid problems where poppler's FontInfo is picked up
class VCL_DLLPUBLIC FontInfo : public Font
{
friend class OutputDevice;
protected:
- ImplFontMetric* mpImplMetric; // Implementation
public:
FontInfo();
@@ -46,9 +49,12 @@ public:
bool operator==( const FontInfo& ) const;
bool operator!=( const FontInfo& rInfo ) const
{ return !operator==( rInfo ); }
+ ImplFontMetric* mpImplMetric; // Implementation
};
-class VCL_DLLPUBLIC FontMetric : public FontInfo
+}
+
+class VCL_DLLPUBLIC FontMetric : public vcl::FontInfo
{
public:
FontMetric() {}
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index de51dc4..1a8c676 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -81,7 +81,6 @@ class BitmapReadAccess;
class BitmapEx;
class Image;
class TextRectInfo;
-class FontInfo;
class FontMetric;
class GDIMetaFile;
class GfxLink;
@@ -230,6 +229,10 @@ class FontSelectPattern;
class ImplFontMetricData;
class VCLXGraphics;
+namespace vcl {
+ class FontInfo;
+}
+
typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl;
sal_uLong AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix );
@@ -1124,7 +1127,7 @@ private:
public:
- FontInfo GetDevFont( int nDevFontIndex ) const;
+ vcl::FontInfo GetDevFont( int nDevFontIndex ) const;
int GetDevFontCount() const;
bool IsFontAvailable( const OUString& rFontName ) const;
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index b59c987..add62f7 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -740,7 +740,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
aParaText = "&\"" + OUString(aNewData.maName);
if( pFontList )
{
- FontInfo aFontInfo( pFontList->Get(
+ vcl::FontInfo aFontInfo( pFontList->Get(
aNewData.maName,
(aNewData.mnWeight > EXC_FONTWGHT_NORMAL) ? WEIGHT_BOLD : WEIGHT_NORMAL,
aNewData.mbItalic ? ITALIC_NORMAL : ITALIC_NONE ) );
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 59ce92e..6fc2651 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -200,7 +200,7 @@ void XclImpFont::SetFontData( const XclFontData& rFontData, bool bHasCharSet )
{
if( const FontList* pFontList = pInfoItem->GetFontList() )
{
- FontInfo aFontInfo( pFontList->Get( maData.maName, maData.maStyle ) );
+ vcl::FontInfo aFontInfo( pFontList->Get( maData.maName, maData.maStyle ) );
maData.SetScWeight( aFontInfo.GetWeight() );
maData.SetScPosture( aFontInfo.GetItalic() );
}
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 6e9dfde..c329140 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2268,7 +2268,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyleName)
{
// get Font (FontInfo) matching name and style
- FontInfo aFI;
+ vcl::FontInfo aFI;
if (pFontList)
aFI = pFontList->Get(rFontName, WEIGHT_NORMAL, ITALIC_NONE);
SetFontStyle(rStyleName, aFI);
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8b44e85..4127155 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1062,7 +1062,7 @@ void FontNameBox::Fill( const FontList* pList )
sal_uInt16 nFontCount = pList->GetFontNameCount();
for ( sal_uInt16 i = 0; i < nFontCount; i++ )
{
- const FontInfo& rFontInfo = pList->GetFontName( i );
+ const vcl::FontInfo& rFontInfo = pList->GetFontName( i );
sal_uLong nIndex = InsertEntry( rFontInfo.GetName() );
if ( nIndex != LISTBOX_ERROR )
{
@@ -1138,13 +1138,11 @@ namespace
}
}
-
-
void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
{
assert( mpFontList );
- FontInfo& rInfo = (*mpFontList)[ rUDEvt.GetItemId() ];
+ vcl::FontInfo& rInfo = (*mpFontList)[ rUDEvt.GetItemId() ];
Point aTopLeft = rUDEvt.GetRect().TopLeft();
long nX = aTopLeft.X();
long nH = rUDEvt.GetRect().GetHeight();
@@ -1425,7 +1423,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
bool bBold = false;
bool bBoldItalic = false;
bool bInsert = false;
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
while ( hFontInfo )
{
aInfo = pList->GetFontInfo( hFontInfo );
@@ -1649,7 +1647,7 @@ void FontSizeBox::Modify()
}
}
-void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
+void FontSizeBox::Fill( const vcl::FontInfo* pInfo, const FontList* pList )
{
// remember for relative mode
pFontList = pList;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 431738c..4308379 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -67,7 +67,7 @@ static const sal_IntPtr aStdSizeAry[] =
0
};
-class ImplFontListFontInfo : public FontInfo
+class ImplFontListFontInfo : public vcl::FontInfo
{
friend class FontList;
@@ -76,9 +76,9 @@ private:
ImplFontListFontInfo* mpNext;
public:
- ImplFontListFontInfo( const FontInfo& rInfo,
+ ImplFontListFontInfo( const vcl::FontInfo& rInfo,
OutputDevice* pDev ) :
- FontInfo( rInfo ), mpNext(NULL)
+ vcl::FontInfo( rInfo ), mpNext(NULL)
{
mpDevice = pDev;
}
@@ -241,7 +241,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
sal_uInt16 i;
for( i = 0; i < n; i++ )
{
- FontInfo aFontInfo = pDevice->GetDevFont( i );
+ vcl::FontInfo aFontInfo = pDevice->GetDevFont( i );
// ignore raster-fonts if they are not to be displayed
if ( !bAll && (aFontInfo.GetType() == TYPE_RASTER) )
@@ -289,7 +289,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
(pNewInfo->GetCharSet() == eSystemEncoding) )
{
ImplFontListFontInfo* pTemp2 = pTemp->mpNext;
- *((FontInfo*)pTemp) = *((FontInfo*)pNewInfo);
+ *((vcl::FontInfo*)pTemp) = *((vcl::FontInfo*)pNewInfo);
pTemp->mpNext = pTemp2;
}
delete pNewInfo;
@@ -418,7 +418,7 @@ const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) c
}
}
-OUString FontList::GetStyleName(const FontInfo& rInfo) const
+OUString FontList::GetStyleName(const vcl::FontInfo& rInfo) const
{
OUString aStyleName = rInfo.GetStyleName();
FontWeight eWeight = rInfo.GetWeight();
@@ -469,7 +469,7 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const
return aStyleName;
}
-OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
+OUString FontList::GetFontMapText( const vcl::FontInfo& rInfo ) const
{
if ( rInfo.GetName().isEmpty() )
{
@@ -539,10 +539,10 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
namespace
{
- FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName,
+ vcl::FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName,
FontWeight eWeight, FontItalic eItalic)
{
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
// if the fontname matches, we copy as much as possible
if (pFontNameInfo)
{
@@ -562,7 +562,7 @@ namespace
}
}
-FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
+vcl::FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
ImplFontListFontInfo* pFontInfo = NULL;
@@ -585,7 +585,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
}
// reproduce attributes if data could not be found
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
if ( !pFontInfo )
{
FontWeight eWeight = WEIGHT_DONTKNOW;
@@ -643,7 +643,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
return aInfo;
}
-FontInfo FontList::Get(const OUString& rName,
+vcl::FontInfo FontList::Get(const OUString& rName,
FontWeight eWeight, FontItalic eItalic) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
@@ -667,7 +667,7 @@ FontInfo FontList::Get(const OUString& rName,
}
// reproduce attributes if data could not be found
- FontInfo aInfo;
+ vcl::FontInfo aInfo;
if ( !pFontInfo )
aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
else
@@ -684,7 +684,7 @@ bool FontList::IsAvailable(const OUString& rName) const
return (ImplFindByName( rName ) != 0);
}
-const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
+const vcl::FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
{
DBG_ASSERT( nFont < GetFontNameCount(), "FontList::GetFontName(): nFont >= Count" );
@@ -706,13 +706,13 @@ sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
return (sal_Handle)(pInfo->mpNext);
}
-const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
+const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
{
ImplFontListFontInfo* pInfo = (ImplFontListFontInfo*)(void*)hFontInfo;
return *pInfo;
}
-const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
+const sal_IntPtr* FontList::GetSizeAry( const vcl::FontInfo& rInfo ) const
{
// first delete Size-Array
if ( mpSizeAry )
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index d310409..860550a 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -140,7 +140,7 @@ void FontSizeMenu::Highlight()
mnCurHeight = nTempHeight;
}
-void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
+void FontSizeMenu::Fill( const vcl::FontInfo& rInfo, const FontList* pList )
{
Clear();
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index a5a9c09..2ec67f0 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -123,7 +123,7 @@ void SvxFontSizeMenuControl::StateChanged(
if ( pList )
{
- FontInfo aFntInf = pList->Get( pItem->GetFamilyName(),
+ vcl::FontInfo aFntInf = pList->Get( pItem->GetFamilyName(),
pItem->GetStyleName() );
pMenu->Fill( aFntInf, pList );
}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 21b20e7..f1ac7a0 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1780,7 +1780,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
}
if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
{
- FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
+ vcl::FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0bb8553..e0e8eb3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -934,7 +934,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
if ( rUDEvt.GetItemId() == rUDEvt.GetStyle() )
{
Sequence< PropertyValue > aArgs( 1 );
- FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ),
+ vcl::FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ),
aCurFont.GetWeight(),
aCurFont.GetItalic() ) );
@@ -960,7 +960,7 @@ void SvxFontNameBox_Impl::Select()
std::auto_ptr<SvxFontItem> pFontItem;
if ( pFontList )
{
- FontInfo aInfo( pFontList->Get( GetText(),
+ vcl::FontInfo aInfo( pFontList->Get( GetText(),
aCurFont.GetWeight(),
aCurFont.GetItalic() ) );
aCurFont = aInfo;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 3b3a9b0..02f7da9 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -207,7 +207,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
if ( !rCurrentFont.Name.isEmpty() )
{
- FontInfo _aFontInfo;
+ vcl::FontInfo _aFontInfo;
_aFontInfo.SetName( rCurrentFont.Name );
_aFontInfo.SetStyleName( rCurrentFont.StyleName );
_aFontInfo.SetHeight( rCurrentFont.Height );
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 18b0bf6..7cdfe12 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -823,7 +823,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
->GetItem( SID_ATTR_CHAR_FONTLIST );
const FontList* pList = pFontListItem->GetFontList();
- FontInfo aInfo = pList->Get(
+ vcl::FontInfo aInfo = pList->Get(
pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 29d50f9..30ceae5 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1941,7 +1941,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
(const SvxFontListItem* )pLclDocShell
->GetItem( SID_ATTR_CHAR_FONTLIST );
const FontList* pList = pFontListItem->GetFontList();
- FontInfo aInfo = pList->Get(
+ vcl::FontInfo aInfo = pList->Get(
sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index a103380..c3e94f9 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1885,7 +1885,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
(const SvxFontListItem* )pDoc->GetDocShell()
->GetItem( SID_ATTR_CHAR_FONTLIST );
const FontList* pList = pFontListItem->GetFontList();
- FontInfo aInfo = pList->Get(
+ vcl::FontInfo aInfo = pList->Get(
pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index c1d3db5..6882622 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1097,7 +1097,7 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
sal_Handle hFont = pFList->GetFirstFontInfo( aIdent );
if( 0 != hFont )
{
- const FontInfo& rFInfo = pFList->GetFontInfo( hFont );
+ const vcl::FontInfo& rFInfo = pFList->GetFontInfo( hFont );
if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
{
bFound = true;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f42afc1..9521a19 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3775,7 +3775,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
sal_Handle hFont = pFList->GetFirstFontInfo( aFName );
if( 0 != hFont )
{
- const FontInfo& rFInfo = pFList->GetFontInfo( hFont );
+ const vcl::FontInfo& rFInfo = pFList->GetFontInfo( hFont );
if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
{
bFound = true;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index eb62da9..cf8f4fc 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -790,7 +790,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
int nFontNames = pPrt->GetDevFontCount();
for( int i = 0; i < nFontNames; i++ )
{
- FontInfo aInf( pPrt->GetDevFont( i ) );
+ vcl::FontInfo aInf( pPrt->GetDevFont( i ) );
aFontNames.insert( aInf.GetName() );
}
@@ -908,7 +908,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
pLabelBox->SetText(sCapBackup );
pIdxBox->SetText(sIdxBackup );
- FontInfo aFontInfo( pFontList->Get(sStdBackup, sStdBackup) );
+ vcl::FontInfo aFontInfo( pFontList->Get(sStdBackup, sStdBackup) );
pStandardHeightLB->Fill( &aFontInfo, pFontList );
aFontInfo = pFontList->Get(sOutBackup, sOutBackup );
pTitleHeightLB->Fill( &aFontInfo, pFontList );
@@ -1049,7 +1049,7 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox )
{
pHeightLB = pIndexHeightLB;
}
- FontInfo aFontInfo( pFontList->Get(sEntry, sEntry) );
+ vcl::FontInfo aFontInfo( pFontList->Get(sEntry, sEntry) );
pHeightLB->Fill( &aFontInfo, pFontList );
return 0;
}
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 66b86ed..2e18bf3 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -190,7 +190,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
int nFontNames = pPrt->GetDevFontCount();
for( int i = 0; i < nFontNames; i++ )
{
- FontInfo aInf( pPrt->GetDevFont( i ) );
+ vcl::FontInfo aInf( pPrt->GetDevFont( i ) );
aFontNames.insert( aInf.GetName() );
}
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 3537809..5ad3760 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -971,7 +971,7 @@ void SwSrcEditWindow::SetFont()
const SvxFontListItem* pFontListItem =
(const SvxFontListItem* )pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST );
const FontList* pList = pFontListItem->GetFontList();
- FontInfo aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
+ vcl::FontInfo aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
const Font& rFont = GetTextEngine()->GetFont();
Font aFont(aInfo);
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index f4b786c..5ed467e 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -67,6 +67,8 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const
return true;
}
+namespace vcl {
+
FontInfo::FontInfo()
: mpImplMetric( new ImplFontMetric )
{}
@@ -113,8 +115,10 @@ FontType FontInfo::GetType() const
return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER);
}
-FontMetric::FontMetric( const FontMetric& rMetric )
-: FontInfo( rMetric )
+}
+
+FontMetric::FontMetric( const FontMetric& rMetric ):
+ vcl::FontInfo( rMetric )
{}
long FontMetric::GetAscent() const
@@ -149,13 +153,13 @@ long FontMetric::GetSlant() const
FontMetric& FontMetric::operator =( const FontMetric& rMetric )
{
- FontInfo::operator=( rMetric );
+ vcl::FontInfo::operator=( rMetric );
return *this;
}
bool FontMetric::operator==( const FontMetric& rMetric ) const
{
- return FontInfo::operator==( rMetric );
+ return vcl::FontInfo::operator==( rMetric );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 6de4765..7104caa 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -58,12 +58,12 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::rtl;
-using namespace ::vcl;
using namespace ::utl;
+using namespace ::vcl;
-FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
+vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
{
- FontInfo aFontInfo;
+ vcl::FontInfo aFontInfo;
ImplInitFontList();
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 019398a..2ccde8f 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -241,7 +241,7 @@ void MyWin::Paint( const Rectangle& rRect )
for( int i = 0; i < nFontSamples; ++i )
{
- FontInfo aFont = GetDevFont( (i*nFontCount) / nFontSamples );
+ vcl::FontInfo aFont = GetDevFont( (i*nFontCount) / nFontSamples );
aFont.SetHeight( 400 + (i%7) * 100 );
aFont.SetOrientation( i * (3600 / nFontSamples) );
SetFont( aFont );
commit 75ea03d8423bdcce241149540a636d6156027d65
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 06:16:59 2014 +0200
fix indentation
Change-Id: Ie4609df2ae19c92d844c0f0ecf7c67d23c8baeba
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 60ec2b3..21b20e7 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1771,30 +1771,30 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
if( pLevelSettings->sBulletFont.getLength() &&
pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetName()))
{
- //search for the font
- if(!pList)
- {
- SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
- const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST );
- pList = pFontListItem ? pFontListItem->GetFontList() : 0;
- }
- if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
- {
+ //search for the font
+ if(!pList)
+ {
+ SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+ const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST );
+ pList = pFontListItem ? pFontListItem->GetFontList() : 0;
+ }
+ if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
+ {
FontInfo aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
- }
- else
- {
- //if it cannot be found then create a new one
- Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
- aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
- aCreateFont.SetFamily( FAMILY_DONTKNOW );
- aCreateFont.SetPitch( PITCH_DONTKNOW );
- aCreateFont.SetWeight( WEIGHT_DONTKNOW );
- aCreateFont.SetTransparent( true );
- aFmt.SetBulletFont( &aCreateFont );
- }
+ }
+ else
+ {
+ //if it cannot be found then create a new one
+ Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
+ aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
+ aCreateFont.SetFamily( FAMILY_DONTKNOW );
+ aCreateFont.SetPitch( PITCH_DONTKNOW );
+ aCreateFont.SetWeight( WEIGHT_DONTKNOW );
+ aCreateFont.SetTransparent( true );
+ aFmt.SetBulletFont( &aCreateFont );
+ }
}else
aFmt.SetBulletFont( &rActBulletFont );
commit 44deb28500027453beb152bd3e05654f916dc189
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 06:10:15 2014 +0200
remove whitespace
Change-Id: Ibe29f47ad478cc88d299f567fa36e73daf857ec2
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f988719..0bb8553 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -89,8 +89,6 @@
#include <editeng/editrids.hrc>
#include <svx/xlnclit.hxx>
-
-
#define MAX_MRU_FONTNAME_ENTRIES 5
#define LOGICAL_EDIT_HEIGHT 12
@@ -121,11 +119,6 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFrameToolBoxControl, SvxBoxItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem );
-
-// class SvxStyleBox_Impl -----------------------------------------------------
-
-
-
class SvxStyleBox_Impl : public ComboBox
{
using Window::IsVisible;
@@ -170,10 +163,6 @@ private:
void ReleaseFocus();
};
-
-// class SvxFontNameBox --------------------------------------------------
-
-
class SvxFontNameBox_Impl : public FontNameBox
{
using Window::Update;
@@ -229,12 +218,7 @@ public:
SAL_WNODEPRECATED_DECLARATIONS_POP
};
-
-// class SvxFrameWindow_Impl --------------------------------------------------
-
-
// SelectHdl needs the Modifiers, get them in MouseButtonUp
-
class SvxFrmValueSet_Impl : public ValueSet
{
sal_uInt16 nModifier;
@@ -280,9 +264,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
};
-
-// class SvxLineWindow_Impl ---------------------------------------------------
-
class SvxLineWindow_Impl : public SfxPopupWindow
{
private:
@@ -303,11 +284,6 @@ public:
virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
};
-
-// Helper classes:
-
-// class SfxStyleControllerItem ------------------------------------------
-
class SvxStyleToolBoxControl;
class SfxStyleControllerItem_Impl : public SfxStatusListener
@@ -325,10 +301,6 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
SvxStyleToolBoxControl& rControl;
};
-
-// class SvxStyleBox_Impl -----------------------------------------------------
-
-
SvxStyleBox_Impl::SvxStyleBox_Impl(Window* pParent,
const OUString& rCommand,
SfxStyleFamily eFamily,
@@ -359,8 +331,6 @@ SvxStyleBox_Impl::~SvxStyleBox_Impl()
{
}
-
-
void SvxStyleBox_Impl::ReleaseFocus()
{
if ( !bRelease )
@@ -372,8 +342,6 @@ void SvxStyleBox_Impl::ReleaseFocus()
m_xFrame->getContainerWindow()->setFocus();
}
-
-
void SvxStyleBox_Impl::Select()
{
// Tell base class about selection so that AT get informed about it.
@@ -463,14 +431,11 @@ void SvxStyleBox_Impl::Select()
}
}
-
void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
{
eStyleFamily = eNewFamily;
}
-
-
bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
sal_uInt16 nType = rNEvt.GetType();
@@ -486,8 +451,6 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
return ComboBox::PreNotify( rNEvt );
}
-
-
bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
{
bool nHandled = false;
@@ -706,8 +669,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
}
}
-
-
IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
{
(void)pThis;
@@ -716,8 +677,6 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
return 0;
}
-
-
static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
{
bool bChanged = false;
@@ -790,10 +749,6 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl
return bChanged;
}
-
-// class SvxFontNameBox_Impl --------------------------------------------------
-
-
SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) :
FontNameBox ( pParent, nStyle | WinBits( WB_DROPDOWN | WB_AUTOHSCROLL ) ),
@@ -818,8 +773,6 @@ SvxFontNameBox_Impl::~SvxFontNameBox_Impl()
GetSubEdit()->RemoveEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont ));
}
-
-
void SvxFontNameBox_Impl::FillList()
{
// Save old Selection, set back in the end
@@ -859,8 +812,6 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*, event
return 0;
}
-
-
void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
{
if ( pFontItem )
@@ -876,8 +827,6 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
SetText( aCurName );
}
-
-
bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
sal_uInt16 nType = rNEvt.GetType();
@@ -890,8 +839,6 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
return FontNameBox::PreNotify( rNEvt );
}
-
-
bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
{
bool nHandled = false;
@@ -935,7 +882,6 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
return nHandled || FontNameBox::Notify( rNEvt );
}
-
void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -949,8 +895,6 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
FontNameBox::DataChanged( rDCEvt );
}
-
-
void SvxFontNameBox_Impl::ReleaseFocus_Impl()
{
if ( !bRelease )
@@ -962,8 +906,6 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
m_xFrame->getContainerWindow()->setFocus();
}
-
-
void SvxFontNameBox_Impl::EnableControls_Impl()
{
SvtFontOptions aFontOpt;
@@ -981,8 +923,6 @@ void SvxFontNameBox_Impl::EnableControls_Impl()
EnableWYSIWYG( bEnable );
}
-
-
void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
{
FontNameBox::UserDraw( rUDEvt );
@@ -1068,9 +1008,6 @@ void SvxFontNameBox_Impl::Select()
}
}
-
-// class SvxColorWindow_Impl --------------------------------------------------
-
#ifndef WB_NO_DIRECTSELECT
#define WB_NO_DIRECTSELECT ((WinBits)0x04000000)
#endif
@@ -1080,9 +1017,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
const Reference< XFrame >& rFrame,
const OUString& rWndTitle,
Window* pParentWindow ):
-
SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
-
theSlotId( nSlotId ),
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
maCommand( rCommand )
@@ -1258,16 +1193,10 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
}
}
-
-// class SvxFrameWindow_Impl --------------------------------------------------
-
-
SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
-
SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
bParagraphMode(false)
-
{
BindListener();
AddStatusListener(OUString(".uno:BorderReducedMode"));
@@ -1350,7 +1279,6 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
#define FRM_VALID_LEFT 0x01
#define FRM_VALID_RIGHT 0x02
#define FRM_VALID_TOP 0x04
@@ -1475,19 +1403,13 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
return 0;
}
-
-
void SvxFrameWindow_Impl::Resize()
{
lcl_ResizeValueSet( *this, aFrameSet);
}
-
-
void SvxFrameWindow_Impl::StateChanged(
-
sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
-
{
if ( pState && nSID == SID_BORDER_REDUCED_MODE)
{
@@ -1525,23 +1447,16 @@ void SvxFrameWindow_Impl::StateChanged(
SfxPopupWindow::StateChanged( nSID, eState, pState );
}
-
-
void SvxFrameWindow_Impl::StartSelection()
{
aFrameSet.StartSelection();
}
-
-
bool SvxFrameWindow_Impl::Close()
{
return SfxPopupWindow::Close();
}
-
-// class SvxLineWindow_Impl --------------------------------------------------
-
static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
{
return SvxBorderLine::threeDMediumColor( aMain );
@@ -1608,8 +1523,6 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
return new SvxLineWindow_Impl( GetId(), GetFrame(), GetParent() );
}
-
-
IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
{
SvxLineItem aLineItem( SID_FRAME_LINESTYLE );
@@ -1640,29 +1553,21 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
return 0;
}
-
-
void SvxLineWindow_Impl::Resize()
{
m_aLineStyleLb.Resize();
}
-
-
bool SvxLineWindow_Impl::Close()
{
return SfxPopupWindow::Close();
}
-
-
Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow()
{
return &m_aLineStyleLb;
}
-
-
void SvxLineWindow_Impl::GetFocus()
{
m_aLineStyleLb.GrabFocus();
@@ -1680,15 +1585,6 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
#endif
}
-
-
-
-// Helper classes
-
-
-// class SfxStyleControllerItem_Impl ------------------------------------------
-
-
SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
const Reference< XDispatchProvider >& rDispatchProvider,
sal_uInt16 nSlotId, // Family-ID
@@ -1699,8 +1595,6 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
{
}
-
-
void SfxStyleControllerItem_Impl::StateChanged(
sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
@@ -1728,12 +1622,6 @@ void SfxStyleControllerItem_Impl::StateChanged(
}
}
-
-
-
-// class SvxStyleToolBoxControl ------------------------------------------
-
-
struct SvxStyleToolBoxControl::Impl
{
OUString aClearForm;
@@ -1831,7 +1719,6 @@ struct SvxStyleToolBoxControl::Impl
}
};
-
// mapping table from bound items. BE CAREFUL this table must be in the
// same order as the uno commands bound to the slots SID_STYLE_FAMILY1..n
// MAX_FAMILIES must also be correctly set!
@@ -1859,13 +1746,11 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl(
}
}
-
SvxStyleToolBoxControl::~SvxStyleToolBoxControl()
{
delete pImpl;
}
-
void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments )
throw ( Exception, RuntimeException, std::exception)
{
@@ -1916,7 +1801,6 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
DELETEZ( pImpl );
}
-
void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException, std::exception)
{
// Do nothing, we will start binding our listener when we are visible.
@@ -1931,8 +1815,6 @@ void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException, std::exc
}
}
-
-
SfxStyleFamily SvxStyleToolBoxControl::GetActFamily()
{
switch ( nActFamily-1 + SID_STYLE_FAMILY_START )
@@ -1949,8 +1831,6 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily()
return SFX_STYLE_FAMILY_PARA;
}
-
-
void SvxStyleToolBoxControl::FillStyleBox()
{
SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)GetToolBox().GetItemWindow( GetId() );
@@ -2066,8 +1946,6 @@ void SvxStyleToolBoxControl::FillStyleBox()
}
}
-
-
void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName )
{
SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)GetToolBox().GetItemWindow( GetId() );
@@ -2088,8 +1966,6 @@ void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName )
}
}
-
-
void SvxStyleToolBoxControl::Update()
{
SfxStyleSheetBasePool* pPool = NULL;
@@ -2139,8 +2015,6 @@ void SvxStyleToolBoxControl::Update()
SelectStyle( pItem->GetStyleName() );
}
-
-
void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
const SfxTemplateItem* pItem )
{
@@ -2152,8 +2026,6 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
Update();
}
-
-
IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification)
{
@@ -2178,12 +2050,8 @@ IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification)
return 0;
}
-
-
void SvxStyleToolBoxControl::StateChanged(
-
sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
-
{
sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
@@ -2218,8 +2086,6 @@ void SvxStyleToolBoxControl::StateChanged(
Update();
}
-
-
Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
{
SvxStyleBox_Impl* pBox = new SvxStyleBox_Impl( pParent,
@@ -2238,25 +2104,16 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
return pBox;
}
-
-// class SvxFontNameToolBoxControl ---------------------------------------
-
-
SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
sal_uInt16 nSlotId,
sal_uInt16 nId,
ToolBox& rTbx )
-
: SfxToolBoxControl( nSlotId, nId, rTbx )
{
}
-
-
void SvxFontNameToolBoxControl::StateChanged(
-
sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
-
{
sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
@@ -2289,8 +2146,6 @@ void SvxFontNameToolBoxControl::StateChanged(
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
}
-
-
Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
{
SvxFontNameBox_Impl* pBox = new SvxFontNameBox_Impl( pParent,
@@ -2299,10 +2154,6 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
return pBox;
}
-
-
-// class SvxColorToolBoxControl ----------------------------------------
-
/* Note:
The initial color shown on the button is set in /core/svx/source/tbxctrls/tbxcolorupdate.cxx
(ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
@@ -2316,7 +2167,6 @@ SvxColorToolBoxControl::SvxColorToolBoxControl(
sal_uInt16 nSlotId,
sal_uInt16 nId,
ToolBox& rTbx ) :
-
SfxToolBoxControl( nSlotId, nId, rTbx ),
mLastColor( COL_AUTO )
{
@@ -2412,9 +2262,7 @@ IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, Color*, pColor)
}
void SvxColorToolBoxControl::StateChanged(
-
sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
-
{
ToolBox& rTbx = GetToolBox();
sal_uInt16 nId = GetId();
@@ -2475,9 +2323,6 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
Dispatch( aCommand, aArgs );
}
-
-// class SvxLineColorToolBoxControl ----------------------------------------
-
SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
sal_uInt16 nSlotId,
sal_uInt16 nId,
@@ -2526,9 +2371,7 @@ IMPL_LINK(SvxLineColorToolBoxControl, SelectedHdl, Color*, pColor)
}
void SvxLineColorToolBoxControl::StateChanged(
-
sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ )
-
{
ToolBox& rTbx = GetToolBox();
sal_uInt16 nId = GetId();
@@ -2544,29 +2387,20 @@ void SvxLineColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
Dispatch( OUString( ".uno:XLineColor" ), aArgs );
}
-
-// class SvxFrameToolBoxControl ------------------------------------------
-
-
SvxFrameToolBoxControl::SvxFrameToolBoxControl(
sal_uInt16 nSlotId,
sal_uInt16 nId,
ToolBox& rTbx )
-
: SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
-
-
SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const
{
return SFX_POPUPWINDOW_ONCLICK;
}
-
-
SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
{
SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
@@ -2582,12 +2416,8 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
return pFrameWin;
}
-
-
void SvxFrameToolBoxControl::StateChanged(
-
sal_uInt16, SfxItemState eState, const SfxPoolItem* )
-
{
sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
@@ -2598,10 +2428,6 @@ void SvxFrameToolBoxControl::StateChanged(
: TRISTATE_FALSE );
}
-
-// class SvxFrameLineStyleToolBoxControl ---------------------------------
-
-
SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
sal_uInt16 nSlotId,
sal_uInt16 nId,
@@ -2612,15 +2438,11 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
-
-
SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
{
return SFX_POPUPWINDOW_ONCLICK;
}
-
-
SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
{
SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
@@ -2633,10 +2455,7 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
return pLineWin;
}
-
-
void SvxFrameLineStyleToolBoxControl::StateChanged(
-
sal_uInt16 , SfxItemState eState, const SfxPoolItem* )
{
sal_uInt16 nId = GetId();
@@ -2648,24 +2467,16 @@ void SvxFrameLineStyleToolBoxControl::StateChanged(
: TRISTATE_FALSE );
}
-
-// class SvxSimpleUndoRedoController -------------------------------------
-
-
SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
aDefaultText = rTbx.GetItemText( nId );
}
-
-
SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
{
}
-
-
void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState );
@@ -2680,8 +2491,6 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState,
rBox.EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
}
-
-
static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
{
Size aSize = rWin.GetOutputSizePixel();
@@ -2690,8 +2499,6 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
rValueSet.SetPosSizePixel( Point(2,2), aSize );
}
-
-
static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize )
{
Size aSize = rValueSet.CalcWindowSizePixel( aItemSize );
@@ -2700,7 +2507,6 @@ static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size
rWin.SetOutputSizePixel( aSize );
}
-
Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible()
{
FillList();
commit 0d20725fccaefea59cc8140f793eb8d6e4baeb4d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 05:45:21 2014 +0200
remove whitespace
Change-Id: Iae0f6b9818f84a92c46b24f90d3051c7b6a45d94
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 3bd3eba..8b44e85 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -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
commit 41a1f95abe185ec7edd58fe3973d3dee534d5ac3
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 05:43:44 2014 +0200
remove whitespace
Change-Id: Iff12a4106369114eb785c0ce242c0e296a877495
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index af3546a..d310409 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -25,29 +24,21 @@
#include <svtools/ctrltool.hxx>
#include <svtools/stdmenu.hxx>
-
-
FontNameMenu::FontNameMenu()
{
SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
}
-
-
FontNameMenu::~FontNameMenu()
{
}
-
-
void FontNameMenu::Select()
{
maCurName = GetItemText( GetCurItemId() );
maSelectHdl.Call( this );
}
-
-
void FontNameMenu::Highlight()
{
OUString aTempName = maCurName;
@@ -56,8 +47,6 @@ void FontNameMenu::Highlight()
maCurName = aTempName;
}
-
-
void FontNameMenu::Fill( const FontList* pList )
{
// clear menu
@@ -90,8 +79,6 @@ void FontNameMenu::Fill( const FontList* pList )
SetCurName( maCurName );
}
-
-
void FontNameMenu::SetCurName(const OUString& rName)
{
maCurName = rName;
@@ -118,8 +105,6 @@ void FontNameMenu::SetCurName(const OUString& rName)
CheckItem( nChecked, false );
}
-
-
FontSizeMenu::FontSizeMenu()
: mpHeightAry( NULL )
, mnCurHeight( 100 )
@@ -127,16 +112,12 @@ FontSizeMenu::FontSizeMenu()
SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
}
-
-
FontSizeMenu::~FontSizeMenu()
{
if ( mpHeightAry )
delete[] mpHeightAry;
}
-
-
void FontSizeMenu::Select()
{
const sal_uInt16 nCurItemId = GetCurItemId();
@@ -144,8 +125,6 @@ void FontSizeMenu::Select()
maSelectHdl.Call( this );
}
-
-
void FontSizeMenu::Highlight()
{
const long nTempHeight = mnCurHeight;
@@ -161,8 +140,6 @@ void FontSizeMenu::Highlight()
mnCurHeight = nTempHeight;
}
-
-
void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
{
Clear();
@@ -229,8 +206,6 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
SetCurHeight( mnCurHeight );
}
-
-
void FontSizeMenu::SetCurHeight( long nHeight )
{
mnCurHeight = nHeight;
commit 5f743ea3081fc3b7e4704c0435103cd20683cbf9
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 05:30:56 2014 +0200
remove whitespace
Change-Id: I08a89e40d24bc6f4b106c5063c197fe201f32bf6
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 4818928..431738c 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -31,8 +31,6 @@
#include <svtools/svtresid.hxx>
#include <svtools/ctrltool.hxx>
-
-
// Standard Fontgroessen fuer scalierbare Fonts
static const sal_IntPtr aStdSizeAry[] =
{
@@ -69,12 +67,6 @@ static const sal_IntPtr aStdSizeAry[] =
0
};
-
-
-
-// - class ImplFontListFonInfo -
-
-
class ImplFontListFontInfo : public FontInfo
{
friend class FontList;
@@ -94,10 +86,6 @@ public:
OutputDevice* GetDevice() const { return mpDevice; }
};
-
-// - class ImplFontListNameInfo -
-
-
class ImplFontListNameInfo
{
friend class FontList;
@@ -146,15 +134,11 @@ static sal_Int32 ImplCompareFontInfo( ImplFontListFontInfo* pInfo1,
return pInfo1->GetStyleName().compareTo( pInfo2->GetStyleName() );
}
-
-
static OUString ImplMakeSearchString(const OUString& rStr)
{
return rStr.toAsciiLowerCase();
}
-
-
static OUString ImplMakeSearchStringFromName(const OUString& rStr)
{
// check for features before alternate font separator
@@ -165,8 +149,6 @@ static OUString ImplMakeSearchStringFromName(const OUString& rStr)
return ImplMakeSearchString(rStr.getToken( 0, ';' ));
}
-
-
ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong* pIndex) const
{
// Append if there is no enty in the list or if the entry is larger
@@ -337,8 +319,6 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
}
}
-
-
FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll )
{
// initialise variables
@@ -372,8 +352,6 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll )
ImplInsertFonts( pDevice2, bAll, !bCompareWindow );
}
-
-
FontList::~FontList()
{
// delete SizeArray if required
@@ -401,8 +379,6 @@ FontList* FontList::Clone() const
return pReturn;
}
-
-
const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) const
{
if ( eWeight > WEIGHT_BOLD )
@@ -442,8 +418,6 @@ const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) c
}
}
-
-
OUString FontList::GetStyleName(const FontInfo& rInfo) const
{
OUString aStyleName = rInfo.GetStyleName();
@@ -495,8 +469,6 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const
return aStyleName;
}
-
-
OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
{
if ( rInfo.GetName().isEmpty() )
@@ -671,8 +643,6 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
return aInfo;
}
-
-
FontInfo FontList::Get(const OUString& rName,
FontWeight eWeight, FontItalic eItalic) const
{
@@ -709,15 +679,11 @@ FontInfo FontList::Get(const OUString& rName,
return aInfo;
}
-
-
bool FontList::IsAvailable(const OUString& rName) const
{
return (ImplFindByName( rName ) != 0);
}
-
-
const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
{
DBG_ASSERT( nFont < GetFontNameCount(), "FontList::GetFontName(): nFont >= Count" );
@@ -725,8 +691,6 @@ const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
return *(maEntries[nFont].mpFirst);
}
-
-
sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const
{
ImplFontListNameInfo* pData = ImplFindByName( rName );
@@ -736,24 +700,18 @@ sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const
return (sal_Handle)pData->mpFirst;
}
-
-
sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
{
ImplFontListFontInfo* pInfo = (ImplFontListFontInfo*)(void*)hFontInfo;
return (sal_Handle)(pInfo->mpNext);
}
-
-
const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
{
ImplFontListFontInfo* pInfo = (ImplFontListFontInfo*)(void*)hFontInfo;
return *pInfo;
}
-
-
const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
{
// first delete Size-Array
@@ -802,27 +760,17 @@ const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
return mpSizeAry;
}
-
-
const sal_IntPtr* FontList::GetStdSizeAry()
{
return aStdSizeAry;
}
-
-
-
-// - FontSizeNames & FsizeNameItem -
-
-
struct ImplFSNameItem
{
long mnSize;
const char* mszUtf8Name;
};
-
-
static const ImplFSNameItem aImplSimplifiedChinese[] =
{
{ 50, "\xe5\x85\xab\xe5\x8f\xb7" },
@@ -843,8 +791,6 @@ static const ImplFSNameItem aImplSimplifiedChinese[] =
{ 420, "\xe5\x88\x9d\xe5\x8f\xb7" }
};
-
-
FontSizeNames::FontSizeNames( LanguageType eLanguage )
{
if ( eLanguage == LANGUAGE_DONTKNOW )
@@ -865,8 +811,6 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
}
}
-
-
long FontSizeNames::Name2Size( const OUString& rName ) const
{
if ( mnElem )
@@ -883,8 +827,6 @@ long FontSizeNames::Name2Size( const OUString& rName ) const
return 0;
}
-
-
OUString FontSizeNames::Size2Name( long nValue ) const
{
OUString aStr;
@@ -907,8 +849,6 @@ OUString FontSizeNames::Size2Name( long nValue ) const
return aStr;
}
-
-
OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const
{
OUString aStr;
@@ -919,8 +859,6 @@ OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const
return aStr;
}
-
-
long FontSizeNames::GetIndexSize( sal_uLong nIndex ) const
{
if ( nIndex >= mnElem )
commit d0bf70d2a4d874168b251ef6381c2d61a6baa9b5
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 04:38:00 2014 +0200
remove whitespace
Change-Id: Ia5ed1a0c12ffc95b31cbbd43b6291218935e2296
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index f8187d6..d206a91 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -44,8 +44,6 @@ typedef ::std::vector< FontInfo > ImplFontList;
#define CHANGE_DIST ( ( sal_uInt16 ) 4 )
#define ADAPT_DIST ( ( sal_uInt16 ) 8 )
-
-
/*************************************************************************
Description
@@ -147,10 +145,6 @@ FontList; FontNameBox; FontStyleBox; FontSizeMenu
*************************************************************************/
-
-// - ColorListBox -
-
-
class SVT_DLLPUBLIC ColorListBox : public ListBox
{
ImpColorList* pColorList; // separate liste, in case of user data are required from outside
@@ -228,10 +222,6 @@ inline Color ColorListBox::GetSelectEntryColor( sal_Int32 nSelIndex ) const
return aColor;
}
-
-// - LineListBox -
-
-
/**
Class computing border widths shared between Line style listbox and the
SvxBorderLine implementation.
@@ -284,7 +274,6 @@ inline Color sameDistColor( Color /*rMain*/, Color rDefault )
return rDefault;
}
-
class SVT_DLLPUBLIC LineListBox : public ListBox
{
ImpLineList* pLineList;
@@ -401,10 +390,6 @@ inline void LineListBox::SetNone( const OUString& sNone )
m_sNone = sNone;
}
-
-// - FontNameBox -
-
-
class SVT_DLLPUBLIC FontNameBox : public ComboBox
{
private:
@@ -438,10 +423,6 @@ private:
FontNameBox& operator =( const FontNameBox& );
};
-
-// - FontStyleBox -
-
-
class SVT_DLLPUBLIC FontStyleBox : public ComboBox
{
OUString aLastStyle;
@@ -474,10 +455,6 @@ inline void FontStyleBox::SetText( const OUString& rText )
ComboBox::SetText( rText );
}
-
-// - FontSizeBox -
-
-
class SVT_DLLPUBLIC FontSizeBox : public MetricBox
{
FontInfo aFontInfo;
commit c7cfe038122ee3b2349f015aca4a88ebe043320c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 04:36:02 2014 +0200
remove whitespace
Change-Id: I1998ee6528e9d55997029d68a2bdc71a70dd2411
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 39e248f..b55419d 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -201,11 +201,6 @@ private:
FontList& operator =( const FontList& );
};
-
-
-// - FontSizeNames -
-
-
class SVT_DLLPUBLIC FontSizeNames
{
private:
commit 29b705e5808367d6bbc2b368ab57281e3df209ea
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 04:35:14 2014 +0200
remove whitespace
Change-Id: I03aa2e78a57bda64119458eb72beade39240ab39
diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
index 78062fd..ea73bc6 100644
--- a/include/svtools/stdmenu.hxx
+++ b/include/svtools/stdmenu.hxx
@@ -97,10 +97,6 @@ FontList; FontNameMenu; FontSizeBox
*************************************************************************/
-
-// - FontNameMenu -
-
-
class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
{
private:
@@ -126,10 +122,6 @@ public:
const Link& GetHighlightHdl() const { return maHighlightHdl; }
};
-
-// - FontSizeMenu -
-
-
class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
{
private:
commit 9e908d310405fbd527eed0e4a136042655e2b0d4
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 04:31:10 2014 +0200
remove whitespace
Change-Id: Ifa5d662a3ef723c29b4d6839f16d4b920e1c773d
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 8e0957a..10a61fb 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -28,10 +28,6 @@ class ImplFontCharMap;
typedef sal_uInt32 sal_UCS4;
-
-// - FontInfo -
-
-
class VCL_DLLPUBLIC FontInfo : public Font
{
friend class OutputDevice;
@@ -52,10 +48,6 @@ public:
{ return !operator==( rInfo ); }
};
-
-// - FontMetric -
-
-
class VCL_DLLPUBLIC FontMetric : public FontInfo
{
public:
@@ -93,8 +85,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
return stream;
}
-// - FontCharMap -
-
class VCL_DLLPUBLIC FontCharMap
{
private:
@@ -127,10 +117,6 @@ private:
void operator=( const FontCharMap& );
};
-
-// - TextRectInfo -
-
-
class VCL_DLLPUBLIC TextRectInfo
{
friend class OutputDevice;
commit 5fdab12b01d290c5f8dab7980f9d3e065d3ec2cc
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed Jun 4 04:09:34 2014 +0200
fix new[]/delete mismatch
As seen by ooo90105-1.ods with memcheck
Change-Id: Ib976632aa52556132b3d05ebb33e8fb64d8d9890
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 1714256..3840a78 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1471,7 +1471,7 @@ ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rIm
ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext()
{
- delete pFunctions;
+ delete[] pFunctions;
}
SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix,
commit 389d8e9f5232501ac782562ba7c07c052f19766d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Sun Jun 1 19:36:39 2014 +0200
fix refresh problem with 2D OpenGL chart and OpenGLWindow
Change-Id: I32f23967a826262051495d57a4dd529ca3694548
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index ab552f9..d69aa9f8 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -55,6 +55,7 @@ class DrawModelWrapper;
class SeriesPlotterContainer;
class VDataSeries;
class GL3DPlotterBase;
+class GL2DRenderer;
enum TimeBasedMode
{
@@ -103,6 +104,7 @@ class ChartView : public ::cppu::WeakImplHelper10<
, public ExplicitValueProvider
, private SfxListener
{
+ friend class GL2DRenderer;
private:
void init();
@@ -277,6 +279,7 @@ private: //member
boost::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter;
TimeBasedInfo maTimeBased;
osl::Mutex maTimeMutex;
+ boost::scoped_ptr<GL2DRenderer> mp2DRenderer;
};
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f9b7d70..5a2b3e4 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -154,6 +154,46 @@ void debugGL3DOutput( ChartModel& rModel )
}
+class GL2DRenderer : public IRenderer
+{
+public:
+ GL2DRenderer(ChartView* pView);
+
+ virtual void update() SAL_OVERRIDE;
+ virtual void clickedAt(const Point& rPos, sal_uInt16 nButton) SAL_OVERRIDE;
+ virtual void mouseDragMove(const Point& rBegin, const Point& rEnd, sal_uInt16 nButton) SAL_OVERRIDE;
+ virtual void scroll(long nDelta) SAL_OVERRIDE;
+ virtual void contextDestroyed() SAL_OVERRIDE;
+private:
+ ChartView* mpView;
+};
+
+GL2DRenderer::GL2DRenderer(ChartView* pView):
+ mpView(pView)
+{
+}
+
+void GL2DRenderer::update()
+{
+ mpView->render();
+}
+
+void GL2DRenderer::clickedAt(const Point&, sal_uInt16 )
+{
+}
+
+void GL2DRenderer::mouseDragMove(const Point& , const Point& , sal_uInt16 )
+{
+}
+
+void GL2DRenderer::scroll(long )
+{
+}
+
+void GL2DRenderer::contextDestroyed()
+{
+}
+
const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
{
return theExplicitValueProviderUnoTunnelId::get().getSeq();
@@ -195,6 +235,7 @@ ChartView::ChartView(
, m_nScaleYDenominator(1)
, m_bSdrViewIsInEditMode(false)
, m_aResultingDiagramRectangleExcludingAxes(0,0,0,0)
+ , mp2DRenderer(new GL2DRenderer(this))
{
init();
}
@@ -2674,6 +2715,8 @@ void ChartView::render()
{
AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
+ if(pWindow)
+ pWindow->setRenderer(mp2DRenderer.get());
bool bRender = pShapeFactory->preRender(pWindow);
if(bRender)
{
More information about the Libreoffice-commits
mailing list