summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/paragrph.cxx34
-rw-r--r--svx/source/dialog/paragrph.hrc7
-rw-r--r--svx/source/dialog/paragrph.src48
3 files changed, 78 insertions, 11 deletions
diff --git a/svx/source/dialog/paragrph.cxx b/svx/source/dialog/paragrph.cxx
index 79a1257cc564..fdc1b8bf0a22 100644
--- a/svx/source/dialog/paragrph.cxx
+++ b/svx/source/dialog/paragrph.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: paragrph.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: os $ $Date: 2001-04-20 08:54:55 $
+ * last change: $Author: os $ $Date: 2001-04-24 08:34:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -87,6 +87,7 @@
#define ITEMID_LRSPACE 0
#define ITEMID_FMTBREAK 0
#define ITEMID_FMTKEEP 0
+#define ITEMID_PARAVERTALIGN 0
#define _SVX_PARAGRPH_CXX 0
#include "dialogs.hrc"
@@ -109,6 +110,9 @@
#include "dlgutil.hxx"
#include "dialmgr.hxx"
#include "htmlmode.hxx"
+#ifndef _SVX_PARAVERTALIGNITEM_HXX
+#include <paravertalignitem.hxx>
+#endif
// static ----------------------------------------------------------------
@@ -1040,10 +1044,14 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
aLastLineFT ( this, ResId( FT_LASTLINE ) ),
aLastLineLB ( this, ResId( LB_LASTLINE ) ),
aExpandCB ( this, ResId( CB_EXPAND ) ),
+ aVertExFL ( this, ResId( FL_VERTEX ) ),
aExampleWin ( this, ResId( WN_EXAMPLE ) ),
- aExampleFrm ( this, ResId( GB_EXAMPLE ) )
+ aExampleFrm ( this, ResId( GB_EXAMPLE ) ),
+ aVertAlignFL ( this, ResId( FL_VERTALIGN ) ),
+ aVertAlignLB ( this, ResId( LB_VERTALIGN ) )
{
FreeResource();
+ aVertExFL.SetStyle(aVertExFL.GetStyle()|WB_VERT);
Link aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
aLeft.SetClickHdl( aLink );
aRight.SetClickHdl( aLink );
@@ -1155,6 +1163,13 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
rOutSet.Put( aAdj );
}
}
+ if(aVertAlignLB.GetSavedValue() != aVertAlignLB.GetSelectEntryPos())
+ {
+ USHORT nWhich = GetWhich( SID_PARA_VERTALIGN );
+ rOutSet.Put(SvxParaVertAlignItem(aVertAlignLB.GetSelectEntryPos(), nWhich));
+ bModified = TRUE;
+ }
+
return bModified;
}
@@ -1216,6 +1231,19 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
aJustify.Disable();
}
+ nWhich = GetWhich( SID_PARA_VERTALIGN );
+ eItemState = rSet.GetItemState( nWhich );
+
+ if ( eItemState >= SFX_ITEM_AVAILABLE )
+ {
+ aVertAlignLB.Show();
+ aVertAlignFL.Show();
+
+ const SvxParaVertAlignItem& rAlign = (const SvxParaVertAlignItem&)rSet.Get( nWhich );
+ aVertAlignLB.SelectEntryPos(rAlign.GetValue());
+ }
+
+ aVertAlignLB.SaveValue();
aLeft.SaveValue();
aRight.SaveValue();
aCenter.SaveValue();
diff --git a/svx/source/dialog/paragrph.hrc b/svx/source/dialog/paragrph.hrc
index c161df40559a..c98ae8bdd693 100644
--- a/svx/source/dialog/paragrph.hrc
+++ b/svx/source/dialog/paragrph.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: paragrph.hrc,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: os $ $Date: 2001-01-17 16:13:26 $
+ * last change: $Author: os $ $Date: 2001-04-24 08:34:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,6 +82,9 @@
#define BTN_CENTERALIGN 32
#define BTN_JUSTIFYALIGN 33
#define GB_ALIGN 34
+#define FL_VERTALIGN 35
+#define LB_VERTALIGN 36
+#define FL_VERTEX 37
#define LB_LINEDIST 40
#define FT_LINEDIST 41
diff --git a/svx/source/dialog/paragrph.src b/svx/source/dialog/paragrph.src
index fd9318664562..ca1f354acd98 100644
--- a/svx/source/dialog/paragrph.src
+++ b/svx/source/dialog/paragrph.src
@@ -2,9 +2,9 @@
*
* $RCSfile: paragrph.src,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: kz $ $Date: 2001-04-05 19:20:40 $
+ * last change: $Author: os $ $Date: 2001-04-24 08:34:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -833,10 +833,10 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
Text [ dutch ] = "Uitlijning" ;
Text [ portuguese ] = "Alinhamento" ;
Size = MAP_APPFONT ( 260 , 185 ) ;
- GroupBox GB_ALIGN
+ FixedLine GB_ALIGN
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 173 , 145 ) ;
+ Size = MAP_APPFONT ( 173 , 8 ) ;
Text = "Optionen" ;
Text [ ENGLISH ] = "Options" ;
Text [ norwegian ] = "Options" ;
@@ -1162,15 +1162,20 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
Text[ turkish ] = "Son szc ~genilet";
Text[ language_user1 ] = " ";
};
+ FixedLine FL_VERTEX
+ {
+ Pos = MAP_APPFONT ( 179 , 14 ) ;
+ Size = MAP_APPFONT ( 4 , 128 ) ;
+ };
Window WN_EXAMPLE
{
Pos = MAP_APPFONT ( 191 , 14 ) ;
Size = MAP_APPFONT ( 56 , 128 ) ;
};
- GroupBox GB_EXAMPLE
+ FixedLine GB_EXAMPLE
{
Pos = MAP_APPFONT ( 185 , 3 ) ;
- Size = MAP_APPFONT ( 68 , 145 ) ;
+ Size = MAP_APPFONT ( 68 , 8 ) ;
Text = "Vorschau" ;
Text [ ENGLISH ] = "Example" ;
Text [ norwegian ] = "Eksempel" ;
@@ -1195,6 +1200,37 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
Text[ turkish ] = "nizleme";
Text[ language_user1 ] = " ";
};
+ FixedLine FL_VERTALIGN
+ {
+ Pos = MAP_APPFONT ( 6 , 146 ) ;
+ Size = MAP_APPFONT ( 248 , 8 ) ;
+ Text = "Vertikale Textausrichtung" ;
+ Text [ ENGLISH ] = "Vertical text alignment" ;
+ Hide = TRUE;
+ };
+ ListBox LB_VERTALIGN
+ {
+ Pos = MAP_APPFONT ( 12 , 157 ) ;
+ Size = MAP_APPFONT ( 100 , 50 ) ;
+ DropDown = TRUE ;
+ Hide = TRUE ;
+ StringList =
+ {
+ < "Automatisch" ; > ;
+ < "Grundlinie" ; > ;
+ < "Oben" ; > ;
+ < "Zentriert" ; > ;
+ < "Unten" ; > ;
+ };
+ StringList [ ENGLISH ] =
+ {
+ < "Automatic" ; > ;
+ < "Baseline" ; > ;
+ < "Top" ; > ;
+ < "Center" ; > ;
+ < "Bottom" ; > ;
+ };
+ };
Text[ chinese_simplified ] = "";
Text[ russian ] = "";
Text[ polish ] = "Wyrwnanie";
generated by cgit (git 2.34.1) at 2025-02-02 14:56:15 +0000