include/tools/rcid.h | 1 -
include/vcl/combobox.hxx | 2 --
rsc/inc/rscdb.hxx | 2 --
rsc/source/parser/rscicpx.cxx | 27 ---------------------------
rsc/source/parser/rscinit.cxx | 6 ------
sc/source/ui/src/condformatdlg.src | 9 ---------
tools/source/rc/resmgr.cxx | 1 -
vcl/source/control/combobox.cxx | 30 ------------------------------
8 files changed, 78 deletions(-)
New commits:
commit 8bfbd7fbd74b69959929e29df3c99aa22ec13ca5
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 9 20:53:13 2016 +0100
DDExtraWidth doesn't exist
Change-Id: Ic231be1487f21dbcae9290b75be34f85318ad99a
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index a47de85..7bd6949 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -125,7 +125,6 @@ class RscTypCont
Atom nHideWhenDeactivateId;
Atom nAutoHScrollId;
Atom nAutoVScrollId;
- Atom nDDExtraWidthId;
Atom nWordBreakId;
Atom nLeftLabelId;
Atom nHasLinesId;
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 0035556..714c1ac 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -389,7 +389,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper,
RscArray * pStrLst )
INS_WINBIT(pClassListBox,VScroll);
INS_WINBIT(pClassListBox,AutoSize)
INS_WINBIT(pClassListBox,AutoHScroll)
- INS_WINBIT(pClassListBox,DDExtraWidth)
{
RSCINST aDflt = aUShort.Create( nullptr, RSCINST() );
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index f167cc8..f136311 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -198,8 +198,6 @@ void RscTypCont::Init()
aWinBits.SetConstant( nAutoHScrollId,
sal::static_int_cast<sal_Int32>(WB_AUTOHSCROLL) );
nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" );
aWinBits.SetConstant( nAutoVScrollId,
sal::static_int_cast<sal_Int32>(WB_AUTOVSCROLL) );
- nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" );
- aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ );
nWordBreakId = pHS->getID( "WB_WORDBREAK" );
aWinBits.SetConstant( nWordBreakId,
sal::static_int_cast<sal_Int32>(WB_WORDBREAK) );
nLeftLabelId = pHS->getID( "WB_LEFTLABEL" );
diff --git a/sc/source/ui/src/condformatdlg.src
b/sc/source/ui/src/condformatdlg.src
index f7cb9e5..cf6ae3e 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -38,7 +38,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 60 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"All Cells";
@@ -53,7 +52,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 80 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"equal to";
@@ -106,7 +104,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 60);
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"Color Scale (2 Entries)";
@@ -220,7 +217,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 40 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
};
ListBox LB_COL_MIDDLE
{
@@ -228,7 +224,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 40 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
};
ListBox LB_COL_MAX
{
@@ -236,7 +231,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 40 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
};
PushButton BTN_OPTIONS
{
@@ -250,7 +244,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 100, 60 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"Today";
@@ -274,7 +267,6 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 50 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"3 Arrows";
@@ -331,7 +323,6 @@ Control RID_ICON_SET_ENTRY
Size = MAP_APPFONT( 60, 40 );
Border = TRUE;
DropDown = TRUE;
- DDExtraWidth = TRUE;
StringList [ en-US ] =
{
"Value";
commit 365d1ec2782e5be83e99e6f676b8e248f6ebf16c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 9 20:52:00 2016 +0100
no ComboBoxes loaded from .src anymore
Change-Id: Ic497dddfe326e9cc06e71c39284b2848d17ae0c8
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 36839e5..d47b0e1 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -55,7 +55,6 @@
#define RSC_EDIT (RSC_NOTYPE + 0x52)
-#define RSC_COMBOBOX (RSC_NOTYPE + 0x54)
#define RSC_LISTBOX (RSC_NOTYPE + 0x55)
#define RSC_TEXT (RSC_NOTYPE + 0x57)
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index e67a4e2..d4dcfb9 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -43,7 +43,6 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplCalcEditHeight();
SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const;
@@ -54,7 +53,6 @@ protected:
public:
explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 );
- explicit ComboBox( vcl::Window* pParent, const ResId& );
virtual ~ComboBox() override;
virtual void dispose() override;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 69a85ca..a47de85 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -186,7 +186,6 @@ class RscTypCont
RscEnum * pTriState );
RscTop * InitClassEdit( RscTop * pSuper );
RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
- RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
RscTop * InitClassFixedText( RscTop * pSuper );
RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 85fd6a3..0035556 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -403,32 +403,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper,
RscArray * pStrLst )
return pClassListBox;
}
-RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst )
-{
- Atom nId;
- RscTop * pClassComboBox;
-
- // initialize class
- nId = pHS->getID( "ComboBox" );
- pClassComboBox = new RscClass( nId, RSC_COMBOBOX, pSuper );
- pClassComboBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassComboBox );
-
- // initialize variables
- INS_WINBIT(pClassComboBox,DropDown)
- INS_WINBIT(pClassComboBox,Sort)
- INS_WINBIT(pClassComboBox,HScroll);
- INS_WINBIT(pClassComboBox,VScroll);
- INS_WINBIT(pClassComboBox,AutoSize)
- INS_WINBIT(pClassComboBox,AutoHScroll)
- INS_WINBIT(pClassComboBox,DDExtraWidth)
-
- nId = aNmTb.Put( "StringList", VARNAME );
- pClassComboBox->SetVariable( nId, pStrLst );
-
- return pClassComboBox;
-}
-
RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 2670ed3..f167cc8 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -68,7 +68,6 @@ void RscTypCont::Init()
RscTop * pClassImageButton;
RscTop * pClassEdit;
RscTop * pClassListBox;
- RscTop * pClassComboBox;
RscTop * pClassFixedText;
RscTop * pClassFixedImage;
RscTop * pClassKeyCode;
@@ -321,9 +320,6 @@ void RscTypCont::Init()
pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList
);
pRoot->Insert( pClassListBox );
- pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList );
- pRoot->Insert( pClassComboBox );
-
pClassFixedText = InitClassFixedText( pClassControl );
pRoot->Insert( pClassFixedText );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index eec1719..473b900 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1425,7 +1425,6 @@ OString ResMgr::GetAutoHelpId()
switch( pRC->pResource->GetRT() ) {
case RSC_EDIT: aHID.append( "Edit" );
break;
case RSC_LISTBOX: aHID.append( "ListBox" );
break;
- case RSC_COMBOBOX: aHID.append( "ComboBox" );
break;
case RSC_PUSHBUTTON: aHID.append( "PushButton" );
break;
case RSC_SPINFIELD: aHID.append( "SpinField" );
break;
case RSC_NUMERICFIELD: aHID.append( "NumericField" );
break;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index c64e05d..530f220 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -110,21 +110,6 @@ ComboBox::ComboBox(vcl::Window *const pParent, WinBits
const nStyle)
SetWidthInChars(-1);
}
-ComboBox::ComboBox(vcl::Window *const pParent, const ResId& rResId)
- : Edit( WINDOW_COMBOBOX )
- , m_pImpl(new Impl(*this))
-{
- m_pImpl->ImplInitComboBoxData();
- rResId.SetRT( RSC_COMBOBOX );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- SetWidthInChars(-1);
- if ( !(nStyle & WB_HIDE ) )
- Show();
-}
-
ComboBox::~ComboBox()
{
disposeOnce();
@@ -268,21 +253,6 @@ WinBits ComboBox::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-void ComboBox::ImplLoadRes( const ResId& rResId )
-{
- Edit::ImplLoadRes( rResId );
-
- sal_Int32 nNumber = ReadLongRes();
-
- if( nNumber )
- {
- for( sal_Int32 i = 0; i < nNumber; i++ )
- {
- InsertEntry( ReadStringRes() );
- }
- }
-}
-
void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase )
{
m_pImpl->m_isMatchCase = bMatchCase;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
