[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/tools include/vcl rsc/source sc/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Oct 5 13:02:48 UTC 2016
include/sfx2/sidebar/ResourceDefinitions.hrc | 8 --------
include/tools/rcid.h | 1 -
include/vcl/fixed.hxx | 1 -
rsc/source/parser/rscinit.cxx | 13 -------------
sc/inc/helpids.h | 23 -----------------------
vcl/source/control/fixed.cxx | 12 ------------
6 files changed, 58 deletions(-)
New commits:
commit 0148bcbeccf1e62f789a5fadd65a359840854f1b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 13:31:20 2016 +0100
no FixedLines are loaded from resources files anymore
Change-Id: I5b38c42e5b7fe7932e0dcc2539579d342ea9cf3b
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 492e078..0f98bed 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -62,7 +62,6 @@
#define RSC_LISTBOX (RSC_NOTYPE + 0x55)
#define RSC_TEXT (RSC_NOTYPE + 0x57)
-#define RSC_FIXEDLINE (RSC_NOTYPE + 0x58)
#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a)
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 85f3a23..4209054 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -107,7 +107,6 @@ protected:
public:
explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ );
- explicit FixedLine( vcl::Window* pParent, const ResId& );
virtual void ApplySettings(vcl::RenderContext&) override;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 9860c4b..bb5d249 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -38,9 +38,6 @@
#include <rsclex.hxx>
#include <rscyacc.hxx>
-#define INS_WINBIT( pClass, WinBit ) \
- InsWinBit( pClass, #WinBit, n##WinBit##Id );
-
void RscTypCont::Init()
{
RscEnum * pFieldUnits;
@@ -419,16 +416,6 @@ void RscTypCont::Init()
RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem );
pRoot->Insert( pClassToolBox );
- // initialize class
- nId = pHS->getID( "FixedLine" );
- RscTop* pClassFixedLine = new RscClass( nId, RSC_FIXEDLINE, pClassControl );
- pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- INS_WINBIT(pClassFixedLine,Vert)
-
- aNmTb.Put( nId, CLASSNAME, pClassFixedLine );
- pRoot->Insert( pClassFixedLine );
-
RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
pClassBitmap,
pClassImage,
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 36860e4..0164ce8 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -588,18 +588,6 @@ FixedLine::FixedLine( vcl::Window* pParent, WinBits nStyle ) :
SetSizePixel( Size( 2, 2 ) );
}
-FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) :
- Control( WINDOW_FIXEDLINE )
-{
- rResId.SetRT( RSC_FIXEDLINE );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
void FixedLine::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
commit e9e629358396926b4a907a2c89213b1b413e628b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 13:30:53 2016 +0100
drop unused heipids and resources
Change-Id: I354f960e52d2d0345669600726c49e30641392e4
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index 83c114d..503f897 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -37,18 +37,10 @@
#define TEXT_HEIGHT 8
#define MBOX_HEIGHT 12
-
//about popup panel
#define POPUPPANEL_MARGIN_VERTICAL 7
#define POPUPPANEL_MARGIN_HORIZONTAL 7
-#define OFFSET_X 1
-#define OFFSET_Y 1
-
-//new
-#define POPUPPANEL_MARGIN_SMALL 2
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 1641616..6c62861 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -220,29 +220,6 @@
#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN"
#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE"
-// sidebar -----------------------------------------
-
-// CellAppearancePropertyPanel -----------------------------------------
-#define HID_PROPERTYPANEL_SC_BORDER1_TBX "SC_HID_PROPERTYPANEL_SC_BORDER1_TBX"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_NONE "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_NONE"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_ALL "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_ALL"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD"
-#define HID_PROPERTYPANEL_SC_BORDER2_TBX "SC_HID_PROPERTYPANEL_SC_BORDER2_TBX"
-#define HID_PROPERTYPANEL_SC_BORDER3_TBX "SC_HID_PROPERTYPANEL_SC_BORDER3_TBX"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_S1 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S1"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_S2 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S2"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_S3 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S3"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_S4 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S4"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOP "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOP"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_BOT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BOT"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT"
-#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT"
-
// Ende Hilfe IDs ------------------------------------------------------------
#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL"
More information about the Libreoffice-commits
mailing list