summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-24 17:10:53 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-25 11:41:23 +0100
commitf23297e11148fdd7b28e242e8b77f375f969c617 (patch)
tree1452bd42d6b2af9f42f04d45a8eec2a4679dc172
parent30a458d7e1dcd8c7b35cd74b10ce41d2a89e8552 (diff)
no Edit controls loaded from .src now
Change-Id: I42c7377c101c642ea39028e05e4ffd58fc7435d7
-rw-r--r--formula/source/ui/dlg/funcutl.cxx11
-rw-r--r--include/formula/funcutl.hxx1
-rw-r--r--include/tools/rcid.h2
-rw-r--r--include/vcl/edit.hxx1
-rw-r--r--rsc/inc/rscdb.hxx1
-rw-r--r--rsc/source/parser/rscicpx.cxx23
-rw-r--r--rsc/source/parser/rscinit.cxx5
-rw-r--r--vcl/source/control/edit.cxx13
8 files changed, 0 insertions, 57 deletions
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 9e9777a7d6e7..1fc5a9e9afe6 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -412,17 +412,6 @@ RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits
aIdle.SetPriority( SchedulerPriority::LOW );
}
-RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
- vcl::Window* pShrinkModeLabel, const ResId& rResId )
- : Edit( _pParent, rResId )
- , aIdle("formula RefEdit Idle")
- , pAnyRefDlg( pParent )
- , pLabelWidget(pShrinkModeLabel)
-{
- aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
- aIdle.SetPriority( SchedulerPriority::LOW );
-}
-
VCL_BUILDER_DECL_FACTORY(RefEdit)
{
(void)rMap;
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index d5d3c00fc8dd..941ef5a007a2 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -56,7 +56,6 @@ protected:
virtual void LoseFocus() override;
public:
- RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId );
RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER );
virtual ~RefEdit() override;
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index ab3bd5967583..be3c75d0984d 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -49,8 +49,6 @@
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
-#define RSC_EDIT (RSC_NOTYPE + 0x52)
-
#define RSC_TEXT (RSC_NOTYPE + 0x57)
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index df00e800fa7a..708a254414a7 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -167,7 +167,6 @@ public:
SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext& rRenderContext, WinBits nStyle);
Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER );
- Edit( vcl::Window* pParent, const ResId& rResId );
virtual ~Edit() override;
virtual void dispose() override;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c7f719aa2446..aa08f7cb554d 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -176,7 +176,6 @@ class RscTypCont
RscArray * pLangGeo );
RscTop * InitClassControl( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper );
- RscTop * InitClassEdit( RscTop * pSuper );
RscTop * InitClassFixedText( RscTop * pSuper );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
RscTop * InitClassMenuItem( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 89b80748bc67..4da88cd3a0e5 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -281,29 +281,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
return pClassPushButton;
}
-RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassEdit;
-
- // initialize class
- nId = pHS->getID( "Edit" );
- pClassEdit = new RscClass( nId, RSC_EDIT, pSuper );
- pClassEdit->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassEdit );
-
- INS_WINBIT(pClassEdit,Left)
- INS_WINBIT(pClassEdit,Center)
- INS_WINBIT(pClassEdit,Right)
- INS_WINBIT(pClassEdit,PassWord)
- INS_WINBIT(pClassEdit,ReadOnly)
-
- nId = aNmTb.Put( "MaxTextLength", VARNAME );
- pClassEdit->SetVariable( nId, &aUShort );
-
- return pClassEdit;
-}
-
RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 4bdaf63a6ef1..ece6ec2eded6 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -65,7 +65,6 @@ void RscTypCont::Init()
RscTop * pClassControl;
RscTop * pClassButton;
RscTop * pClassPushButton;
- RscTop * pClassEdit;
RscTop * pClassFixedText;
RscTop * pClassKeyCode;
RscTop * pLangClassKeyCode;
@@ -303,10 +302,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassPushButton );
}
{
- pClassEdit = InitClassEdit( pClassControl );
- pRoot->Insert( pClassEdit );
-}
-{
pClassFixedText = InitClassFixedText( pClassControl );
pRoot->Insert( pClassFixedText );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2769a0fc2f7c..76d7ccceedde 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -169,19 +169,6 @@ Edit::Edit( vcl::Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle );
}
-Edit::Edit( vcl::Window* pParent, const ResId& rResId )
- : Control( WINDOW_EDIT )
-{
- rResId.SetRT( RSC_EDIT );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInitEditData();
- ImplInit( pParent, nStyle );
- ImplLoadRes();
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
void Edit::SetWidthInChars(sal_Int32 nWidthInChars)
{
if (mnWidthInChars != nWidthInChars)