cui/source/inc/labdlg.hxx | 4 ----
cui/source/tabpages/labdlg.cxx | 39 ---------------------------------------
cui/source/tabpages/labdlg.hrc | 2 --
cui/source/tabpages/labdlg.src | 24 ------------------------
helpcontent2 | 2 +-
5 files changed, 1 insertion(+), 70 deletions(-)
New commits:
commit 6670e1f5df7f6b27b9af07d1b401d8bc1e474f73
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jan 4 23:34:51 2014 +0000
near obsolete SdrCaption dialog has Not Implemented Yet stub
and it's never going to be now, so remove unused WINKEL elements.
The whole SDRATTR_CAPTIONANGLE attribute is under doubt methinks.
Change-Id: Ie51eb8efbeb9a2e70780f2e19ddc57b2fb9a86eb
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 68f4379..f63aa75 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -36,8 +36,6 @@ private:
ValueSet aCT_CAPTTYPE;
FixedText aFT_ABSTAND;
MetricField aMF_ABSTAND;
- FixedText aFT_WINKEL;
- ListBox aLB_WINKEL;
FixedText aFT_ANSATZ;
ListBox aLB_ANSATZ;
FixedText aFT_UM;
@@ -54,8 +52,6 @@ private:
OUString aStrVertList;
short nCaptionType;
- sal_Bool bFixedAngle;
- sal_Int32 nFixedAngle;
sal_Int32 nGap;
short nEscDir;
sal_Bool bEscRel;
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 5fac817..5c28178 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -50,12 +50,6 @@
#define AT_MITTE 1
#define AT_UNTEN 2
-#define WK_OPTIMAL 0
-#define WK_30 1
-#define WK_45 2
-#define WK_60 3
-#define WK_90 4
-
// static ----------------------------------------------------------------
static sal_uInt16 pCaptionRanges[] =
@@ -81,8 +75,6 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const
SfxItemSet& rInAttrs
aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ),
aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ),
aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ),
- aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ),
- aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ),
aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ),
aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ),
aFT_UM( this, CUI_RES( FT_UM ) ),
@@ -98,10 +90,6 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const
SfxItemSet& rInAttrs
rOutAttrs ( rInAttrs )
{
- //------------NYI-------------------------------------------
- aFT_WINKEL.Hide();
- aLB_WINKEL.Hide();
-
//------------correct positions-------------------------
aFT_ANSATZ_REL.SetPosPixel( aFT_UM.GetPosPixel() );
aLB_ANSATZ_REL.SetPosPixel(
@@ -257,10 +245,6 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
sal_uInt16 nWhich;
SfxMapUnit eUnit;
- //------- angle ----------
- nWhich = GetWhich( SDRATTR_CAPTIONANGLE );
- nFixedAngle = ( ( const SdrCaptionAngleItem& ) rOutAttrs.Get( nWhich )
).GetValue();
-
nWhich = GetWhich( SDRATTR_CAPTIONESCABS );
eUnit = pPool->GetMetric( nWhich );
nEscAbs = ( ( const SdrCaptionEscAbsItem& ) rOutAttrs.Get( nWhich )
).GetValue();
@@ -285,7 +269,6 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nGap = static_cast<long>(aMF_ABSTAND.GetValue());
nCaptionType = (short)( ( const SdrCaptionTypeItem& ) rOutAttrs.Get(
GetWhich( SDRATTR_CAPTIONTYPE ) ) ).GetValue();
- bFixedAngle = ( ( const SfxBoolItem& ) rOutAttrs.Get( GetWhich(
SDRATTR_CAPTIONFIXEDANGLE ) ) ).GetValue();
bFitLineLen = ( ( const SfxBoolItem& ) rOutAttrs.Get( GetWhich(
SDRATTR_CAPTIONFITLINELEN ) ) ).GetValue();
nEscDir = (short)( ( const SdrCaptionEscDirItem& ) rOutAttrs.Get(
GetWhich( SDRATTR_CAPTIONESCDIR ) ) ).GetValue();
bEscRel = ( ( const SfxBoolItem& ) rOutAttrs.Get( GetWhich(
SDRATTR_CAPTIONESCISREL ) ) ).GetValue();
@@ -302,7 +285,6 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nAnsatzRelPos=AT_MITTE;
nAnsatzTypePos=AZ_OPTIMAL;
- nWinkelTypePos=WK_OPTIMAL;
aMF_ABSTAND.SetValue( nGap );
@@ -343,23 +325,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nAnsatzTypePos = AZ_OPTIMAL;
}
- if( bFixedAngle )
- {
- if( nFixedAngle <= 3000 )
- nWinkelTypePos=WK_30;
- else if( nFixedAngle <= 4500 )
- nWinkelTypePos=WK_45;
- else if( nFixedAngle <= 6000 )
- nWinkelTypePos=WK_60;
- else
- nWinkelTypePos=WK_90;
- }
-
aCB_LAENGE.Check( bFitLineLen );
aMF_LAENGE.SetValue( nLineLen );
aLB_ANSATZ.SelectEntryPos( nAnsatzTypePos );
- aLB_WINKEL.SelectEntryPos( nWinkelTypePos );
SetupAnsatz_Impl( nAnsatzTypePos );
aCT_CAPTTYPE.SelectItem( nCaptionType+1 ); // Enum starts at 0!
@@ -505,32 +474,24 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType )
switch( nType-1 )
{
case SDRCAPT_TYPE1:
- aFT_WINKEL.Disable();
- aLB_WINKEL.Disable();
aFT_LAENGE.Disable();
aCB_LAENGE.Disable();
LineOptHdl_Impl( &aCB_LAENGE );
break;
case SDRCAPT_TYPE2:
- aFT_WINKEL.Enable();
- aLB_WINKEL.Enable();
aFT_LAENGE.Disable();
aCB_LAENGE.Disable();
LineOptHdl_Impl( &aCB_LAENGE );
break;
case SDRCAPT_TYPE3:
- aFT_WINKEL.Enable();
- aLB_WINKEL.Enable();
aFT_LAENGE.Enable();
aCB_LAENGE.Enable();
LineOptHdl_Impl( &aCB_LAENGE );
break;
case SDRCAPT_TYPE4:
- aFT_WINKEL.Enable();
- aLB_WINKEL.Enable();
aFT_LAENGE.Enable();
aCB_LAENGE.Enable();
LineOptHdl_Impl( &aCB_LAENGE );
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 4ce4485..acd7e72 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -24,7 +24,6 @@
#define BTN_HELP 1
#define FT_ABSTAND 1
-#define FT_WINKEL 2
#define FT_ANSATZ 3
#define FT_LAENGE 4
#define FT_UM 5
@@ -38,7 +37,6 @@
#define CB_LAENGE 1
-#define LB_WINKEL 1
#define LB_ANSATZ 2
#define LB_ANSATZ_REL 3
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index 24374dd..3bac45a 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -58,30 +58,6 @@ TabPage RID_SVXPAGE_CAPTION
Unit = FUNIT_MM ;
SpinSize = 50 ;
};
- FixedText FT_WINKEL
- {
- Pos = MAP_APPFONT ( 106 , 53 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
- Text [ en-US ] = "~Angle" ;
- };
- ListBox LB_WINKEL
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 51 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- StringList [ en-US ] =
- {
- < "Free" ; 1 ; > ;
- < "30 Degrees" ; 3000 ; > ;
- < "45 Degrees" ; 4500 ; > ;
- < "60 Degrees" ; 6000 ; > ;
- < "90 Degrees" ; 9000 ; > ;
- };
- };
FixedText FT_ANSATZ
{
Pos = MAP_APPFONT ( 6 , 69 ) ;
commit 1d4f3c627f8af013645c0e93da9323c1800acc0c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jan 4 23:38:28 2014 +0000
Updated core
Project: help 39412225c497bc279345025bb6325ec0d0c2ac25
diff --git a/helpcontent2 b/helpcontent2
index c975424..3941222 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c975424cf117d37b7369ec51731599b2deee8ef6
+Subproject commit 39412225c497bc279345025bb6325ec0d0c2ac25
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
