Author: af
Date: Fri Feb 22 14:04:32 2013
New Revision: 1449048
URL: http://svn.apache.org/r1449048
Log:
i121420: Fixed Linux build problems.
Modified:
openoffice/branches/sidebar/main/svx/inc/svx/dlgctrl.hxx
openoffice/branches/sidebar/main/svx/source/dialog/dlgctrl.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dlgctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dlgctrl.hxx?rev=1449048&r1=1449047&r2=1449048&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dlgctrl.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dlgctrl.hxx Fri Feb 22
14:04:32 2013
@@ -411,9 +411,10 @@ class SVX_DLLPUBLIC LineEndLB : public L
{
public:
- LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id
) {}
- LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent,
aWB ) {}
-
+ LineEndLB( Window* pParent, ResId Id );
+ LineEndLB( Window* pParent, WinBits aWB );
+ virtual ~LineEndLB (void);
+
virtual void Fill( const XLineEndList* pList, sal_Bool bStart =
sal_True );
void Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL,
Modified: openoffice/branches/sidebar/main/svx/source/dialog/dlgctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/dialog/dlgctrl.cxx?rev=1449048&r1=1449047&r2=1449048&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/dialog/dlgctrl.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/dialog/dlgctrl.cxx Fri Feb 22
14:04:32 2013
@@ -1759,7 +1759,6 @@ void FillTypeLB::Fill()
|* Fuellt die Listbox (vorlaeufig) mit Strings
|*
\************************************************************************/
-
void LineLB::Fill( const XDashList* pList )
{
long nCount = pList->Count();
@@ -1858,6 +1857,20 @@ void LineLB::SelectEntryByList( const XD
|* Fuellt die Listbox (vorlaeufig) mit Strings
|*
\************************************************************************/
+LineEndLB::LineEndLB( Window* pParent, ResId Id )
+ : ListBox( pParent, Id )
+{
+}
+
+LineEndLB::LineEndLB( Window* pParent, WinBits aWB )
+ : ListBox( pParent, aWB )
+{
+}
+
+LineEndLB::~LineEndLB(void)
+{
+}
+
void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
{
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx?rev=1449048&r1=1449047&r2=1449048&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
Fri Feb 22 14:04:32 2013
@@ -1168,12 +1168,12 @@ long SvxLineWidthPage::GetTmpCustomWidth
//////////////////////////////////////////////////////////////////////////////
-class LineEndLB : public ListBox
+class LineEndLB_LPP : public ListBox
{
public:
- LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id
) {}
- LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent,
aWB ) {}
+ LineEndLB_LPP( Window* pParent, ResId Id ) : ListBox( pParent,
Id ) {}
+ LineEndLB_LPP( Window* pParent, WinBits aWB ) : ListBox(
pParent, aWB ) {}
void Fill( const XLineEndList* pList, bool bStart = true );
@@ -1183,7 +1183,7 @@ public:
bool bStart = true );
};
-void LineEndLB::Fill( const XLineEndList* pList, bool bStart )
+void LineEndLB_LPP::Fill( const XLineEndList* pList, bool bStart )
{
long nCount = pList->Count();
XLineEndEntry* pEntry;
@@ -1211,7 +1211,7 @@ void LineEndLB::Fill( const XLineEndList
SetUpdateMode( true );
}
-void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp, bool bStart )
+void LineEndLB_LPP::Append( XLineEndEntry* pEntry, Bitmap* pBmp, bool bStart )
{
if( pBmp )
{
@@ -1228,7 +1228,7 @@ void LineEndLB::Append( XLineEndEntry* p
InsertEntry( pEntry->GetName() );
}
-void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp,
bool bStart )
+void LineEndLB_LPP::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap*
pBmp, bool bStart )
{
RemoveEntry( nPos );
@@ -1273,8 +1273,8 @@ LinePropertyPanel::LinePropertyPanel(
mpFTTrancparency(new FixedText(this, SVX_RES(FT_TRANSPARENT))),
mpMFTransparent(new MetricField(this, SVX_RES(MF_TRANSPARENT))),
mpFTArrow(new FixedText(this, SVX_RES(FT_ARROW))),
- mpLBStart(new LineEndLB(this, SVX_RES(LB_START))),
- mpLBEnd(new LineEndLB(this, SVX_RES(LB_END))),
+ mpLBStart(new LineEndLB_LPP(this, SVX_RES(LB_START))),
+ mpLBEnd(new LineEndLB_LPP(this, SVX_RES(LB_END))),
maColorControl(SID_ATTR_LINE_COLOR, *pBindings, *this),
maStyleControl(SID_ATTR_LINE_STYLE, *pBindings, *this),
maDashControl (SID_ATTR_LINE_DASH, *pBindings, *this),
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx?rev=1449048&r1=1449047&r2=1449048&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
Fri Feb 22 14:04:32 2013
@@ -41,7 +41,7 @@ class XLineStyleItem;
class XLineDashItem;
class XLineStartItem;
class XLineEndItem;
-class LineEndLB;
+class LineEndLB_LPP;
class XLineEndList;
//////////////////////////////////////////////////////////////////////////////
@@ -93,8 +93,8 @@ private:
::boost::scoped_ptr< FixedText > mpFTTrancparency;
::boost::scoped_ptr< MetricField > mpMFTransparent;
::boost::scoped_ptr< FixedText > mpFTArrow;
- ::boost::scoped_ptr< LineEndLB > mpLBStart;
- ::boost::scoped_ptr< LineEndLB > mpLBEnd;
+ ::boost::scoped_ptr< LineEndLB_LPP > mpLBStart;
+ ::boost::scoped_ptr< LineEndLB_LPP > mpLBEnd;
//ControllerItem
::sfx2::sidebar::ControllerItem maColorControl;
