Author: alg
Date: Wed Apr 17 11:51:23 2013
New Revision: 1468850
URL: http://svn.apache.org/r1468850
Log:
i122042 corrected adding default values in LineStyleListBox
Modified:
openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx
openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx
Modified: openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx?rev=1468850&r1=1468849&r2=1468850&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx Wed Apr 17 11:51:23 2013
@@ -388,18 +388,24 @@ public:
\************************************************************************/
class SVX_DLLPUBLIC LineLB : public ListBox
{
+private:
+ /// bitfield
+ /// defines if standard fields (none, solid) are added, default is true
+ bool mbAddStandardFields : 1;
public:
- LineLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
- LineLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB
) {}
+ LineLB(Window* pParent, ResId Id);
+ LineLB(Window* pParent, WinBits aWB);
+ virtual ~LineLB();
+
+ virtual void Fill(const XDashList* pList);
- virtual void Fill( const XDashList* pList );
+ bool getAddStandardFields() const { return mbAddStandardFields; }
+ void setAddStandardFields(bool bNew);
- void Append( XDashEntry* pEntry, const Bitmap* pBmp = NULL );
- void Modify( XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp =
NULL );
- void SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash,
sal_uInt16 nDist = 0 );
- // void FillStyles();
+ void Append(XDashEntry* pEntry, const Bitmap* pBmp = 0);
+ void Modify(XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = 0);
+ void SelectEntryByList(const XDashList* pList, const String& rStr, const
XDash& rDash, sal_uInt16 nDist = 0);
};
/*************************************************************************
Modified: openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx?rev=1468850&r1=1468849&r2=1468850&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx Wed Apr 17 11:51:23 2013
@@ -1778,15 +1778,42 @@ void FillTypeLB::Fill()
|* Fuellt die Listbox (vorlaeufig) mit Strings
|*
\************************************************************************/
+LineLB::LineLB(Window* pParent, ResId Id)
+: ListBox(pParent, Id),
+ mbAddStandardFields(true)
+{
+}
+
+LineLB::LineLB(Window* pParent, WinBits aWB)
+: ListBox(pParent, aWB),
+ mbAddStandardFields(true)
+{
+}
+
+LineLB::~LineLB()
+{
+}
+
+void LineLB::setAddStandardFields(bool bNew)
+{
+ if(getAddStandardFields() != bNew)
+ {
+ mbAddStandardFields = bNew;
+ }
+}
+
void LineLB::Fill( const XDashList* pList )
{
Clear();
- // entry for 'none'
- InsertEntry(pList->GetStringForUiNoLine());
+ if(getAddStandardFields())
+ {
+ // entry for 'none'
+ InsertEntry(pList->GetStringForUiNoLine());
- // entry for solid line
- InsertEntry(pList->GetStringForUiSolidLine(),
pList->GetBitmapForUISolidLine());
+ // entry for solid line
+ InsertEntry(pList->GetStringForUiSolidLine(),
pList->GetBitmapForUISolidLine());
+ }
// entries for dashed lines
long nCount = pList->Count();
